From 0a0983d7e95567c6bd2ea00286e4ede7767d54de Mon Sep 17 00:00:00 2001 From: Quercitron Date: Fri, 13 Jun 2014 15:15:16 +0400 Subject: [PATCH] Remove explicit set of required property in constructor --- .../src/mage/sets/alarareborn/Anathemancer.java | 2 +- .../mage/sets/alarareborn/ArchitectsOfWill.java | 2 +- .../mage/sets/alarareborn/AvenMimeomancer.java | 2 +- .../mage/sets/alarareborn/BituminousBlast.java | 2 +- .../src/mage/sets/alarareborn/Brainbite.java | 2 +- .../src/mage/sets/alarareborn/ColossalMight.java | 2 +- .../mage/sets/alarareborn/Crystallization.java | 2 +- .../mage/sets/alarareborn/DeadshotMinotaur.java | 2 +- .../src/mage/sets/alarareborn/DemonicDread.java | 2 +- .../src/mage/sets/alarareborn/DenyReality.java | 2 +- .../mage/sets/alarareborn/EsperSojourners.java | 4 ++-- .../mage/sets/alarareborn/GiantAmbushBeetle.java | 2 +- .../src/mage/sets/alarareborn/IdentityCrisis.java | 2 +- .../mage/sets/alarareborn/IntimidationBolt.java | 2 +- .../src/mage/sets/alarareborn/Lavalanche.java | 2 +- .../src/mage/sets/alarareborn/LichLordOfUnx.java | 2 +- .../src/mage/sets/alarareborn/MageSlayer.java | 2 +- .../src/mage/sets/alarareborn/MagefireWings.java | 2 +- .../src/mage/sets/alarareborn/MindFuneral.java | 2 +- .../src/mage/sets/alarareborn/NayaSojourners.java | 4 ++-- .../sets/alarareborn/NecromancersCovenant.java | 2 +- .../sets/alarareborn/NulltreadGargantuan.java | 2 +- .../mage/sets/alarareborn/QasaliPridemage.java | 2 +- .../mage/sets/alarareborn/SangriteBacklash.java | 2 +- .../src/mage/sets/alarareborn/SanityGnawers.java | 2 +- .../sets/alarareborn/ShieldOfTheRighteous.java | 2 +- .../sets/alarareborn/SigilOfTheNayanGods.java | 2 +- .../src/mage/sets/alarareborn/SingeMindOgre.java | 2 +- .../src/mage/sets/alarareborn/SlaveOfBolas.java | 2 +- .../src/mage/sets/alarareborn/StunSniper.java | 2 +- .../src/mage/sets/alarareborn/Terminate.java | 2 +- .../mage/sets/alarareborn/ThoughtHemorrhage.java | 2 +- .../src/mage/sets/alarareborn/UnbenderTine.java | 2 +- .../sets/alarareborn/UnscytheKillerOfKings.java | 2 +- .../mage/sets/alarareborn/VectisDominator.java | 2 +- .../mage/sets/alarareborn/VengefulRebirth.java | 2 +- .../mage/sets/alarareborn/VithianRenegades.java | 2 +- Mage.Sets/src/mage/sets/alliances/Exile.java | 2 +- .../src/mage/sets/alliances/HelmOfObedience.java | 2 +- .../mage/sets/alliances/LordOfTresserhorn.java | 2 +- .../src/mage/sets/alliances/Phelddagrif.java | 6 +++--- .../src/mage/sets/alliances/SoldierOfFortune.java | 2 +- .../src/mage/sets/apocalypse/AEtherMutation.java | 2 +- .../src/mage/sets/apocalypse/AnaDisciple.java | 4 ++-- .../src/mage/sets/apocalypse/CetaDisciple.java | 2 +- .../src/mage/sets/apocalypse/ConsumeStrength.java | 2 +- Mage.Sets/src/mage/sets/apocalypse/Cromat.java | 2 +- .../src/mage/sets/apocalypse/DeathMutation.java | 2 +- .../src/mage/sets/apocalypse/DegaDisciple.java | 4 ++-- .../mage/sets/apocalypse/DiversionaryTactics.java | 2 +- Mage.Sets/src/mage/sets/apocalypse/FireIce.java | 2 +- .../src/mage/sets/apocalypse/IllusionReality.java | 2 +- .../src/mage/sets/apocalypse/LastCaress.java | 2 +- .../src/mage/sets/apocalypse/LegacyWeapon.java | 2 +- .../src/mage/sets/apocalypse/ManaclesOfDecay.java | 2 +- .../src/mage/sets/apocalypse/MartyrsTomb.java | 2 +- Mage.Sets/src/mage/sets/apocalypse/NightDay.java | 4 ++-- .../src/mage/sets/apocalypse/OrimsThunder.java | 4 ++-- .../src/mage/sets/apocalypse/QuagmireDruid.java | 4 ++-- .../mage/sets/apocalypse/QuicksilverDagger.java | 4 ++-- .../src/mage/sets/apocalypse/RakaDisciple.java | 2 +- .../src/mage/sets/apocalypse/SavageGorilla.java | 2 +- .../src/mage/sets/apocalypse/TemporalSpring.java | 2 +- Mage.Sets/src/mage/sets/apocalypse/Vindicate.java | 2 +- .../src/mage/sets/arabiannights/KingSuleiman.java | 2 +- .../mage/sets/arabiannights/OldManOfTheSea.java | 2 +- .../src/mage/sets/avacynrestored/Aggravate.java | 2 +- .../sets/avacynrestored/AppetiteForBrains.java | 2 +- .../mage/sets/avacynrestored/BanishingStroke.java | 2 +- .../src/mage/sets/avacynrestored/BloodArtist.java | 2 +- .../sets/avacynrestored/BloodflowConnoisseur.java | 2 +- .../sets/avacynrestored/BonfireOfTheDamned.java | 2 +- .../mage/sets/avacynrestored/BurnAtTheStake.java | 2 +- .../src/mage/sets/avacynrestored/CallToServe.java | 2 +- .../sets/avacynrestored/CaptainOfTheMists.java | 2 +- .../src/mage/sets/avacynrestored/Cloudshift.java | 2 +- .../sets/avacynrestored/CommandersAuthority.java | 2 +- .../mage/sets/avacynrestored/ConjurersCloset.java | 2 +- .../mage/sets/avacynrestored/CorpseTraders.java | 4 ++-- .../mage/sets/avacynrestored/CripplingChill.java | 2 +- .../src/mage/sets/avacynrestored/Cursebreak.java | 2 +- .../mage/sets/avacynrestored/DarkImpostor.java | 2 +- .../src/mage/sets/avacynrestored/DeathWind.java | 2 +- .../src/mage/sets/avacynrestored/Defang.java | 2 +- .../mage/sets/avacynrestored/DevoutChaplain.java | 2 +- .../src/mage/sets/avacynrestored/Dreadwaters.java | 2 +- .../src/mage/sets/avacynrestored/DualCasting.java | 2 +- .../mage/sets/avacynrestored/EatenBySpiders.java | 2 +- .../mage/sets/avacynrestored/EssenceHarvest.java | 2 +- .../avacynrestored/FalkenrathExterminator.java | 2 +- .../mage/sets/avacynrestored/FerventCathar.java | 2 +- .../sets/avacynrestored/GallowsAtWillowHill.java | 2 +- .../mage/sets/avacynrestored/GhostlyTouch.java | 4 ++-- .../src/mage/sets/avacynrestored/Ghoulflesh.java | 2 +- .../mage/sets/avacynrestored/GraveExchange.java | 2 +- .../src/mage/sets/avacynrestored/Grounded.java | 2 +- .../src/mage/sets/avacynrestored/GuiseOfFire.java | 2 +- .../mage/sets/avacynrestored/HavengulSkaab.java | 2 +- .../mage/sets/avacynrestored/HolyJusticiar.java | 2 +- .../mage/sets/avacynrestored/HumanFrailty.java | 2 +- .../sets/avacynrestored/InfiniteReflection.java | 2 +- .../mage/sets/avacynrestored/JointAssault.java | 2 +- .../sets/avacynrestored/KessigMalcontents.java | 2 +- .../src/mage/sets/avacynrestored/LeapOfFaith.java | 2 +- .../sets/avacynrestored/LightningProwess.java | 2 +- .../mage/sets/avacynrestored/MaliciousIntent.java | 4 ++-- .../src/mage/sets/avacynrestored/MentalAgony.java | 2 +- .../sets/avacynrestored/MidvastProtector.java | 2 +- .../src/mage/sets/avacynrestored/MistRaven.java | 2 +- .../src/mage/sets/avacynrestored/NaturalEnd.java | 2 +- .../src/mage/sets/avacynrestored/Necrobite.java | 2 +- .../sets/avacynrestored/NephaliaSmuggler.java | 2 +- .../mage/sets/avacynrestored/PeelFromReality.java | 4 ++-- .../mage/sets/avacynrestored/PredatorsGambit.java | 2 +- .../sets/avacynrestored/RestorationAngel.java | 2 +- .../sets/avacynrestored/RevengeOfTheHunted.java | 2 +- .../mage/sets/avacynrestored/RotcrownGhoul.java | 2 +- .../src/mage/sets/avacynrestored/RushOfBlood.java | 2 +- .../mage/sets/avacynrestored/ScaldingDevil.java | 2 +- .../sets/avacynrestored/ScrollOfGriselbrand.java | 2 +- .../mage/sets/avacynrestored/ShelteringWord.java | 2 +- .../sets/avacynrestored/SlayersStronghold.java | 2 +- .../mage/sets/avacynrestored/SnareTheSkies.java | 2 +- .../mage/sets/avacynrestored/SpectralPrison.java | 2 +- .../src/mage/sets/avacynrestored/SpiritAway.java | 2 +- .../src/mage/sets/avacynrestored/SternMentor.java | 2 +- .../src/mage/sets/avacynrestored/StolenGoods.java | 2 +- .../sets/avacynrestored/TamiyoTheMoonSage.java | 4 ++-- .../sets/avacynrestored/TerrifyingPresence.java | 2 +- .../src/mage/sets/avacynrestored/Thunderbolt.java | 4 ++-- .../avacynrestored/TibaltTheFiendBlooded.java | 2 +- .../mage/sets/avacynrestored/TimberlandGuide.java | 2 +- .../avacynrestored/TreacherousPitDweller.java | 2 +- .../sets/avacynrestored/TriumphOfCruelty.java | 2 +- .../mage/sets/avacynrestored/TyrantOfDiscord.java | 2 +- .../sets/avacynrestored/UlvenwaldTracker.java | 10 +++++----- .../mage/sets/avacynrestored/UncannySpeed.java | 2 +- .../sets/avacynrestored/UndeadExecutioner.java | 2 +- .../mage/sets/avacynrestored/UnhallowedPact.java | 2 +- .../sets/avacynrestored/ZealousConscripts.java | 2 +- .../mage/sets/avacynrestored/ZealousStrike.java | 2 +- .../mage/sets/betrayersofkamigawa/BileUrchin.java | 2 +- .../sets/betrayersofkamigawa/BlazingShoal.java | 2 +- .../betrayersofkamigawa/BlessingOfLeeches.java | 2 +- .../sets/betrayersofkamigawa/BudokaPupil.java | 2 +- .../sets/betrayersofkamigawa/ChildOfThorns.java | 2 +- .../sets/betrayersofkamigawa/CunningBandit.java | 2 +- .../mage/sets/betrayersofkamigawa/Eradicate.java | 2 +- .../sets/betrayersofkamigawa/FaithfulSquire.java | 2 +- .../sets/betrayersofkamigawa/FirstVolley.java | 2 +- .../betrayersofkamigawa/FlamesOfTheBloodHand.java | 2 +- .../mage/sets/betrayersofkamigawa/Frostling.java | 2 +- .../sets/betrayersofkamigawa/GoryosVengeance.java | 2 +- .../sets/betrayersofkamigawa/HeartOfLight.java | 2 +- .../sets/betrayersofkamigawa/HerosDemise.java | 2 +- .../sets/betrayersofkamigawa/HiredMuscle.java | 2 +- .../betrayersofkamigawa/HundredTalonStrike.java | 2 +- .../betrayersofkamigawa/IsaoEnlightenedBushi.java | 2 +- .../sets/betrayersofkamigawa/KumanosBlessing.java | 2 +- .../sets/betrayersofkamigawa/MarkOfTheOni.java | 2 +- .../betrayersofkamigawa/MinamoSightbender.java | 2 +- .../betrayersofkamigawa/MistbladeShinobi.java | 2 +- .../sets/betrayersofkamigawa/MoonlitStrider.java | 2 +- .../betrayersofkamigawa/NezumiShadowWatcher.java | 2 +- .../sets/betrayersofkamigawa/OrnateKanzashi.java | 2 +- .../mage/sets/betrayersofkamigawa/Overblaze.java | 2 +- .../sets/betrayersofkamigawa/PhantomWings.java | 2 +- .../sets/betrayersofkamigawa/PsychicSpear.java | 2 +- .../mage/sets/betrayersofkamigawa/PusKami.java | 2 +- .../sets/betrayersofkamigawa/QuillmaneBaku.java | 4 ++-- .../sets/betrayersofkamigawa/RoninWarclub.java | 4 ++-- .../src/mage/sets/betrayersofkamigawa/Scour.java | 2 +- .../mage/sets/betrayersofkamigawa/Shuriken.java | 2 +- .../sets/betrayersofkamigawa/SickeningShoal.java | 2 +- .../sets/betrayersofkamigawa/SkullmaneBaku.java | 2 +- .../betrayersofkamigawa/SoratamiMindsweeper.java | 2 +- .../mage/sets/betrayersofkamigawa/SowingSalt.java | 2 +- .../mage/sets/betrayersofkamigawa/Splinter.java | 2 +- .../StreamOfConsciousness.java | 2 +- .../sets/betrayersofkamigawa/TeardropKami.java | 2 +- .../sets/betrayersofkamigawa/TerashisGrasp.java | 2 +- .../betrayersofkamigawa/ThatWhichWasTaken.java | 2 +- .../betrayersofkamigawa/ThreadsOfDisloyalty.java | 2 +- .../sets/betrayersofkamigawa/ThreeTragedies.java | 2 +- .../sets/betrayersofkamigawa/ThroatSlitter.java | 2 +- .../sets/betrayersofkamigawa/TorrentOfStone.java | 2 +- .../sets/betrayersofkamigawa/UmezawasJitte.java | 2 +- .../sets/betrayersofkamigawa/UncheckedGrowth.java | 2 +- .../mage/sets/bornofthegods/AcolytesReward.java | 4 ++-- .../sets/bornofthegods/AkroanConscriptor.java | 2 +- .../mage/sets/bornofthegods/AspectOfHydra.java | 2 +- .../src/mage/sets/bornofthegods/Asphyxiate.java | 2 +- .../src/mage/sets/bornofthegods/BileBlight.java | 2 +- .../mage/sets/bornofthegods/BoltOfKeranos.java | 2 +- .../mage/sets/bornofthegods/ClaimOfErebos.java | 4 ++-- .../src/mage/sets/bornofthegods/Crypsis.java | 2 +- .../src/mage/sets/bornofthegods/CullingMark.java | 2 +- .../src/mage/sets/bornofthegods/DawnToDusk.java | 2 +- .../sets/bornofthegods/DeepwaterHypnotist.java | 2 +- .../src/mage/sets/bornofthegods/EaterOfHope.java | 6 +++--- .../mage/sets/bornofthegods/EliteSkirmisher.java | 2 +- .../sets/bornofthegods/EpharasEnlightenment.java | 2 +- .../mage/sets/bornofthegods/EpharasRadiance.java | 2 +- .../mage/sets/bornofthegods/EpiphanyStorm.java | 2 +- .../sets/bornofthegods/EvanescentIntellect.java | 4 ++-- .../src/mage/sets/bornofthegods/Excoriate.java | 2 +- .../src/mage/sets/bornofthegods/EyeGouge.java | 2 +- .../mage/sets/bornofthegods/FallOfTheHammer.java | 8 ++++---- .../mage/sets/bornofthegods/FatedInfatuation.java | 2 +- .../mage/sets/bornofthegods/FearsomeTemper.java | 4 ++-- .../sets/bornofthegods/FelhideSpiritbinder.java | 2 +- .../sets/bornofthegods/ForgestokerDragon.java | 2 +- Mage.Sets/src/mage/sets/bornofthegods/Gild.java | 2 +- .../sets/bornofthegods/GrislyTransformation.java | 2 +- .../src/mage/sets/bornofthegods/HoldAtBay.java | 2 +- .../mage/sets/bornofthegods/HuntersProwess.java | 2 +- .../mage/sets/bornofthegods/KarametrasFavor.java | 2 +- .../sets/bornofthegods/KioraTheCrashingWave.java | 2 +- .../mage/sets/bornofthegods/KiorasFollower.java | 2 +- .../mage/sets/bornofthegods/LightningVolley.java | 2 +- .../src/mage/sets/bornofthegods/Mindreaver.java | 2 +- .../sets/bornofthegods/MogisGodOfSlaughter.java | 2 +- .../src/mage/sets/bornofthegods/MortalsArdor.java | 2 +- .../mage/sets/bornofthegods/MortalsResolve.java | 2 +- .../mage/sets/bornofthegods/NessianDemolok.java | 2 +- .../sets/bornofthegods/NessianWildsRavager.java | 2 +- .../sets/bornofthegods/OdunosRiverTrawler.java | 4 ++-- .../mage/sets/bornofthegods/OraclesInsight.java | 2 +- .../sets/bornofthegods/PhenaxGodOfDeception.java | 2 +- .../mage/sets/bornofthegods/RaisedByWolves.java | 2 +- .../mage/sets/bornofthegods/RecklessReveler.java | 2 +- .../mage/sets/bornofthegods/RetractionHelix.java | 2 +- .../sets/bornofthegods/RiseToTheChallenge.java | 2 +- .../mage/sets/bornofthegods/SatyrFiredancer.java | 2 +- .../src/mage/sets/bornofthegods/SearingBlood.java | 2 +- .../sets/bornofthegods/SetessanStarbreaker.java | 2 +- .../src/mage/sets/bornofthegods/ShrikeHarpy.java | 2 +- .../sets/bornofthegods/SirenOfTheFangedCoast.java | 2 +- .../mage/sets/bornofthegods/SirenSongLyre.java | 2 +- .../src/mage/sets/bornofthegods/StratusWalk.java | 2 +- .../src/mage/sets/bornofthegods/Sunbond.java | 2 +- .../mage/sets/bornofthegods/ThunderousMight.java | 2 +- .../mage/sets/bornofthegods/VortexElemental.java | 2 +- .../sets/bornofthegods/WarchanterOfMogis.java | 2 +- .../sets/bornofthegods/WeightOfTheUnderworld.java | 2 +- .../sets/bornofthegods/XenagosGodOfRevels.java | 2 +- .../sets/championsofkamigawa/AshenSkinZubera.java | 2 +- .../sets/championsofkamigawa/AuraOfDominion.java | 2 +- .../src/mage/sets/championsofkamigawa/Befoul.java | 2 +- .../sets/championsofkamigawa/BlessedBreath.java | 2 +- .../sets/championsofkamigawa/BlindWithAnger.java | 2 +- .../mage/sets/championsofkamigawa/BloodRites.java | 2 +- .../championsofkamigawa/BloodthirstyOgre.java | 2 +- .../sets/championsofkamigawa/BurrGrafter.java | 2 +- .../sets/championsofkamigawa/CageOfHands.java | 2 +- .../sets/championsofkamigawa/CandlesGlow.java | 2 +- .../sets/championsofkamigawa/ConsumingVortex.java | 2 +- .../championsofkamigawa/CranialExtraction.java | 2 +- .../sets/championsofkamigawa/CrushingPain.java | 2 +- .../sets/championsofkamigawa/DevouringGreed.java | 4 ++-- .../sets/championsofkamigawa/DevouringRage.java | 4 ++-- .../sets/championsofkamigawa/EiganjoCastle.java | 2 +- .../championsofkamigawa/EightAndAHalfTails.java | 2 +- .../championsofkamigawa/EightAndAHalfTale.java | 2 +- .../sets/championsofkamigawa/EyeOfNowhere.java | 2 +- .../sets/championsofkamigawa/FieldOfReality.java | 2 +- .../championsofkamigawa/ForbiddenOrchard.java | 2 +- .../sets/championsofkamigawa/GiftsUngiven.java | 2 +- .../championsofkamigawa/GuardianOfSolitude.java | 2 +- .../sets/championsofkamigawa/HairStrungKoto.java | 2 +- .../sets/championsofkamigawa/HeWhoHungers.java | 2 +- .../mage/sets/championsofkamigawa/HearthKami.java | 2 +- .../sets/championsofkamigawa/HisokasGuard.java | 2 +- .../championsofkamigawa/HondenOfNightsReach.java | 2 +- .../sets/championsofkamigawa/HorizonSeed.java | 2 +- .../sets/championsofkamigawa/IndomitableWill.java | 2 +- .../sets/championsofkamigawa/InitiateOfBlood.java | 4 ++-- .../sets/championsofkamigawa/InnocenceKami.java | 2 +- .../mage/sets/championsofkamigawa/JunkyoBell.java | 2 +- .../sets/championsofkamigawa/JushiApprentice.java | 2 +- .../mage/sets/championsofkamigawa/KabutoMoth.java | 2 +- .../championsofkamigawa/KamiOfAncientLaw.java | 2 +- .../sets/championsofkamigawa/KamiOfFiresRoar.java | 2 +- .../championsofkamigawa/KamiOfTheWaningMoon.java | 2 +- .../KamiOfTwistedReflection.java | 2 +- .../championsofkamigawa/KeigaTheTideStar.java | 2 +- .../championsofkamigawa/KikuNightsFlower.java | 2 +- .../sets/championsofkamigawa/KitsuneDiviner.java | 2 +- .../sets/championsofkamigawa/KitsuneHealer.java | 2 +- .../sets/championsofkamigawa/KitsuneMystic.java | 4 ++-- .../sets/championsofkamigawa/KodamasMight.java | 2 +- .../sets/championsofkamigawa/KuroPitlord.java | 2 +- .../mage/sets/championsofkamigawa/LavaSpike.java | 2 +- .../sets/championsofkamigawa/LiftedByClouds.java | 2 +- .../src/mage/sets/championsofkamigawa/Lure.java | 2 +- .../sets/championsofkamigawa/MatsuTribeDecoy.java | 2 +- .../championsofkamigawa/MidnightCovenant.java | 2 +- .../MinamoSchoolAtWatersEdge.java | 2 +- .../mage/sets/championsofkamigawa/Mindblaze.java | 2 +- .../championsofkamigawa/MysticRestraints.java | 2 +- .../championsofkamigawa/NezumiBoneReader.java | 4 ++-- .../sets/championsofkamigawa/NezumiShortfang.java | 2 +- .../sets/championsofkamigawa/NineRingedBo.java | 2 +- .../OkinaTempleToTheGrandfathers.java | 2 +- .../sets/championsofkamigawa/OniPossession.java | 4 ++-- .../championsofkamigawa/OrochiEggwatcher.java | 4 ++-- .../championsofkamigawa/OtherworldlyJourney.java | 2 +- .../mage/sets/championsofkamigawa/PainKami.java | 2 +- .../sets/championsofkamigawa/PsychicPuppetry.java | 2 +- .../mage/sets/championsofkamigawa/PullUnder.java | 2 +- .../sets/championsofkamigawa/QuietPurity.java | 2 +- .../sets/championsofkamigawa/RaggedVeins.java | 2 +- .../mage/sets/championsofkamigawa/RendFlesh.java | 2 +- .../mage/sets/championsofkamigawa/RendSpirit.java | 2 +- .../mage/sets/championsofkamigawa/Reweave.java | 2 +- .../sets/championsofkamigawa/ScuttlingDeath.java | 2 +- .../championsofkamigawa/SenseiGoldenTail.java | 2 +- .../sets/championsofkamigawa/SerpentSkin.java | 2 +- .../ShinkaTheBloodsoakedKeep.java | 2 +- .../ShizoDeathsStorehouse.java | 2 +- .../championsofkamigawa/SoratamiMirrorMage.java | 2 +- .../championsofkamigawa/SoratamiRainshaper.java | 2 +- .../sets/championsofkamigawa/SoulOfMagma.java | 2 +- .../championsofkamigawa/StrangeInversion.java | 2 +- .../championsofkamigawa/StrengthOfCedars.java | 2 +- .../championsofkamigawa/SwallowingPlague.java | 2 +- .../sets/championsofkamigawa/TellerOfTales.java | 2 +- .../sets/championsofkamigawa/TenzaGodosMaul.java | 2 +- .../sets/championsofkamigawa/ThiefOfHope.java | 2 +- .../championsofkamigawa/UncontrollableAnger.java | 2 +- .../sets/championsofkamigawa/UnnaturalSpeed.java | 2 +- .../sets/championsofkamigawa/VassalsDuty.java | 2 +- .../mage/sets/championsofkamigawa/Vigilance.java | 2 +- .../sets/championsofkamigawa/WakingNightmare.java | 2 +- .../mage/sets/championsofkamigawa/WearAway.java | 2 +- .../championsofkamigawa/YoseiTheMorningStar.java | 2 +- .../src/mage/sets/coldsnap/AdarkarValkyrie.java | 2 +- .../src/mage/sets/coldsnap/LightningStorm.java | 2 +- .../src/mage/sets/coldsnap/MouthOfRonom.java | 2 +- .../mage/sets/commander/BasandraBattleSeraph.java | 2 +- .../src/mage/sets/commander/BrionStoutarm.java | 2 +- .../src/mage/sets/commander/DeathByDragons.java | 2 +- .../mage/sets/commander/GhaveGuruOfSpores.java | 4 ++-- Mage.Sets/src/mage/sets/commander/Invigorate.java | 2 +- .../src/mage/sets/commander/MagmaticForce.java | 2 +- .../src/mage/sets/commander/PerilousResearch.java | 2 +- .../src/mage/sets/commander/SewerNemesis.java | 2 +- Mage.Sets/src/mage/sets/commander/Shriekmaw.java | 2 +- .../src/mage/sets/commander/Spitebellows.java | 2 +- .../mage/sets/commander/VishKalBloodArbiter.java | 2 +- Mage.Sets/src/mage/sets/commander/VowOfDuty.java | 2 +- .../src/mage/sets/commander/VowOfFlight.java | 2 +- .../src/mage/sets/commander/VowOfLightning.java | 2 +- .../src/mage/sets/commander/VowOfMalice.java | 2 +- .../src/mage/sets/commander/VowOfWildness.java | 2 +- .../mage/sets/commander2013/ActOfAuthority.java | 4 ++-- .../mage/sets/commander2013/AngelOfFinality.java | 2 +- .../sets/commander2013/Borrowing100000Arrows.java | 2 +- .../src/mage/sets/commander2013/CrosissCharm.java | 4 ++-- .../src/mage/sets/commander2013/CurseOfChaos.java | 2 +- .../mage/sets/commander2013/CurseOfInertia.java | 4 ++-- .../mage/sets/commander2013/CurseOfPredation.java | 2 +- .../sets/commander2013/CurseOfShallowGraves.java | 2 +- .../sets/commander2013/CurseOfTheForsaken.java | 2 +- .../sets/commander2013/DarksteelMutation.java | 2 +- .../sets/commander2013/DeepfireElemental.java | 2 +- .../commander2013/DereviEmpyrialTactician.java | 2 +- .../src/mage/sets/commander2013/DromarsCharm.java | 2 +- .../src/mage/sets/commander2013/FellShepherd.java | 2 +- .../src/mage/sets/commander2013/Flickerform.java | 2 +- .../sets/commander2013/IncendiaryCommand.java | 2 +- .../mage/sets/commander2013/MagusOfTheArena.java | 4 ++-- .../sets/commander2013/MarathWillOfTheWild.java | 4 ++-- .../sets/commander2013/OrderOfSuccession.java | 2 +- .../mage/sets/commander2013/PresenceOfGond.java | 2 +- .../mage/sets/commander2013/Reincarnation.java | 2 +- .../sets/commander2013/RoonOfTheHiddenRealm.java | 2 +- .../sets/commander2013/RubiniaSoulsinger.java | 2 +- .../src/mage/sets/commander2013/SereneMaster.java | 2 +- .../sets/commander2013/ShattergangBrothers.java | 2 +- .../sets/commander2013/StalkingVengeance.java | 2 +- .../src/mage/sets/commander2013/Stonecloaker.java | 4 ++-- .../sets/commander2013/StormscapeBattlemage.java | 2 +- .../sets/commander2013/SydriGalvanicGenius.java | 4 ++-- .../sets/commander2013/TemptWithReflections.java | 2 +- .../sets/commander2013/ThousandYearElixir.java | 2 +- .../src/mage/sets/commander2013/TidalForce.java | 2 +- .../mage/sets/commander2013/TrueNameNemesis.java | 2 +- .../sets/commander2013/UnexpectedlyAbsent.java | 2 +- .../src/mage/sets/commander2013/WitchHunt.java | 2 +- Mage.Sets/src/mage/sets/conflux/AbsorbVis.java | 2 +- Mage.Sets/src/mage/sets/conflux/AshasFavor.java | 2 +- .../src/mage/sets/conflux/BeaconBehemoth.java | 2 +- .../src/mage/sets/conflux/CelestialPurge.java | 2 +- .../mage/sets/conflux/ConstrictingTendrils.java | 2 +- .../mage/sets/conflux/ControlledInstincts.java | 2 +- Mage.Sets/src/mage/sets/conflux/DarkTemper.java | 2 +- Mage.Sets/src/mage/sets/conflux/DragDown.java | 2 +- Mage.Sets/src/mage/sets/conflux/ElderMastery.java | 2 +- .../mage/sets/conflux/EtherswornAdjudicator.java | 2 +- .../src/mage/sets/conflux/ExplodingBorders.java | 2 +- .../src/mage/sets/conflux/ExtractorDemon.java | 2 +- Mage.Sets/src/mage/sets/conflux/FieryFall.java | 2 +- .../src/mage/sets/conflux/FiligreeFracture.java | 2 +- Mage.Sets/src/mage/sets/conflux/Fleshformer.java | 2 +- Mage.Sets/src/mage/sets/conflux/FontOfMythos.java | 2 +- .../src/mage/sets/conflux/GoblinRazerunners.java | 2 +- .../mage/sets/conflux/GwafaHazidProfiteer.java | 2 +- .../src/mage/sets/conflux/JhessianBalmgiver.java | 2 +- .../src/mage/sets/conflux/MagisterSphinx.java | 2 +- Mage.Sets/src/mage/sets/conflux/ManiacalRage.java | 2 +- Mage.Sets/src/mage/sets/conflux/MightOfAlara.java | 2 +- Mage.Sets/src/mage/sets/conflux/MoltenFrame.java | 2 +- .../src/mage/sets/conflux/NacatlHuntPride.java | 4 ++-- .../mage/sets/conflux/NicolBolasPlaneswalker.java | 6 +++--- Mage.Sets/src/mage/sets/conflux/Nyxathid.java | 2 +- .../src/mage/sets/conflux/ObeliskOfAlara.java | 6 +++--- .../src/mage/sets/conflux/ParasiticStrix.java | 2 +- Mage.Sets/src/mage/sets/conflux/PathToExile.java | 2 +- .../src/mage/sets/conflux/QuenchableFire.java | 2 +- .../src/mage/sets/conflux/ScarlandThrinax.java | 2 +- .../src/mage/sets/conflux/ScepterOfDominance.java | 2 +- .../src/mage/sets/conflux/ScepterOfFugue.java | 2 +- .../src/mage/sets/conflux/SludgeStrider.java | 2 +- Mage.Sets/src/mage/sets/conflux/SoulsMajesty.java | 2 +- Mage.Sets/src/mage/sets/conflux/SylvanBounty.java | 2 +- .../src/mage/sets/conflux/TeleminPerformance.java | 2 +- .../src/mage/sets/conflux/VagrantPlowbeasts.java | 2 +- .../src/mage/sets/conflux/ViewFromAbove.java | 2 +- .../src/mage/sets/conflux/VoicesFromTheVoid.java | 2 +- .../src/mage/sets/conflux/WallOfReverence.java | 2 +- .../src/mage/sets/conflux/WretchedBanquet.java | 2 +- .../src/mage/sets/conflux/YokeOfTheDamned.java | 2 +- .../src/mage/sets/darkascension/AlphaBrawl.java | 2 +- .../src/mage/sets/darkascension/ArtfulDodge.java | 2 +- .../src/mage/sets/darkascension/BlackCat.java | 2 +- .../src/mage/sets/darkascension/BloodFeud.java | 4 ++-- .../mage/sets/darkascension/BriarpackAlpha.java | 2 +- .../mage/sets/darkascension/BurdenOfGuilt.java | 2 +- .../mage/sets/darkascension/CallToTheKindred.java | 2 +- .../mage/sets/darkascension/ChaliceOfDeath.java | 2 +- .../sets/darkascension/ChantOfTheSkifsang.java | 2 +- .../mage/sets/darkascension/CrushingVines.java | 2 +- .../sets/darkascension/CurseOfBloodletting.java | 2 +- .../mage/sets/darkascension/CurseOfEchoes.java | 2 +- .../sets/darkascension/CurseOfExhaustion.java | 2 +- .../sets/darkascension/CurseOfMisfortunes.java | 2 +- .../mage/sets/darkascension/CurseOfThirst.java | 2 +- .../src/mage/sets/darkascension/DeadlyAllure.java | 2 +- .../src/mage/sets/darkascension/DeathsCaress.java | 2 +- .../mage/sets/darkascension/DerangedOutcast.java | 2 +- .../mage/sets/darkascension/DiregrafCaptain.java | 2 +- .../mage/sets/darkascension/DungeonGeists.java | 2 +- .../src/mage/sets/darkascension/FaithsShield.java | 2 +- .../sets/darkascension/FalkenrathAristocrat.java | 2 +- .../sets/darkascension/FalkenrathTorturer.java | 2 +- .../sets/darkascension/FarbogBoneflinger.java | 2 +- .../mage/sets/darkascension/FavorOfTheWoods.java | 2 +- .../src/mage/sets/darkascension/FeedThePack.java | 2 +- .../sets/darkascension/FlayerOfTheHatebound.java | 2 +- .../src/mage/sets/darkascension/ForgeDevil.java | 2 +- .../mage/sets/darkascension/GeralfsMessenger.java | 2 +- .../sets/darkascension/GeralfsMindcrusher.java | 2 +- .../mage/sets/darkascension/GhastlyHaunting.java | 2 +- .../mage/sets/darkascension/GrimBackwoods.java | 2 +- .../src/mage/sets/darkascension/Griptide.java | 2 +- .../sets/darkascension/GruesomeDiscovery.java | 2 +- .../mage/sets/darkascension/HarrowingJourney.java | 2 +- .../mage/sets/darkascension/HecklingFiends.java | 2 +- .../src/mage/sets/darkascension/Helvault.java | 4 ++-- .../sets/darkascension/HungerOfTheHowlpack.java | 2 +- .../sets/darkascension/HuntmasterOfTheFells.java | 2 +- .../sets/darkascension/IncreasingConfusion.java | 2 +- .../sets/darkascension/IncreasingSavagery.java | 2 +- .../sets/darkascension/NiblisOfTheBreath.java | 2 +- .../mage/sets/darkascension/NiblisOfTheMist.java | 2 +- .../mage/sets/darkascension/NiblisOfTheUrn.java | 2 +- .../mage/sets/darkascension/RayOfRevelation.java | 2 +- .../src/mage/sets/darkascension/SavingGrasp.java | 2 +- .../mage/sets/darkascension/SkillfulLunge.java | 2 +- .../mage/sets/darkascension/SkirsdagFlayer.java | 2 +- .../src/mage/sets/darkascension/SoulSeizer.java | 2 +- .../mage/sets/darkascension/SpitefulShadows.java | 2 +- .../sets/darkascension/SuddenDisappearance.java | 2 +- .../sets/darkascension/TalonsOfFalkenrath.java | 2 +- .../src/mage/sets/darkascension/ThoughtScour.java | 2 +- .../src/mage/sets/darkascension/TragicSlip.java | 2 +- .../mage/sets/darkascension/UlvenwaldBear.java | 2 +- .../src/mage/sets/darkascension/UndyingEvil.java | 2 +- .../sets/darkascension/WerewolfRansacker.java | 2 +- .../src/mage/sets/darkascension/WildHunger.java | 2 +- .../sets/darkascension/WolfhuntersQuiver.java | 2 +- .../mage/sets/darkascension/WrackWithMadness.java | 2 +- .../src/mage/sets/darksteel/BlinkmothNexus.java | 2 +- Mage.Sets/src/mage/sets/darksteel/Coretapper.java | 4 ++-- .../src/mage/sets/darksteel/EchoingCalm.java | 2 +- Mage.Sets/src/mage/sets/darksteel/LeoninBola.java | 2 +- .../src/mage/sets/darksteel/LoxodonMystic.java | 2 +- Mage.Sets/src/mage/sets/darksteel/Oxidize.java | 2 +- .../src/mage/sets/darksteel/PteronGhost.java | 2 +- .../mage/sets/darksteel/SlobadGoblinTinkerer.java | 2 +- .../src/mage/sets/darksteel/SpawningPit.java | 2 +- .../mage/sets/darksteel/SwordOfFireAndIce.java | 2 +- .../src/mage/sets/darksteel/ViridianZealot.java | 2 +- .../src/mage/sets/darksteel/VoltaicConstruct.java | 2 +- .../src/mage/sets/dissension/BeaconHawk.java | 2 +- .../src/mage/sets/dissension/ExperimentKraj.java | 2 +- .../mage/sets/dissension/HaazdaExonerator.java | 2 +- Mage.Sets/src/mage/sets/dissension/HideSeek.java | 4 ++-- .../mage/sets/dissension/IndrikStomphowler.java | 2 +- .../src/mage/sets/dissension/LoamingShaman.java | 2 +- .../sets/dissension/MinisterOfImpediments.java | 2 +- Mage.Sets/src/mage/sets/dissension/OddsEnds.java | 2 +- .../src/mage/sets/dissension/PsychoticFury.java | 2 +- .../src/mage/sets/dissension/RiotSpikes.java | 2 +- .../src/mage/sets/dissension/SealOfDoom.java | 2 +- .../src/mage/sets/dissension/SteelingStance.java | 2 +- .../src/mage/sets/dissension/TidespoutTyrant.java | 2 +- .../src/mage/sets/dragonsmaze/ArmedDangerous.java | 4 ++-- .../mage/sets/dragonsmaze/BreakingEntering.java | 2 +- .../src/mage/sets/dragonsmaze/ClearAPath.java | 2 +- .../src/mage/sets/dragonsmaze/CryptIncursion.java | 2 +- .../mage/sets/dragonsmaze/DeputyOfAcquittals.java | 2 +- .../src/mage/sets/dragonsmaze/DownDirty.java | 2 +- .../src/mage/sets/dragonsmaze/Dragonshift.java | 2 +- .../src/mage/sets/dragonsmaze/DrownInFilth.java | 2 +- Mage.Sets/src/mage/sets/dragonsmaze/FarAway.java | 4 ++-- .../src/mage/sets/dragonsmaze/FatalFumes.java | 2 +- .../src/mage/sets/dragonsmaze/FleshBlood.java | 6 +++--- Mage.Sets/src/mage/sets/dragonsmaze/GiveTake.java | 4 ++-- .../mage/sets/dragonsmaze/HaazdaSnareSquad.java | 2 +- .../src/mage/sets/dragonsmaze/HiredTorturer.java | 2 +- .../src/mage/sets/dragonsmaze/KorozdaGorgon.java | 4 ++-- .../mage/sets/dragonsmaze/KrasisIncubation.java | 2 +- .../mage/sets/dragonsmaze/MawOfTheObzedat.java | 2 +- .../src/mage/sets/dragonsmaze/MendingTouch.java | 2 +- .../src/mage/sets/dragonsmaze/MorgueBurst.java | 2 +- .../src/mage/sets/dragonsmaze/Phytoburst.java | 2 +- .../src/mage/sets/dragonsmaze/PilferedPlans.java | 2 +- .../src/mage/sets/dragonsmaze/ProtectServe.java | 4 ++-- .../src/mage/sets/dragonsmaze/PunishTheEnemy.java | 4 ++-- Mage.Sets/src/mage/sets/dragonsmaze/RalZarek.java | 2 +- .../src/mage/sets/dragonsmaze/ReapIntellect.java | 2 +- .../src/mage/sets/dragonsmaze/RunnersBane.java | 2 +- .../src/mage/sets/dragonsmaze/ScabClanGiant.java | 2 +- .../src/mage/sets/dragonsmaze/SinCollector.java | 2 +- .../mage/sets/dragonsmaze/SinisterPossession.java | 2 +- .../src/mage/sets/dragonsmaze/ToilTrouble.java | 4 ++-- Mage.Sets/src/mage/sets/dragonsmaze/TurnBurn.java | 4 ++-- .../mage/sets/dragonsmaze/UnflinchingCourage.java | 2 +- .../sets/dragonsmaze/VorelOfTheHullClade.java | 2 +- .../src/mage/sets/dragonsmaze/WarpedPhysique.java | 2 +- .../src/mage/sets/dragonsmaze/WeaponSurge.java | 2 +- .../mage/sets/eighthedition/BalanceOfPower.java | 2 +- .../sets/eighthedition/DwarvenDemolitionTeam.java | 2 +- .../sets/elspethvstezzeret/AEtherSpellbomb.java | 2 +- .../mage/sets/elspethvstezzeret/BlindingBeam.java | 2 +- .../sets/elspethvstezzeret/DaruEncampment.java | 2 +- .../sets/elspethvstezzeret/EnergyChamber.java | 2 +- .../sets/elspethvstezzeret/GoldmeadowHarrier.java | 2 +- .../sets/elspethvstezzeret/MishrasFactory.java | 2 +- .../mage/sets/elspethvstezzeret/RazorBarrier.java | 2 +- .../sets/elspethvstezzeret/SeasonedMarshal.java | 2 +- .../sets/elspethvstezzeret/SerratedBiskelion.java | 2 +- .../mage/sets/elspethvstezzeret/TripNoose.java | 2 +- .../mage/sets/elvesvsgoblins/AmbushCommander.java | 2 +- .../sets/elvesvsgoblins/BoggartShenanigans.java | 2 +- .../mage/sets/elvesvsgoblins/EmberwildeAugur.java | 2 +- .../mage/sets/elvesvsgoblins/TimberwatchElf.java | 2 +- Mage.Sets/src/mage/sets/eventide/AerieOuphes.java | 2 +- .../src/mage/sets/eventide/AntlerSkulkin.java | 2 +- .../src/mage/sets/eventide/ArchonOfJustice.java | 2 +- .../sets/eventide/AshlingTheExtinguisher.java | 4 ++-- .../src/mage/sets/eventide/BalefireLiege.java | 2 +- .../src/mage/sets/eventide/BallynockTrapper.java | 2 +- .../src/mage/sets/eventide/BanishingKnack.java | 4 ++-- .../src/mage/sets/eventide/CankerAbomination.java | 2 +- .../src/mage/sets/eventide/CankerousThirst.java | 2 +- .../src/mage/sets/eventide/ChaoticBacklash.java | 2 +- .../src/mage/sets/eventide/CinderPyromancer.java | 2 +- .../src/mage/sets/eventide/CloutOfTheDominus.java | 2 +- Mage.Sets/src/mage/sets/eventide/Crackleburr.java | 4 ++-- .../src/mage/sets/eventide/CrumblingAshes.java | 2 +- .../src/mage/sets/eventide/DeathbringerLiege.java | 4 ++-- .../src/mage/sets/eventide/DominusOfFealty.java | 2 +- Mage.Sets/src/mage/sets/eventide/Doomgape.java | 2 +- .../src/mage/sets/eventide/DoubleCleave.java | 2 +- .../src/mage/sets/eventide/EdgeOfTheDivinity.java | 2 +- .../mage/sets/eventide/FavorOfTheOverbeing.java | 2 +- .../src/mage/sets/eventide/FieryBombardment.java | 4 ++-- Mage.Sets/src/mage/sets/eventide/Flickerwisp.java | 2 +- .../src/mage/sets/eventide/GiftOfTheDeity.java | 2 +- Mage.Sets/src/mage/sets/eventide/GilderBairn.java | 2 +- .../src/mage/sets/eventide/HagHedgeMage.java | 2 +- .../src/mage/sets/eventide/HatchetBully.java | 4 ++-- .../src/mage/sets/eventide/IndigoFaerie.java | 2 +- Mage.Sets/src/mage/sets/eventide/InsideOut.java | 2 +- .../mage/sets/eventide/KithkinSpellduster.java | 2 +- .../src/mage/sets/eventide/KithkinZealot.java | 2 +- .../src/mage/sets/eventide/MerrowBonegnawer.java | 2 +- .../src/mage/sets/eventide/MerrowLevitator.java | 2 +- Mage.Sets/src/mage/sets/eventide/Monstrify.java | 2 +- Mage.Sets/src/mage/sets/eventide/Moonhold.java | 2 +- .../mage/sets/eventide/NightmareIncursion.java | 2 +- .../src/mage/sets/eventide/NoggleHedgeMage.java | 2 +- Mage.Sets/src/mage/sets/eventide/OonasGrace.java | 2 +- .../src/mage/sets/eventide/OutrageShaman.java | 2 +- Mage.Sets/src/mage/sets/eventide/RavensCrime.java | 2 +- .../src/mage/sets/eventide/RazorfinAbolisher.java | 2 +- .../src/mage/sets/eventide/RecumbentBliss.java | 2 +- .../src/mage/sets/eventide/RekindledFlame.java | 2 +- .../src/mage/sets/eventide/SanityGrinding.java | 2 +- Mage.Sets/src/mage/sets/eventide/Scarecrone.java | 2 +- .../mage/sets/eventide/ScourgeOfTheNobilis.java | 2 +- .../src/mage/sets/eventide/ShellSkulkin.java | 2 +- .../src/mage/sets/eventide/ShrewdHatchling.java | 2 +- Mage.Sets/src/mage/sets/eventide/Snakeform.java | 2 +- Mage.Sets/src/mage/sets/eventide/SoulReap.java | 2 +- Mage.Sets/src/mage/sets/eventide/Spitemare.java | 2 +- .../src/mage/sets/eventide/SpittingImage.java | 2 +- .../src/mage/sets/eventide/SutureSpirit.java | 2 +- Mage.Sets/src/mage/sets/eventide/SyphonLife.java | 2 +- Mage.Sets/src/mage/sets/eventide/TalarasBane.java | 2 +- Mage.Sets/src/mage/sets/eventide/Unmake.java | 2 +- .../src/mage/sets/eventide/UnwillingRecruit.java | 2 +- .../src/mage/sets/eventide/WickerboughElder.java | 2 +- .../mage/sets/eventide/WildernessHypnotist.java | 2 +- Mage.Sets/src/mage/sets/exodus/CatBurglar.java | 2 +- .../src/mage/sets/exodus/EntropicSpecter.java | 2 +- Mage.Sets/src/mage/sets/exodus/Equilibrium.java | 2 +- Mage.Sets/src/mage/sets/exodus/ErraticPortal.java | 2 +- .../src/mage/sets/exodus/SoltariVisionary.java | 2 +- Mage.Sets/src/mage/sets/exodus/SpikeWeaver.java | 2 +- .../mage/sets/fallenempires/HymnToTourach.java | 2 +- .../src/mage/sets/fifthdawn/BatonOfCourage.java | 2 +- .../mage/sets/fifthdawn/BeaconOfTomorrows.java | 2 +- .../src/mage/sets/fifthdawn/BlastingStation.java | 4 ++-- .../src/mage/sets/fifthdawn/GrindingStation.java | 2 +- .../mage/sets/fifthdawn/StaffOfDomination.java | 4 ++-- Mage.Sets/src/mage/sets/fifthdawn/StandFirm.java | 2 +- .../src/mage/sets/fifthedition/AmuletOfKroog.java | 2 +- .../sets/fifthedition/DivineTransformation.java | 2 +- .../src/mage/sets/fifthedition/HurkylsRecall.java | 2 +- .../src/mage/sets/fifthedition/Juxtapose.java | 2 +- .../src/mage/sets/fifthedition/Millstone.java | 2 +- .../mage/sets/fifthedition/PradeshGypsies.java | 2 +- .../src/mage/sets/fifthedition/RadjanSpirit.java | 2 +- .../src/mage/sets/fifthedition/WyluliWolf.java | 2 +- .../src/mage/sets/fourthedition/Blessing.java | 2 +- .../src/mage/sets/fourthedition/EbonyHorse.java | 2 +- .../src/mage/sets/fourthedition/HolyArmor.java | 2 +- .../sets/fourthedition/SwordsToPlowshares.java | 2 +- .../src/mage/sets/fourthedition/TheRack.java | 2 +- .../mage/sets/futuresight/DaybreakCoronet.java | 2 +- .../src/mage/sets/futuresight/IchorSlick.java | 2 +- .../src/mage/sets/futuresight/LlanowarAugur.java | 2 +- .../src/mage/sets/futuresight/SlaughterPact.java | 2 +- .../src/mage/sets/futuresight/WitchsMist.java | 2 +- .../src/mage/sets/gatecrash/AerialManeuver.java | 2 +- .../src/mage/sets/gatecrash/Agoraphobia.java | 2 +- .../src/mage/sets/gatecrash/AlphaAuthority.java | 2 +- .../src/mage/sets/gatecrash/AngelicEdict.java | 2 +- .../src/mage/sets/gatecrash/BalustradeSpy.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/BorosCharm.java | 4 ++-- .../src/mage/sets/gatecrash/BurstOfStrength.java | 2 +- .../src/mage/sets/gatecrash/ClanDefiance.java | 4 ++-- .../mage/sets/gatecrash/CoercedConfession.java | 2 +- .../src/mage/sets/gatecrash/DeathsApproach.java | 2 +- .../src/mage/sets/gatecrash/DebtorsPulpit.java | 2 +- .../src/mage/sets/gatecrash/DevourFlesh.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/DimirCharm.java | 2 +- .../src/mage/sets/gatecrash/DinrovaHorror.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/DomriRade.java | 4 ++-- .../mage/sets/gatecrash/DuskmantleGuildmage.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/DyingWish.java | 4 ++-- .../src/mage/sets/gatecrash/FirefistStriker.java | 2 +- .../src/mage/sets/gatecrash/FiremaneAvenger.java | 2 +- .../src/mage/sets/gatecrash/ForcedAdaptation.java | 2 +- .../src/mage/sets/gatecrash/FoundryChampion.java | 2 +- .../mage/sets/gatecrash/FuriousResistance.java | 2 +- .../sets/gatecrash/GideonChampionOfJustice.java | 2 +- .../src/mage/sets/gatecrash/GiftOfOrzhova.java | 2 +- .../src/mage/sets/gatecrash/GreensideWatcher.java | 2 +- .../src/mage/sets/gatecrash/GrislySpectacle.java | 2 +- .../src/mage/sets/gatecrash/GroundAssault.java | 2 +- .../src/mage/sets/gatecrash/GuildscornWard.java | 2 +- .../src/mage/sets/gatecrash/HandsOfBinding.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/HolyMantle.java | 2 +- .../src/mage/sets/gatecrash/HomingLightning.java | 2 +- .../src/mage/sets/gatecrash/IvyLaneDenizen.java | 2 +- .../src/mage/sets/gatecrash/KillingGlare.java | 2 +- .../src/mage/sets/gatecrash/MadcapSkills.java | 2 +- .../src/mage/sets/gatecrash/MarkForDeath.java | 2 +- .../src/mage/sets/gatecrash/MentalVapors.java | 2 +- .../src/mage/sets/gatecrash/MindeyeDrake.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/Mugging.java | 2 +- .../mage/sets/gatecrash/MurderInvestigation.java | 2 +- .../mage/sets/gatecrash/ObzedatGhostCouncil.java | 2 +- .../mage/sets/gatecrash/OneThousandLashes.java | 2 +- .../src/mage/sets/gatecrash/OrzhovCharm.java | 4 ++-- .../mage/sets/gatecrash/ParanoidDelusions.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/PitFight.java | 10 +++++----- .../src/mage/sets/gatecrash/PredatorsRapport.java | 2 +- .../src/mage/sets/gatecrash/PrimalVisitation.java | 2 +- .../src/mage/sets/gatecrash/PurgeTheProfane.java | 2 +- .../mage/sets/gatecrash/RapidHybridization.java | 2 +- .../src/mage/sets/gatecrash/RazortipWhip.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/RustScarab.java | 2 +- .../src/mage/sets/gatecrash/SagesRowDenizen.java | 2 +- .../mage/sets/gatecrash/ShadowAlleyDenizen.java | 2 +- .../src/mage/sets/gatecrash/ShadowSlice.java | 2 +- .../src/mage/sets/gatecrash/ShieldedPassage.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/SimicCharm.java | 4 ++-- .../src/mage/sets/gatecrash/SimicFluxmage.java | 2 +- .../src/mage/sets/gatecrash/SimicManipulator.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/Skullcrack.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/Skygames.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/SoulRansom.java | 2 +- .../src/mage/sets/gatecrash/StolenIdentity.java | 2 +- .../mage/sets/gatecrash/StructuralCollapse.java | 2 +- .../mage/sets/gatecrash/UndercityInformer.java | 4 ++-- .../src/mage/sets/gatecrash/UndercityPlague.java | 2 +- .../src/mage/sets/gatecrash/VizkopaConfessor.java | 2 +- .../src/mage/sets/gatecrash/VizkopaGuildmage.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/Voidwalk.java | 2 +- .../src/mage/sets/gatecrash/WayOfTheThief.java | 2 +- .../src/mage/sets/gatecrash/ZameckGuildmage.java | 2 +- .../src/mage/sets/guildpact/AngelOfDespair.java | 2 +- .../src/mage/sets/guildpact/BlindHunter.java | 2 +- .../mage/sets/guildpact/BurningTreeShaman.java | 2 +- .../src/mage/sets/guildpact/DouseInGloom.java | 2 +- .../src/mage/sets/guildpact/DrownedRusalka.java | 2 +- .../sets/guildpact/GhostCouncilOfOrzhova.java | 4 ++-- Mage.Sets/src/mage/sets/guildpact/Gigadrowse.java | 2 +- .../src/mage/sets/guildpact/GruulGuildmage.java | 2 +- .../src/mage/sets/guildpact/HarrierGriffin.java | 2 +- .../src/mage/sets/guildpact/HypervoltGrasp.java | 2 +- .../mage/sets/guildpact/InfiltratorsMagemark.java | 2 +- .../src/mage/sets/guildpact/LeapOfFlame.java | 2 +- Mage.Sets/src/mage/sets/guildpact/Mortify.java | 2 +- .../src/mage/sets/guildpact/OrzhovEuthanist.java | 2 +- .../src/mage/sets/guildpact/OstiaryThrull.java | 2 +- .../sets/guildpact/PilloryOfTheSleepless.java | 2 +- .../src/mage/sets/guildpact/PlaguedRusalka.java | 4 ++-- Mage.Sets/src/mage/sets/guildpact/Pyromatics.java | 2 +- .../src/mage/sets/guildpact/RestlessBones.java | 2 +- .../src/mage/sets/guildpact/ScorchedRusalka.java | 4 ++-- .../src/mage/sets/guildpact/ShadowLance.java | 2 +- .../src/mage/sets/guildpact/SiegeOfTowers.java | 2 +- .../mage/sets/guildpact/SkarrgTheRagePits.java | 2 +- .../src/mage/sets/guildpact/StarvedRusalka.java | 2 +- .../src/mage/sets/guildpact/TiborAndLumia.java | 2 +- .../mage/sets/guildpact/TinStreetHooligan.java | 2 +- Mage.Sets/src/mage/sets/guildpact/Vacuumelt.java | 2 +- Mage.Sets/src/mage/sets/guildpact/Wildsize.java | 2 +- Mage.Sets/src/mage/sets/guildpact/WreakHavoc.java | 2 +- .../src/mage/sets/guildpact/WurmweaverCoil.java | 2 +- .../sets/heroesvsmonsters/ShowerOfSparks.java | 4 ++-- .../sets/heroesvsmonsters/SkarrganSkybreaker.java | 2 +- .../mage/sets/heroesvsmonsters/UndyingRage.java | 2 +- .../mage/sets/homelands/FeastOfTheUnicorn.java | 2 +- Mage.Sets/src/mage/sets/homelands/Forget.java | 2 +- .../src/mage/sets/homelands/SerratedArrows.java | 2 +- Mage.Sets/src/mage/sets/homelands/Torture.java | 2 +- Mage.Sets/src/mage/sets/iceage/CentaurArcher.java | 2 +- Mage.Sets/src/mage/sets/iceage/ElderDruid.java | 2 +- Mage.Sets/src/mage/sets/iceage/FieryJustice.java | 2 +- .../src/mage/sets/iceage/FyndhornBrownie.java | 2 +- .../src/mage/sets/iceage/ImposingVisage.java | 2 +- Mage.Sets/src/mage/sets/iceage/LeshracsRite.java | 2 +- Mage.Sets/src/mage/sets/iceage/MindWarp.java | 2 +- Mage.Sets/src/mage/sets/iceage/Pyroblast.java | 2 +- Mage.Sets/src/mage/sets/iceage/Regeneration.java | 2 +- Mage.Sets/src/mage/sets/iceage/SkullCatapult.java | 2 +- Mage.Sets/src/mage/sets/iceage/TinderWall.java | 2 +- Mage.Sets/src/mage/sets/iceage/Vertigo.java | 2 +- Mage.Sets/src/mage/sets/innistrad/AltarsReap.java | 2 +- .../src/mage/sets/innistrad/AncientGrudge.java | 2 +- .../src/mage/sets/innistrad/AvacynianPriest.java | 2 +- .../src/mage/sets/innistrad/BitterheartWitch.java | 2 +- .../src/mage/sets/innistrad/BloodgiftDemon.java | 2 +- .../src/mage/sets/innistrad/BondsOfFaith.java | 2 +- .../src/mage/sets/innistrad/BrainWeevil.java | 2 +- .../src/mage/sets/innistrad/Bramblecrush.java | 2 +- .../src/mage/sets/innistrad/BumpInTheNight.java | 2 +- .../mage/sets/innistrad/CacklingCounterpart.java | 2 +- Mage.Sets/src/mage/sets/innistrad/CellarDoor.java | 2 +- .../src/mage/sets/innistrad/Claustrophobia.java | 2 +- .../src/mage/sets/innistrad/CorpseLunge.java | 2 +- .../src/mage/sets/innistrad/CrosswayVampire.java | 2 +- Mage.Sets/src/mage/sets/innistrad/Curiosity.java | 2 +- .../mage/sets/innistrad/CurseOfDeathsHold.java | 2 +- .../src/mage/sets/innistrad/CurseOfOblivion.java | 2 +- .../mage/sets/innistrad/CurseOfStalkedPrey.java | 2 +- .../mage/sets/innistrad/CurseOfTheBloodyTome.java | 2 +- .../sets/innistrad/CurseOfTheNightlyHunt.java | 2 +- .../sets/innistrad/CurseOfThePiercedHeart.java | 2 +- .../src/mage/sets/innistrad/DaybreakRanger.java | 2 +- Mage.Sets/src/mage/sets/innistrad/DeadWeight.java | 2 +- .../src/mage/sets/innistrad/DemonmailHauberk.java | 2 +- .../sets/innistrad/DiscipleOfGriselbrand.java | 2 +- Mage.Sets/src/mage/sets/innistrad/DreamTwist.java | 2 +- .../src/mage/sets/innistrad/ElderCathar.java | 2 +- .../src/mage/sets/innistrad/ElderOfLaurels.java | 2 +- Mage.Sets/src/mage/sets/innistrad/EvilTwin.java | 2 +- .../src/mage/sets/innistrad/FalkenrathNoble.java | 2 +- .../src/mage/sets/innistrad/FiendHunter.java | 2 +- .../src/mage/sets/innistrad/FurorOfTheBitten.java | 2 +- .../src/mage/sets/innistrad/GarrukRelentless.java | 2 +- .../src/mage/sets/innistrad/GeistcatchersRig.java | 2 +- .../mage/sets/innistrad/GhostlyPossession.java | 2 +- .../src/mage/sets/innistrad/GraspOfPhantoms.java | 2 +- .../src/mage/sets/innistrad/GraveyardShovel.java | 2 +- .../mage/sets/innistrad/GrimgrinCorpseBorn.java | 2 +- .../mage/sets/innistrad/GruesomeDeformity.java | 2 +- .../src/mage/sets/innistrad/HarvestPyre.java | 2 +- .../src/mage/sets/innistrad/InfernalPlunge.java | 2 +- .../src/mage/sets/innistrad/IntoTheMawOfHell.java | 2 +- .../src/mage/sets/innistrad/KessigWolfRun.java | 2 +- .../src/mage/sets/innistrad/LilianaOfTheVeil.java | 4 ++-- .../src/mage/sets/innistrad/LostInTheMist.java | 2 +- .../src/mage/sets/innistrad/MemorysJourney.java | 2 +- .../src/mage/sets/innistrad/Mindshrieker.java | 2 +- .../src/mage/sets/innistrad/MomentOfHeroism.java | 2 +- .../src/mage/sets/innistrad/MorkrutBanshee.java | 2 +- .../mage/sets/innistrad/NephaliaDrownyard.java | 2 +- .../src/mage/sets/innistrad/NightTerrors.java | 2 +- .../mage/sets/innistrad/NightfallPredator.java | 2 +- .../src/mage/sets/innistrad/OliviaVoldaren.java | 2 +- Mage.Sets/src/mage/sets/innistrad/PreyUpon.java | 4 ++-- .../src/mage/sets/innistrad/RageThrower.java | 2 +- .../src/mage/sets/innistrad/RangersGuile.java | 2 +- .../mage/sets/innistrad/ReaperFromTheAbyss.java | 2 +- .../src/mage/sets/innistrad/SelhoffOccultist.java | 2 +- .../mage/sets/innistrad/SensoryDeprivation.java | 2 +- .../mage/sets/innistrad/SeverTheBloodline.java | 2 +- .../src/mage/sets/innistrad/SilentDeparture.java | 2 +- .../src/mage/sets/innistrad/SilverchaseFox.java | 2 +- .../src/mage/sets/innistrad/SkeletalGrimace.java | 2 +- .../src/mage/sets/innistrad/SkirsdagCultist.java | 2 +- .../mage/sets/innistrad/SlayerOfTheWicked.java | 2 +- .../mage/sets/innistrad/SmiteTheMonstrous.java | 2 +- .../src/mage/sets/innistrad/SnapcasterMage.java | 2 +- .../src/mage/sets/innistrad/SpectralFlight.java | 2 +- .../src/mage/sets/innistrad/SpideryGrasp.java | 2 +- .../src/mage/sets/innistrad/StensiaBloodhall.java | 2 +- .../src/mage/sets/innistrad/TraitorousBlood.java | 2 +- .../src/mage/sets/innistrad/TributeToHunger.java | 2 +- .../src/mage/sets/innistrad/UrgentExorcism.java | 2 +- .../src/mage/sets/innistrad/VictimOfNight.java | 2 +- .../src/mage/sets/innistrad/WreathofGeists.java | 2 +- Mage.Sets/src/mage/sets/invasion/Annihilate.java | 2 +- .../src/mage/sets/invasion/ArmadilloCloak.java | 2 +- .../src/mage/sets/invasion/AssaultBattery.java | 2 +- .../src/mage/sets/invasion/BenalishTrapper.java | 2 +- .../mage/sets/invasion/HannaShipsNavigator.java | 2 +- .../src/mage/sets/invasion/HeroesReunion.java | 2 +- .../src/mage/sets/invasion/HypnoticCloud.java | 2 +- .../src/mage/sets/invasion/PhyrexianAltar.java | 2 +- Mage.Sets/src/mage/sets/invasion/Repulse.java | 2 +- Mage.Sets/src/mage/sets/invasion/Shackles.java | 2 +- .../src/mage/sets/invasion/SpinalEmbrace.java | 2 +- .../sets/invasion/ThunderscapeApprentice.java | 4 ++-- .../mage/sets/invasion/ThunderscapeMaster.java | 2 +- Mage.Sets/src/mage/sets/invasion/TsaboTavoc.java | 2 +- Mage.Sets/src/mage/sets/invasion/Void.java | 2 +- Mage.Sets/src/mage/sets/invasion/Zap.java | 2 +- .../mage/sets/journeyintonyx/AgentOfErebos.java | 2 +- .../mage/sets/journeyintonyx/AkroanMastiff.java | 2 +- .../mage/sets/journeyintonyx/ArmamentOfNyx.java | 2 +- .../mage/sets/journeyintonyx/AspectOfGorgon.java | 2 +- .../sets/journeyintonyx/AthreosGodOfPassage.java | 2 +- .../mage/sets/journeyintonyx/BanishingLight.java | 2 +- .../sets/journeyintonyx/BloodcrazedHoplite.java | 2 +- .../src/mage/sets/journeyintonyx/BrainMaggot.java | 2 +- .../sets/journeyintonyx/CastIntoDarkness.java | 2 +- .../src/mage/sets/journeyintonyx/Deicide.java | 2 +- .../sets/journeyintonyx/DesecrationPlague.java | 2 +- .../sets/journeyintonyx/DesertersQuarters.java | 2 +- .../sets/journeyintonyx/DreadbringerLampads.java | 2 +- .../mage/sets/journeyintonyx/FeastOfDreams.java | 2 +- .../sets/journeyintonyx/FlamespeakersWill.java | 4 ++-- .../src/mage/sets/journeyintonyx/FontOfIre.java | 2 +- .../mage/sets/journeyintonyx/ForgebornOreads.java | 2 +- .../src/mage/sets/journeyintonyx/Godsend.java | 2 +- .../mage/sets/journeyintonyx/GoldenhideOx.java | 2 +- .../sets/journeyintonyx/HarvestguardAlseids.java | 2 +- .../src/mage/sets/journeyintonyx/Hubris.java | 2 +- .../sets/journeyintonyx/KeranosGodOfStorms.java | 2 +- .../journeyintonyx/KingMacarTheGoldCursed.java | 2 +- .../sets/journeyintonyx/KnowledgeAndPower.java | 2 +- .../sets/journeyintonyx/LeoninIconoclast.java | 2 +- .../mage/sets/journeyintonyx/LightningDiadem.java | 4 ++-- .../mage/sets/journeyintonyx/MortalObstinacy.java | 4 ++-- .../mage/sets/journeyintonyx/NightmarishEnd.java | 2 +- .../src/mage/sets/journeyintonyx/NyxInfusion.java | 2 +- .../src/mage/sets/journeyintonyx/NyxWeaver.java | 2 +- .../mage/sets/journeyintonyx/OakheartDryads.java | 2 +- .../mage/sets/journeyintonyx/OppressiveRays.java | 2 +- .../mage/sets/journeyintonyx/PinToTheEarth.java | 2 +- .../mage/sets/journeyintonyx/QuarryColossus.java | 2 +- .../sets/journeyintonyx/RiddleOfLightning.java | 2 +- .../sets/journeyintonyx/RitualOfTheReturned.java | 2 +- .../sets/journeyintonyx/SatyrGrovedancer.java | 2 +- .../mage/sets/journeyintonyx/SetessanTactics.java | 2 +- .../src/mage/sets/journeyintonyx/Skybind.java | 2 +- .../mage/sets/journeyintonyx/SpawnOfThraxes.java | 2 +- .../mage/sets/journeyintonyx/SpiteOfMogis.java | 2 +- .../mage/sets/journeyintonyx/SpitefulBlow.java | 2 +- .../src/mage/sets/journeyintonyx/Starfall.java | 2 +- .../sets/journeyintonyx/StonewiseFortifier.java | 2 +- .../journeyintonyx/StrengthFromTheFallen.java | 2 +- .../sets/journeyintonyx/SupplyLineCranes.java | 2 +- .../mage/sets/journeyintonyx/ThassasDevourer.java | 2 +- .../src/mage/sets/journeyintonyx/ThassasIre.java | 2 +- .../sets/journeyintonyx/TormentedThoughts.java | 2 +- .../mage/sets/journeyintonyx/TritonCavalry.java | 2 +- .../sets/journeyintonyx/WhitewaterNaiads.java | 2 +- .../src/mage/sets/journeyintonyx/WorstFears.java | 2 +- .../src/mage/sets/judgment/CabalTherapy.java | 2 +- .../src/mage/sets/judgment/ElephantGuide.java | 2 +- Mage.Sets/src/mage/sets/judgment/Genesis.java | 2 +- .../src/mage/sets/judgment/GoretuskFirebeast.java | 2 +- .../src/mage/sets/judgment/QuietSpeculation.java | 2 +- .../src/mage/sets/judgment/SylvanSafekeeper.java | 2 +- .../mage/sets/judgment/ThrissNantukoPrimus.java | 2 +- .../mage/sets/judgment/UnquestionedAuthority.java | 2 +- .../src/mage/sets/legends/DemonicTorment.java | 2 +- Mage.Sets/src/mage/sets/legends/Karakas.java | 2 +- Mage.Sets/src/mage/sets/legends/XiraArien.java | 2 +- .../src/mage/sets/legions/GempalmIncinerator.java | 2 +- Mage.Sets/src/mage/sets/legions/HunterSliver.java | 2 +- .../src/mage/sets/legions/NantukoVigilante.java | 2 +- .../mage/sets/limitedalpha/AncestralRecall.java | 2 +- .../src/mage/sets/limitedalpha/AnimateWall.java | 2 +- .../src/mage/sets/limitedalpha/AspectOfWolf.java | 2 +- .../src/mage/sets/limitedalpha/Braingeyser.java | 2 +- .../src/mage/sets/limitedalpha/Burrowing.java | 2 +- .../src/mage/sets/limitedalpha/Conservator.java | 2 +- .../src/mage/sets/limitedalpha/ControlMagic.java | 2 +- .../src/mage/sets/limitedalpha/CopyArtifact.java | 2 +- .../src/mage/sets/limitedalpha/DeathWard.java | 2 +- .../src/mage/sets/limitedalpha/GlassesOfUrza.java | 2 +- .../mage/sets/limitedalpha/HowlFromBeyond.java | 2 +- .../src/mage/sets/limitedalpha/JadeMonolith.java | 2 +- .../src/mage/sets/limitedalpha/ManaShort.java | 2 +- .../src/mage/sets/limitedalpha/MindTwist.java | 2 +- .../mage/sets/limitedalpha/NaturalSelection.java | 2 +- .../mage/sets/limitedalpha/NorthernPaladin.java | 2 +- Mage.Sets/src/mage/sets/limitedalpha/Web.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/BattleMastery.java | 2 +- .../src/mage/sets/lorwyn/BlackPoplarShaman.java | 2 +- .../mage/sets/lorwyn/BrigidHeroOfKinsbaile.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/CribSwap.java | 2 +- .../src/mage/sets/lorwyn/CrypticCommand.java | 2 +- .../src/mage/sets/lorwyn/DrownerOfSecrets.java | 2 +- .../src/mage/sets/lorwyn/EpicProportions.java | 2 +- .../src/mage/sets/lorwyn/EyeblightsEnding.java | 2 +- .../src/mage/sets/lorwyn/GlimmerdustNap.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/Goatnapper.java | 2 +- .../src/mage/sets/lorwyn/HerbalPoultice.java | 2 +- .../src/mage/sets/lorwyn/HornetHarasser.java | 2 +- .../mage/sets/lorwyn/ImmaculateMagistrate.java | 2 +- .../src/mage/sets/lorwyn/InnerFlameAcolyte.java | 2 +- .../src/mage/sets/lorwyn/KinsbaileBalloonist.java | 2 +- .../src/mage/sets/lorwyn/KinsbaileSkirmisher.java | 2 +- .../src/mage/sets/lorwyn/LaceWithMoonglove.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/Lignify.java | 2 +- .../src/mage/sets/lorwyn/MerrowReejerey.java | 4 ++-- .../src/mage/sets/lorwyn/MistbindClique.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/Mournwhelk.java | 2 +- .../src/mage/sets/lorwyn/NathOfTheGiltLeaf.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/NectarFaerie.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/Pestermite.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/PrimalCommand.java | 4 ++-- .../src/mage/sets/lorwyn/ProtectiveBubble.java | 2 +- .../src/mage/sets/lorwyn/SowerOfTemptation.java | 2 +- .../src/mage/sets/lorwyn/SpiderwigBoggart.java | 2 +- .../src/mage/sets/lorwyn/StonybrookAngler.java | 2 +- .../src/mage/sets/lorwyn/StreambedAquitects.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/Surgespanner.java | 2 +- .../src/mage/sets/lorwyn/ThorntoothWitch.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/Thoughtseize.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/ZephyrNet.java | 2 +- .../src/mage/sets/magic2010/AcidicSlime.java | 2 +- .../src/mage/sets/magic2010/AcolyteOfXathrid.java | 2 +- .../src/mage/sets/magic2010/ActOfTreason.java | 2 +- .../src/mage/sets/magic2010/AlluringSiren.java | 2 +- .../src/mage/sets/magic2010/ArmoredAscension.java | 2 +- .../src/mage/sets/magic2010/BlindingMage.java | 2 +- .../src/mage/sets/magic2010/CapriciousEfreet.java | 2 +- .../src/mage/sets/magic2010/ChandraNalaar.java | 6 +++--- Mage.Sets/src/mage/sets/magic2010/Disorient.java | 2 +- Mage.Sets/src/mage/sets/magic2010/DoomBlade.java | 2 +- Mage.Sets/src/mage/sets/magic2010/Duress.java | 2 +- .../src/mage/sets/magic2010/EntanglingVines.java | 2 +- Mage.Sets/src/mage/sets/magic2010/HarmsWay.java | 2 +- .../src/mage/sets/magic2010/HauntingEchoes.java | 2 +- Mage.Sets/src/mage/sets/magic2010/IceCage.java | 2 +- .../mage/sets/magic2010/Indestructibility.java | 2 +- .../src/mage/sets/magic2010/JaceBeleren.java | 4 ++-- Mage.Sets/src/mage/sets/magic2010/Jump.java | 2 +- .../src/mage/sets/magic2010/KindledFury.java | 2 +- .../mage/sets/magic2010/LightwielderPaladin.java | 2 +- .../src/mage/sets/magic2010/LilianaVess.java | 2 +- .../mage/sets/magic2010/MasterOfTheWildHunt.java | 2 +- .../src/mage/sets/magic2010/MightOfOaks.java | 2 +- .../src/mage/sets/magic2010/MindControl.java | 2 +- .../src/mage/sets/magic2010/MindShatter.java | 2 +- Mage.Sets/src/mage/sets/magic2010/Oakenform.java | 2 +- Mage.Sets/src/mage/sets/magic2010/Polymorph.java | 2 +- Mage.Sets/src/mage/sets/magic2010/Regenerate.java | 2 +- .../src/mage/sets/magic2010/SanguineBond.java | 2 +- .../src/mage/sets/magic2010/SeismicStrike.java | 2 +- .../src/mage/sets/magic2010/SignInBlood.java | 2 +- Mage.Sets/src/mage/sets/magic2010/Sleep.java | 2 +- .../src/mage/sets/magic2010/SolemnOffering.java | 2 +- Mage.Sets/src/mage/sets/magic2010/SoulBleed.java | 2 +- .../mage/sets/magic2010/TendrilsOfCorruption.java | 2 +- Mage.Sets/src/mage/sets/magic2010/TimeWarp.java | 2 +- Mage.Sets/src/mage/sets/magic2010/TomeScour.java | 2 +- .../src/mage/sets/magic2010/UndeadSlayer.java | 2 +- .../mage/sets/magic2010/VampireAristocrat.java | 2 +- Mage.Sets/src/mage/sets/magic2010/Weakness.java | 2 +- .../src/mage/sets/magic2010/XathridDemon.java | 2 +- .../src/mage/sets/magic2011/AetherAdept.java | 2 +- Mage.Sets/src/mage/sets/magic2011/AirServant.java | 2 +- .../src/mage/sets/magic2011/AncientHellkite.java | 2 +- .../src/mage/sets/magic2011/BrittleEffigy.java | 2 +- .../mage/sets/magic2011/CaptivatingVampire.java | 2 +- .../src/mage/sets/magic2011/ChandrasOutrage.java | 2 +- Mage.Sets/src/mage/sets/magic2011/Combust.java | 2 +- .../src/mage/sets/magic2011/CyclopsGladiator.java | 2 +- Mage.Sets/src/mage/sets/magic2011/Diminish.java | 2 +- .../src/mage/sets/magic2011/DryadsFavor.java | 2 +- Mage.Sets/src/mage/sets/magic2011/Fling.java | 2 +- Mage.Sets/src/mage/sets/magic2011/FrostTitan.java | 2 +- Mage.Sets/src/mage/sets/magic2011/Incite.java | 2 +- .../src/mage/sets/magic2011/JacesErasure.java | 2 +- Mage.Sets/src/mage/sets/magic2011/JinxedIdol.java | 4 ++-- .../src/mage/sets/magic2011/LilianasCaress.java | 2 +- .../src/mage/sets/magic2011/ManicVandal.java | 2 +- Mage.Sets/src/mage/sets/magic2011/MightyLeap.java | 2 +- .../src/mage/sets/magic2011/MystifyingMaze.java | 2 +- .../src/mage/sets/magic2011/NecroticPlague.java | 4 ++-- Mage.Sets/src/mage/sets/magic2011/Plummet.java | 2 +- .../src/mage/sets/magic2011/PrimalCocoon.java | 2 +- .../src/mage/sets/magic2011/QuagSickness.java | 2 +- .../src/mage/sets/magic2011/ShivsEmbrace.java | 2 +- .../src/mage/sets/magic2011/StabbingPain.java | 2 +- .../src/mage/sets/magic2011/ThunderStrike.java | 2 +- .../src/mage/sets/magic2011/VengefulArchon.java | 2 +- .../src/mage/sets/magic2011/VisceraSeer.java | 2 +- .../src/mage/sets/magic2011/VolcanicStrength.java | 2 +- Mage.Sets/src/mage/sets/magic2011/VoltaicKey.java | 2 +- .../src/mage/sets/magic2011/WarPriestOfThune.java | 2 +- Mage.Sets/src/mage/sets/magic2012/AegisAngel.java | 2 +- .../src/mage/sets/magic2012/AlabasterMage.java | 2 +- .../src/mage/sets/magic2012/AngelicDestiny.java | 2 +- .../src/mage/sets/magic2012/ArachnusSpinner.java | 2 +- .../src/mage/sets/magic2012/ArachnusWeb.java | 2 +- Mage.Sets/src/mage/sets/magic2012/ChasmDrake.java | 2 +- .../src/mage/sets/magic2012/CrimsonMage.java | 2 +- .../src/mage/sets/magic2012/CrownOfEmpires.java | 2 +- Mage.Sets/src/mage/sets/magic2012/DarkFavor.java | 2 +- .../src/mage/sets/magic2012/DevouringSwarm.java | 2 +- .../src/mage/sets/magic2012/DivineFavor.java | 2 +- .../src/mage/sets/magic2012/Firebreathing.java | 2 +- Mage.Sets/src/mage/sets/magic2012/Flight.java | 2 +- .../src/mage/sets/magic2012/GideonsLawkeeper.java | 2 +- .../mage/sets/magic2012/GoblinFireslinger.java | 2 +- .../src/mage/sets/magic2012/HuntersInsight.java | 2 +- .../src/mage/sets/magic2012/JaceMemoryAdept.java | 4 ++-- Mage.Sets/src/mage/sets/magic2012/Lifelink.java | 2 +- .../src/mage/sets/magic2012/MasterThief.java | 2 +- .../src/mage/sets/magic2012/MerfolkMesmerist.java | 2 +- Mage.Sets/src/mage/sets/magic2012/Monomania.java | 2 +- Mage.Sets/src/mage/sets/magic2012/OnyxMage.java | 2 +- .../src/mage/sets/magic2012/ScepterOfEmpires.java | 2 +- .../src/mage/sets/magic2012/SorinsThirst.java | 2 +- .../src/mage/sets/magic2012/SorinsVengeance.java | 2 +- .../src/mage/sets/magic2012/SpiritMantle.java | 2 +- Mage.Sets/src/mage/sets/magic2012/StaveOff.java | 2 +- .../mage/sets/magic2012/StingerflingSpider.java | 2 +- .../mage/sets/magic2012/StonehornDignitary.java | 2 +- .../src/mage/sets/magic2012/TasteOfBlood.java | 2 +- .../src/mage/sets/magic2012/TitanicGrowth.java | 2 +- Mage.Sets/src/mage/sets/magic2012/Trollhide.java | 2 +- Mage.Sets/src/mage/sets/magic2012/TurnToFrog.java | 2 +- Mage.Sets/src/mage/sets/magic2012/WringFlesh.java | 2 +- .../sets/magic2013/AjaniCallerOfThePride.java | 2 +- Mage.Sets/src/mage/sets/magic2013/ArmsDealer.java | 2 +- .../mage/sets/magic2013/BattleflightEagle.java | 2 +- .../src/mage/sets/magic2013/BloodhunterBat.java | 2 +- Mage.Sets/src/mage/sets/magic2013/BondBeetle.java | 2 +- .../src/mage/sets/magic2013/ChandrasFury.java | 2 +- .../mage/sets/magic2013/CourtlyProvocateur.java | 4 ++-- .../src/mage/sets/magic2013/CripplingBlight.java | 2 +- .../src/mage/sets/magic2013/DiscipleOfBolas.java | 2 +- Mage.Sets/src/mage/sets/magic2013/Encrust.java | 2 +- .../mage/sets/magic2013/GoblinBattleJester.java | 2 +- Mage.Sets/src/mage/sets/magic2013/Hydrosurge.java | 2 +- .../sets/magic2013/LilianaOfTheDarkRealms.java | 2 +- .../src/mage/sets/magic2013/MarkOfTheVampire.java | 2 +- Mage.Sets/src/mage/sets/magic2013/MindSculpt.java | 2 +- .../src/mage/sets/magic2013/MindclawShaman.java | 2 +- Mage.Sets/src/mage/sets/magic2013/Murder.java | 2 +- .../src/mage/sets/magic2013/PublicExecution.java | 2 +- .../src/mage/sets/magic2013/SandsOfDelirium.java | 2 +- .../src/mage/sets/magic2013/SearingSpear.java | 2 +- .../src/mage/sets/magic2013/SerpentsGift.java | 2 +- .../src/mage/sets/magic2013/ShowOfValor.java | 2 +- .../src/mage/sets/magic2013/TricksOfTheTrade.java | 2 +- .../src/mage/sets/magic2013/VoidStalker.java | 2 +- Mage.Sets/src/mage/sets/magic2013/WitsEnd.java | 2 +- .../src/mage/sets/magic2013/XathridGorgon.java | 2 +- .../src/mage/sets/magic2013/YevasForcemage.java | 2 +- .../mage/sets/magic2014/AdvocateOfTheBeast.java | 2 +- .../src/mage/sets/magic2014/ArtificersHex.java | 2 +- .../src/mage/sets/magic2014/BanisherPriest.java | 2 +- .../mage/sets/magic2014/BarrageOfExpendables.java | 2 +- .../src/mage/sets/magic2014/Blightcaster.java | 2 +- .../src/mage/sets/magic2014/CelestialFlare.java | 2 +- .../mage/sets/magic2014/ChandraPyromaster.java | 2 +- .../src/mage/sets/magic2014/ColossalWhale.java | 2 +- Mage.Sets/src/mage/sets/magic2014/Enlarge.java | 2 +- .../src/mage/sets/magic2014/FleshpulperGiant.java | 2 +- .../src/mage/sets/magic2014/GnawingZombie.java | 4 ++-- .../src/mage/sets/magic2014/HuntTheWeak.java | 4 ++-- .../src/mage/sets/magic2014/IllusionaryArmor.java | 2 +- .../src/mage/sets/magic2014/JacesMindseeker.java | 2 +- .../src/mage/sets/magic2014/LifebaneZombie.java | 2 +- .../src/mage/sets/magic2014/LiturgyOfBlood.java | 2 +- .../mage/sets/magic2014/MasterOfDiversion.java | 2 +- .../mage/sets/magic2014/OathOfTheAncientWood.java | 2 +- .../src/mage/sets/magic2014/PrimevalBounty.java | 2 +- .../src/mage/sets/magic2014/ShadowbornDemon.java | 4 ++-- .../mage/sets/magic2014/ThorncasterSliver.java | 2 +- .../src/mage/sets/magic2014/TidebinderMage.java | 2 +- .../src/mage/sets/magic2014/VialOfPoison.java | 2 +- .../src/mage/sets/magic2014/ZephyrCharge.java | 2 +- .../src/mage/sets/mercadianmasques/Bribery.java | 2 +- .../sets/mercadianmasques/CateranOverlord.java | 2 +- .../mage/sets/mercadianmasques/HighMarket.java | 2 +- .../src/mage/sets/mercadianmasques/Lunge.java | 4 ++-- .../src/mage/sets/mercadianmasques/Muzzle.java | 2 +- .../src/mage/sets/mercadianmasques/SnuffOut.java | 2 +- .../src/mage/sets/mercadianmasques/Unmask.java | 2 +- .../sets/mercadianmasques/WaterfrontBouncer.java | 2 +- Mage.Sets/src/mage/sets/mirage/AbyssalHunter.java | 2 +- Mage.Sets/src/mage/sets/mirage/Afterlife.java | 2 +- Mage.Sets/src/mage/sets/mirage/Agility.java | 2 +- Mage.Sets/src/mage/sets/mirage/AmberPrison.java | 2 +- .../src/mage/sets/mirage/BlightedShaman.java | 6 +++--- .../src/mage/sets/mirage/ForbiddenCrypt.java | 2 +- .../src/mage/sets/mirage/HarmattanEfreet.java | 2 +- .../src/mage/sets/mirage/IllicitAuction.java | 2 +- .../src/mage/sets/mirage/PainfulMemories.java | 2 +- .../mage/sets/mirage/PhyrexianDreadnought.java | 2 +- .../src/mage/sets/mirage/PsychicTransfer.java | 2 +- Mage.Sets/src/mage/sets/mirage/UnseenWalker.java | 2 +- Mage.Sets/src/mage/sets/mirrodin/AltarsLight.java | 2 +- Mage.Sets/src/mage/sets/mirrodin/Arrest.java | 2 +- .../src/mage/sets/mirrodin/AuriokBladewarden.java | 2 +- .../src/mage/sets/mirrodin/AuriokTransfixer.java | 2 +- .../src/mage/sets/mirrodin/Battlegrowth.java | 2 +- Mage.Sets/src/mage/sets/mirrodin/Bloodscent.java | 2 +- Mage.Sets/src/mage/sets/mirrodin/Deconstruct.java | 2 +- Mage.Sets/src/mage/sets/mirrodin/DragonBlood.java | 2 +- Mage.Sets/src/mage/sets/mirrodin/Duplicant.java | 2 +- Mage.Sets/src/mage/sets/mirrodin/ElfReplica.java | 2 +- Mage.Sets/src/mage/sets/mirrodin/FieryGambit.java | 2 +- Mage.Sets/src/mage/sets/mirrodin/GalvanicKey.java | 2 +- .../src/mage/sets/mirrodin/GoblinReplica.java | 2 +- .../src/mage/sets/mirrodin/LoomingHoverguard.java | 2 +- .../src/mage/sets/mirrodin/LoxodonMender.java | 2 +- .../src/mage/sets/mirrodin/NecrogenSpellbomb.java | 2 +- Mage.Sets/src/mage/sets/mirrodin/NimReplica.java | 2 +- Mage.Sets/src/mage/sets/mirrodin/NimShambler.java | 2 +- .../src/mage/sets/mirrodin/OblivionStone.java | 2 +- .../src/mage/sets/mirrodin/PredatorsStrike.java | 2 +- Mage.Sets/src/mage/sets/mirrodin/Regress.java | 2 +- .../src/mage/sets/mirrodin/RustsporeRam.java | 2 +- .../src/mage/sets/mirrodin/ScaleOfChissGoria.java | 2 +- Mage.Sets/src/mage/sets/mirrodin/Shatter.java | 2 +- .../src/mage/sets/mirrodin/ToothOfChissGoria.java | 2 +- .../src/mage/sets/mirrodin/TowerOfChampions.java | 2 +- .../src/mage/sets/mirrodin/TowerOfMurmurs.java | 2 +- .../src/mage/sets/mirrodin/TrollsOfTelJilad.java | 2 +- Mage.Sets/src/mage/sets/mirrodin/TurnToDust.java | 2 +- Mage.Sets/src/mage/sets/mirrodin/WrenchMind.java | 2 +- .../sets/mirrodinbesieged/BanishmentDecree.java | 2 +- .../sets/mirrodinbesieged/BlueSunsZenith.java | 2 +- .../mage/sets/mirrodinbesieged/BrassSquire.java | 2 +- .../mage/sets/mirrodinbesieged/BurntheImpure.java | 2 +- .../sets/mirrodinbesieged/ConcussiveBolt.java | 2 +- .../mirrodinbesieged/CorruptedConscience.java | 2 +- .../mage/sets/mirrodinbesieged/Cryptoplasm.java | 4 ++-- .../mage/sets/mirrodinbesieged/DecimatorWeb.java | 2 +- .../sets/mirrodinbesieged/DivineOffering.java | 2 +- .../mage/sets/mirrodinbesieged/FleshEaterImp.java | 2 +- .../sets/mirrodinbesieged/GoForTheThroat.java | 2 +- .../mage/sets/mirrodinbesieged/GoreVassal.java | 2 +- .../mirrodinbesieged/HorrifyingRevelation.java | 2 +- .../mage/sets/mirrodinbesieged/IntoTheCore.java | 4 ++-- .../sets/mirrodinbesieged/LeoninRelicWarder.java | 2 +- .../mage/sets/mirrodinbesieged/MagneticMine.java | 2 +- .../sets/mirrodinbesieged/MetallicMastery.java | 2 +- .../mage/sets/mirrodinbesieged/MirranMettle.java | 2 +- .../src/mage/sets/mirrodinbesieged/MirranSpy.java | 2 +- .../src/mage/sets/mirrodinbesieged/Phyresis.java | 2 +- .../mage/sets/mirrodinbesieged/PierceStrider.java | 2 +- .../mage/sets/mirrodinbesieged/PistonSledge.java | 2 +- .../mage/sets/mirrodinbesieged/PistusStrike.java | 2 +- .../sets/mirrodinbesieged/PlaguemawBeast.java | 2 +- .../mage/sets/mirrodinbesieged/Shriekhorn.java | 2 +- .../mage/sets/mirrodinbesieged/SpinEngine.java | 2 +- .../mage/sets/mirrodinbesieged/SpineOfIshSah.java | 2 +- .../sets/mirrodinbesieged/SpreadTheSickness.java | 2 +- .../mirrodinbesieged/TezzeretAgentOfBolas.java | 4 ++-- .../sets/mirrodinbesieged/UnnaturalPredation.java | 2 +- .../sets/mirrodinbesieged/VedalkenAnatomist.java | 2 +- .../sets/mirrodinbesieged/ViridianCorrupter.java | 2 +- .../mage/sets/mirrodinbesieged/VirulentWound.java | 2 +- .../mage/sets/mirrodinbesieged/Vivisection.java | 2 +- .../mage/sets/modernmasters/BoundInSilence.java | 2 +- .../mage/sets/modernmasters/DampenThought.java | 2 +- .../src/mage/sets/modernmasters/DeathRattle.java | 2 +- .../sets/modernmasters/DreamspoilerWitches.java | 2 +- .../src/mage/sets/modernmasters/EarwigSquad.java | 2 +- .../mage/sets/modernmasters/EchoingCourage.java | 2 +- .../src/mage/sets/modernmasters/GlacialRay.java | 2 +- .../src/mage/sets/modernmasters/Peppersmoke.java | 2 +- .../mage/sets/modernmasters/RiftElemental.java | 2 +- .../mage/sets/modernmasters/StonehewerGiant.java | 2 +- .../mage/sets/modernmasters/TakePossession.java | 2 +- .../src/mage/sets/modernmasters/TestOfFaith.java | 2 +- .../mage/sets/modernmasters/ThievingSprite.java | 2 +- .../mage/sets/modernmasters/TrygonPredator.java | 2 +- .../mage/sets/modernmasters/WarrenWeirding.java | 2 +- .../sets/morningtide/BurrentonShieldBearers.java | 2 +- .../src/mage/sets/morningtide/DailyRegimen.java | 2 +- .../src/mage/sets/morningtide/Earthbrawn.java | 2 +- .../mage/sets/morningtide/GiltLeafArchdruid.java | 2 +- .../src/mage/sets/morningtide/Meadowboon.java | 2 +- .../src/mage/sets/morningtide/NogginWhack.java | 2 +- .../src/mage/sets/morningtide/RageForger.java | 2 +- .../src/mage/sets/morningtide/ScarbladeElite.java | 2 +- .../src/mage/sets/morningtide/Shinewend.java | 2 +- .../src/mage/sets/morningtide/Slithermuse.java | 2 +- .../src/mage/sets/morningtide/Stingmoggie.java | 2 +- .../mage/sets/morningtide/VendilionClique.java | 2 +- .../src/mage/sets/morningtide/VioletPall.java | 2 +- .../src/mage/sets/nemesis/SealOfCleansing.java | 2 +- .../src/mage/sets/nemesis/SealOfRemoval.java | 2 +- .../src/mage/sets/nemesis/SealOfStrength.java | 2 +- Mage.Sets/src/mage/sets/nemesis/Submerge.java | 2 +- .../src/mage/sets/nemesis/ViciousHunger.java | 2 +- .../mage/sets/newphyrexia/ActOfAggression.java | 2 +- .../src/mage/sets/newphyrexia/ArgentMutation.java | 2 +- .../src/mage/sets/newphyrexia/ArmWithAEther.java | 2 +- .../src/mage/sets/newphyrexia/BeastWithin.java | 2 +- .../src/mage/sets/newphyrexia/BirthingPod.java | 2 +- .../src/mage/sets/newphyrexia/BlindZealot.java | 2 +- .../mage/sets/newphyrexia/BlindingSouleater.java | 2 +- .../mage/sets/newphyrexia/BrutalizerExarch.java | 2 +- .../mage/sets/newphyrexia/CaressOfPhyrexia.java | 2 +- .../src/mage/sets/newphyrexia/DeceiverExarch.java | 4 ++-- .../mage/sets/newphyrexia/DefensiveStance.java | 2 +- .../src/mage/sets/newphyrexia/DementiaBat.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/Despise.java | 2 +- .../src/mage/sets/newphyrexia/Dismember.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/Dispatch.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/Enslave.java | 2 +- .../src/mage/sets/newphyrexia/EntomberExarch.java | 2 +- .../mage/sets/newphyrexia/EtchedMonstrosity.java | 2 +- .../mage/sets/newphyrexia/ExclusionRitual.java | 2 +- .../src/mage/sets/newphyrexia/ForcedWorship.java | 2 +- .../src/mage/sets/newphyrexia/GethsVerdict.java | 2 +- .../src/mage/sets/newphyrexia/GitaxianProbe.java | 2 +- .../src/mage/sets/newphyrexia/GlisteningOil.java | 2 +- .../mage/sets/newphyrexia/GreenhiltTrainee.java | 2 +- .../src/mage/sets/newphyrexia/GrimAffliction.java | 2 +- .../src/mage/sets/newphyrexia/HexParasite.java | 2 +- .../src/mage/sets/newphyrexia/IchorExplosion.java | 2 +- .../mage/sets/newphyrexia/InquisitorExarch.java | 2 +- .../src/mage/sets/newphyrexia/KarnLiberated.java | 4 ++-- .../src/mage/sets/newphyrexia/LifesFinale.java | 2 +- .../src/mage/sets/newphyrexia/Mindculling.java | 2 +- .../src/mage/sets/newphyrexia/MortisDogs.java | 2 +- .../mage/sets/newphyrexia/MutagenicGrowth.java | 2 +- .../src/mage/sets/newphyrexia/NumbingDose.java | 2 +- .../mage/sets/newphyrexia/ParasiticImplant.java | 2 +- .../mage/sets/newphyrexia/PhyrexianIngester.java | 2 +- .../mage/sets/newphyrexia/PhyrexianMetamorph.java | 2 +- .../src/mage/sets/newphyrexia/PithDriller.java | 2 +- .../src/mage/sets/newphyrexia/PraetorsGrasp.java | 2 +- .../src/mage/sets/newphyrexia/ScrapyardSalvo.java | 2 +- .../sets/newphyrexia/ShrineOfLimitlessPower.java | 2 +- .../src/mage/sets/newphyrexia/SoulConduit.java | 4 ++-- .../mage/sets/newphyrexia/SwordOfWarAndPeace.java | 2 +- .../mage/sets/newphyrexia/TormentorExarch.java | 4 ++-- .../src/mage/sets/newphyrexia/VaporSnag.java | 2 +- .../sets/newphyrexia/VictoriousDestruction.java | 2 +- .../src/mage/sets/newphyrexia/VitalSplicer.java | 2 +- .../mage/sets/ninthedition/AvenWindreader.java | 2 +- .../mage/sets/ninthedition/ContaminatedBond.java | 2 +- .../src/mage/sets/ninthedition/EarlyHarvest.java | 2 +- Mage.Sets/src/mage/sets/ninthedition/Enrage.java | 2 +- Mage.Sets/src/mage/sets/ninthedition/Execute.java | 2 +- .../src/mage/sets/ninthedition/GravePact.java | 2 +- .../src/mage/sets/ninthedition/Nekrataal.java | 2 +- Mage.Sets/src/mage/sets/ninthedition/Slay.java | 2 +- .../src/mage/sets/ninthedition/TemporalAdept.java | 2 +- .../mage/sets/odyssey/AboshanCephalidEmperor.java | 4 ++-- .../src/mage/sets/odyssey/AboshansDesire.java | 2 +- .../src/mage/sets/odyssey/AcceptableLosses.java | 2 +- Mage.Sets/src/mage/sets/odyssey/AegisOfHonor.java | 2 +- .../src/mage/sets/odyssey/BarbarianLunatic.java | 2 +- .../src/mage/sets/odyssey/BarbarianRing.java | 2 +- Mage.Sets/src/mage/sets/odyssey/BlazingSalvo.java | 2 +- Mage.Sets/src/mage/sets/odyssey/BombSquad.java | 2 +- .../src/mage/sets/odyssey/CabalInquisitor.java | 2 +- .../src/mage/sets/odyssey/CabalPatriarch.java | 4 ++-- Mage.Sets/src/mage/sets/odyssey/CabalPit.java | 2 +- Mage.Sets/src/mage/sets/odyssey/CausticTar.java | 2 +- Mage.Sets/src/mage/sets/odyssey/CeaseFire.java | 2 +- .../src/mage/sets/odyssey/CentaurGarden.java | 2 +- .../src/mage/sets/odyssey/CephalidBroker.java | 2 +- .../src/mage/sets/odyssey/CephalidColiseum.java | 2 +- .../src/mage/sets/odyssey/CephalidLooter.java | 2 +- .../src/mage/sets/odyssey/CephalidRetainer.java | 2 +- Mage.Sets/src/mage/sets/odyssey/Chainflinger.java | 4 ++-- .../mage/sets/odyssey/ChamberOfManipulation.java | 2 +- Mage.Sets/src/mage/sets/odyssey/CoffinPurge.java | 2 +- .../src/mage/sets/odyssey/Dematerialize.java | 2 +- .../src/mage/sets/odyssey/DevotedCaretaker.java | 2 +- Mage.Sets/src/mage/sets/odyssey/DoggedHunter.java | 2 +- Mage.Sets/src/mage/sets/odyssey/DruidsCall.java | 2 +- .../src/mage/sets/odyssey/EngulfingFlames.java | 2 +- Mage.Sets/src/mage/sets/odyssey/Extract.java | 2 +- Mage.Sets/src/mage/sets/odyssey/Firebolt.java | 2 +- .../src/mage/sets/odyssey/GhastlyDemise.java | 2 +- .../src/mage/sets/odyssey/HallowedHealer.java | 4 ++-- .../src/mage/sets/odyssey/ImmobilizingInk.java | 2 +- .../src/mage/sets/odyssey/KamahlsDesire.java | 2 +- .../mage/sets/odyssey/LaquatussCreativity.java | 2 +- .../mage/sets/odyssey/MalevolentAwakening.java | 2 +- .../src/mage/sets/odyssey/MasterApothecary.java | 4 ++-- Mage.Sets/src/mage/sets/odyssey/MorbidHunger.java | 2 +- Mage.Sets/src/mage/sets/odyssey/Mudhole.java | 2 +- .../src/mage/sets/odyssey/NantukoDisciple.java | 2 +- .../src/mage/sets/odyssey/NantukoMentor.java | 2 +- Mage.Sets/src/mage/sets/odyssey/NeedForSpeed.java | 2 +- Mage.Sets/src/mage/sets/odyssey/NomadDecoy.java | 4 ++-- Mage.Sets/src/mage/sets/odyssey/PardicMiner.java | 2 +- .../src/mage/sets/odyssey/PatriarchsDesire.java | 2 +- Mage.Sets/src/mage/sets/odyssey/PrimalFrenzy.java | 2 +- Mage.Sets/src/mage/sets/odyssey/PsionicGift.java | 4 ++-- .../src/mage/sets/odyssey/RayOfDistortion.java | 2 +- Mage.Sets/src/mage/sets/odyssey/Refresh.java | 2 +- Mage.Sets/src/mage/sets/odyssey/Repel.java | 2 +- .../src/mage/sets/odyssey/RepentantVampire.java | 2 +- .../src/mage/sets/odyssey/SadisticHypnotist.java | 2 +- Mage.Sets/src/mage/sets/odyssey/Shelter.java | 2 +- .../src/mage/sets/odyssey/SkullFracture.java | 2 +- Mage.Sets/src/mage/sets/odyssey/SparkMage.java | 4 ++-- Mage.Sets/src/mage/sets/odyssey/Spiritualize.java | 2 +- Mage.Sets/src/mage/sets/odyssey/ThermalBlast.java | 2 +- Mage.Sets/src/mage/sets/odyssey/Tombfire.java | 2 +- .../mage/sets/odyssey/TouchOfInvisibility.java | 2 +- Mage.Sets/src/mage/sets/odyssey/Whipkeeper.java | 2 +- .../src/mage/sets/odyssey/ZombieAssassin.java | 2 +- .../src/mage/sets/onslaught/AstralSlide.java | 2 +- Mage.Sets/src/mage/sets/onslaught/Blackmail.java | 2 +- .../src/mage/sets/onslaught/CatapultMaster.java | 2 +- .../src/mage/sets/onslaught/CruelRevival.java | 2 +- .../src/mage/sets/onslaught/DirgeOfDread.java | 2 +- .../src/mage/sets/onslaught/GoblinBurrows.java | 2 +- .../src/mage/sets/onslaught/GoblinSledder.java | 2 +- .../src/mage/sets/onslaught/RavenousBaloth.java | 2 +- Mage.Sets/src/mage/sets/onslaught/Sparksmith.java | 2 +- .../mage/sets/onslaught/SupremeInquisitor.java | 2 +- Mage.Sets/src/mage/sets/onslaught/Swat.java | 2 +- .../src/mage/sets/onslaught/WirewoodLodge.java | 2 +- .../src/mage/sets/onslaught/WordsOfWind.java | 2 +- .../src/mage/sets/planarchaos/BigGameHunter.java | 2 +- .../src/mage/sets/planarchaos/Blightspeaker.java | 2 +- .../src/mage/sets/planarchaos/BruteForce.java | 2 +- .../src/mage/sets/planarchaos/DawnCharm.java | 2 +- .../mage/sets/planarchaos/ErraticMutation.java | 2 +- .../src/mage/sets/planarchaos/FatalFrenzy.java | 2 +- .../src/mage/sets/planarchaos/FuryCharm.java | 4 ++-- .../mage/sets/planarchaos/HammerheimDeadeye.java | 2 +- .../src/mage/sets/planarchaos/KeenSense.java | 2 +- .../mage/sets/planarchaos/KeldonMarauders.java | 4 ++-- .../src/mage/sets/planarchaos/NecroticSliver.java | 2 +- .../src/mage/sets/planarchaos/PorphyryNodes.java | 2 +- .../src/mage/sets/planarchaos/PoulticeSliver.java | 2 +- .../src/mage/sets/planarchaos/RathiTrapper.java | 2 +- .../src/mage/sets/planarchaos/Saltblast.java | 2 +- .../mage/sets/planarchaos/SaltfieldRecluse.java | 2 +- .../mage/sets/planarchaos/SealOfPrimordium.java | 2 +- .../src/mage/sets/planarchaos/Stingscourger.java | 2 +- Mage.Sets/src/mage/sets/planarchaos/Sunlance.java | 2 +- .../src/mage/sets/planechase/BogardanRager.java | 2 +- Mage.Sets/src/mage/sets/planechase/Briarhorn.java | 2 +- .../src/mage/sets/planechase/CranialPlating.java | 2 +- .../mage/sets/planechase/DoorToNothingness.java | 2 +- .../src/mage/sets/planechase/EtchedOracle.java | 2 +- .../src/mage/sets/planechase/FesteringGoblin.java | 2 +- .../src/mage/sets/planechase/FiresOfYavimaya.java | 2 +- .../src/mage/sets/planechase/FlametongueKavu.java | 2 +- .../src/mage/sets/planechase/KeldonChampion.java | 2 +- .../src/mage/sets/planechase/PhyrexianGhoul.java | 2 +- .../mage/sets/planechase/RaziaBorosArchangel.java | 4 ++-- .../src/mage/sets/planechase/RecklessCharge.java | 2 +- .../planechase/SunhomeFortressOfTheLegion.java | 2 +- .../mage/sets/planechase2012/FelidarUmbra.java | 4 ++-- .../src/mage/sets/planechase2012/IndrikUmbra.java | 2 +- .../sets/planechase2012/KrondTheDawnClad.java | 2 +- .../src/mage/sets/planechase2012/LastStand.java | 4 ++-- .../sets/planechase2012/NullmageAdvocate.java | 2 +- .../sets/planechase2012/PollenbrightWings.java | 2 +- .../mage/sets/planechase2012/QuietDisrepair.java | 2 +- .../src/mage/sets/planeshift/CavernHarpy.java | 2 +- .../src/mage/sets/planeshift/GaeasMight.java | 2 +- .../src/mage/sets/planeshift/OrimsChant.java | 2 +- .../sets/portalthreekingdoms/BurningOfXinye.java | 2 +- .../sets/portalthreekingdoms/CaoCaoLordOfWei.java | 2 +- .../portalthreekingdoms/DiaochanArtfulBeauty.java | 4 ++-- Mage.Sets/src/mage/sets/prophecy/Abolish.java | 2 +- .../src/mage/sets/prophecy/AgentOfShauku.java | 2 +- .../src/mage/sets/prophecy/ShieldDancer.java | 2 +- .../src/mage/sets/prophecy/VerdantField.java | 2 +- .../src/mage/sets/ravnika/BorosGuildmage.java | 4 ++-- Mage.Sets/src/mage/sets/ravnika/Caregiver.java | 2 +- .../src/mage/sets/ravnika/ClingingDarkness.java | 2 +- .../mage/sets/ravnika/ClutchOfTheUndercity.java | 2 +- .../src/mage/sets/ravnika/CompulsiveResearch.java | 2 +- .../mage/sets/ravnika/ConsultTheNecrosages.java | 4 ++-- .../src/mage/sets/ravnika/CyclopeanSnare.java | 2 +- Mage.Sets/src/mage/sets/ravnika/Darkblast.java | 2 +- .../src/mage/sets/ravnika/DimirGuildmage.java | 4 ++-- .../src/mage/sets/ravnika/DimirHouseGuard.java | 2 +- Mage.Sets/src/mage/sets/ravnika/DizzySpell.java | 2 +- .../sets/ravnika/DuskmantleHouseOfShadow.java | 2 +- .../src/mage/sets/ravnika/ElvishSkysweeper.java | 4 ++-- .../src/mage/sets/ravnika/EtherealUsher.java | 2 +- .../src/mage/sets/ravnika/FieryConclusion.java | 4 ++-- .../src/mage/sets/ravnika/FistsOfIronwood.java | 2 +- .../src/mage/sets/ravnika/FlightOfFancy.java | 2 +- Mage.Sets/src/mage/sets/ravnika/GalvanicArc.java | 2 +- .../src/mage/sets/ravnika/GatherCourage.java | 2 +- .../mage/sets/ravnika/GlimpseTheUnthinkable.java | 2 +- .../src/mage/sets/ravnika/GolgariGuildmage.java | 4 ++-- .../src/mage/sets/ravnika/GolgariRotwurm.java | 4 ++-- Mage.Sets/src/mage/sets/ravnika/GolgariThug.java | 2 +- Mage.Sets/src/mage/sets/ravnika/HuntedDragon.java | 2 +- Mage.Sets/src/mage/sets/ravnika/HuntedHorror.java | 2 +- .../src/mage/sets/ravnika/HuntedLammasu.java | 2 +- .../src/mage/sets/ravnika/HuntedPhantasm.java | 2 +- Mage.Sets/src/mage/sets/ravnika/HuntedTroll.java | 2 +- .../src/mage/sets/ravnika/InfectiousHost.java | 2 +- Mage.Sets/src/mage/sets/ravnika/IvyDancer.java | 2 +- .../src/mage/sets/ravnika/KeeningBanshee.java | 2 +- Mage.Sets/src/mage/sets/ravnika/LastGasp.java | 2 +- Mage.Sets/src/mage/sets/ravnika/LeaveNoTrace.java | 2 +- .../src/mage/sets/ravnika/MoldervineCloak.java | 2 +- .../src/mage/sets/ravnika/NightmareVoid.java | 2 +- Mage.Sets/src/mage/sets/ravnika/Putrefy.java | 2 +- Mage.Sets/src/mage/sets/ravnika/Sandsower.java | 2 +- .../src/mage/sets/ravnika/ShamblingShell.java | 2 +- .../mage/sets/ravnika/SistersOfStoneDeath.java | 4 ++-- .../src/mage/sets/ravnika/SunderingVitae.java | 2 +- Mage.Sets/src/mage/sets/ravnika/Ursapine.java | 2 +- .../src/mage/sets/ravnika/VedalkenDismisser.java | 2 +- .../src/mage/sets/ravnika/VedalkenEntrancer.java | 2 +- .../sets/returntoravnica/AerialPredation.java | 2 +- .../src/mage/sets/returntoravnica/AquusSteed.java | 2 +- .../sets/returntoravnica/AssassinsStrike.java | 2 +- .../src/mage/sets/returntoravnica/AugerSpree.java | 2 +- .../sets/returntoravnica/AzoriusArrester.java | 2 +- .../mage/sets/returntoravnica/Blustersquall.java | 2 +- .../sets/returntoravnica/ChemistersTrick.java | 2 +- .../mage/sets/returntoravnica/ChorusOfMight.java | 2 +- .../mage/sets/returntoravnica/CodexShredder.java | 2 +- .../sets/returntoravnica/ConjuredCurrency.java | 2 +- .../mage/sets/returntoravnica/DeathsPresence.java | 2 +- .../sets/returntoravnica/DetentionSphere.java | 2 +- .../mage/sets/returntoravnica/DeviantGlee.java | 2 +- .../src/mage/sets/returntoravnica/Doorkeeper.java | 2 +- .../src/mage/sets/returntoravnica/Downsize.java | 2 +- .../sets/returntoravnica/DrainpipeVermin.java | 2 +- .../mage/sets/returntoravnica/DramaticRescue.java | 2 +- .../src/mage/sets/returntoravnica/Dreadbore.java | 2 +- .../src/mage/sets/returntoravnica/Dynacharge.java | 2 +- .../mage/sets/returntoravnica/Electrickery.java | 2 +- .../mage/sets/returntoravnica/EtherealArmor.java | 2 +- .../src/mage/sets/returntoravnica/GuildFeud.java | 2 +- .../sets/returntoravnica/HellholeFlailer.java | 2 +- .../sets/returntoravnica/InactionInjunction.java | 2 +- .../mage/sets/returntoravnica/Inspiration.java | 2 +- .../sets/returntoravnica/IsperiasSkywatch.java | 2 +- .../src/mage/sets/returntoravnica/IzzetCharm.java | 2 +- .../sets/returntoravnica/IzzetStaticaster.java | 2 +- .../returntoravnica/JaceArchitectOfThought.java | 2 +- .../sets/returntoravnica/KeeningApparition.java | 2 +- .../mage/sets/returntoravnica/KnightlyValor.java | 2 +- .../sets/returntoravnica/KorozdaGuildmage.java | 4 ++-- .../mage/sets/returntoravnica/LaunchParty.java | 4 ++-- .../src/mage/sets/returntoravnica/MartialLaw.java | 2 +- .../sets/returntoravnica/MercurialChemister.java | 2 +- .../mage/sets/returntoravnica/MizziumMortars.java | 2 +- .../mage/sets/returntoravnica/MizziumSkin.java | 2 +- .../sets/returntoravnica/NewPrahvGuildmage.java | 2 +- .../mage/sets/returntoravnica/PsychicSpiral.java | 2 +- .../sets/returntoravnica/PursuitOfFlight.java | 2 +- .../mage/sets/returntoravnica/RacecourseFury.java | 2 +- .../mage/sets/returntoravnica/RakdosCharm.java | 2 +- .../mage/sets/returntoravnica/RakdossReturn.java | 2 +- .../sets/returntoravnica/RighteousAuthority.java | 2 +- .../mage/sets/returntoravnica/RitesOfReaping.java | 2 +- .../sets/returntoravnica/RixMaadiGuildmage.java | 2 +- .../mage/sets/returntoravnica/RoguesPassage.java | 2 +- .../mage/sets/returntoravnica/SavageSurge.java | 2 +- .../mage/sets/returntoravnica/SearchWarrant.java | 2 +- .../mage/sets/returntoravnica/SelesnyaCharm.java | 4 ++-- .../src/mage/sets/returntoravnica/SkymarkRoc.java | 2 +- .../mage/sets/returntoravnica/SlaughterGames.java | 2 +- .../sets/returntoravnica/SoulswornSpirit.java | 2 +- .../src/mage/sets/returntoravnica/StabWound.java | 2 +- .../mage/sets/returntoravnica/StreetSpasm.java | 2 +- .../sets/returntoravnica/SunderingGrowth.java | 2 +- .../mage/sets/returntoravnica/SwiftJustice.java | 2 +- .../src/mage/sets/returntoravnica/Teleportal.java | 2 +- .../sets/returntoravnica/TrostanisJudgment.java | 2 +- .../mage/sets/returntoravnica/UltimatePrice.java | 2 +- .../mage/sets/returntoravnica/Voidwielder.java | 2 +- .../mage/sets/revisededition/DesertTwister.java | 2 +- .../sets/riseoftheeldrazi/AffaGuardHound.java | 2 +- .../mage/sets/riseoftheeldrazi/AuraFinesse.java | 4 ++-- .../sets/riseoftheeldrazi/BalaGedScorpion.java | 2 +- .../mage/sets/riseoftheeldrazi/BattleRampart.java | 2 +- .../sets/riseoftheeldrazi/BattleRattleShaman.java | 2 +- .../src/mage/sets/riseoftheeldrazi/BearUmbra.java | 2 +- .../sets/riseoftheeldrazi/BloodriteInvoker.java | 2 +- .../sets/riseoftheeldrazi/BloodthroneVampire.java | 2 +- .../src/mage/sets/riseoftheeldrazi/BoarUmbra.java | 2 +- .../mage/sets/riseoftheeldrazi/Bramblesnap.java | 2 +- .../riseoftheeldrazi/ConqueringManticore.java | 2 +- .../sets/riseoftheeldrazi/ConsumingVapors.java | 2 +- .../mage/sets/riseoftheeldrazi/Corpsehatch.java | 2 +- .../src/mage/sets/riseoftheeldrazi/CrabUmbra.java | 2 +- .../sets/riseoftheeldrazi/DawnglareInvoker.java | 2 +- .../mage/sets/riseoftheeldrazi/DeathCultist.java | 2 +- .../sets/riseoftheeldrazi/DeathlessAngel.java | 2 +- .../sets/riseoftheeldrazi/DemonicAppetite.java | 4 ++-- .../sets/riseoftheeldrazi/DistortionStrike.java | 2 +- .../mage/sets/riseoftheeldrazi/Domestication.java | 2 +- .../mage/sets/riseoftheeldrazi/DrakeUmbra.java | 2 +- .../DranaKalastriaBloodchief.java | 2 +- .../src/mage/sets/riseoftheeldrazi/EelUmbra.java | 2 +- .../mage/sets/riseoftheeldrazi/ElandUmbra.java | 2 +- .../riseoftheeldrazi/EldraziConscription.java | 2 +- .../sets/riseoftheeldrazi/EmergeUnscathed.java | 2 +- .../mage/sets/riseoftheeldrazi/EssenceFeed.java | 2 +- .../riseoftheeldrazi/ExplosiveRevelation.java | 2 +- .../mage/sets/riseoftheeldrazi/FlameSlash.java | 2 +- .../riseoftheeldrazi/FleetingDistraction.java | 2 +- .../mage/sets/riseoftheeldrazi/GideonJura.java | 4 ++-- .../mage/sets/riseoftheeldrazi/Gigantomancer.java | 2 +- .../sets/riseoftheeldrazi/GoblinTunneler.java | 2 +- .../sets/riseoftheeldrazi/GrotagSiegeRunner.java | 2 +- .../src/mage/sets/riseoftheeldrazi/GuardDuty.java | 2 +- .../sets/riseoftheeldrazi/GuulDrazAssassin.java | 4 ++-- .../src/mage/sets/riseoftheeldrazi/HeatRay.java | 2 +- .../mage/sets/riseoftheeldrazi/HyenaUmbra.java | 2 +- .../mage/sets/riseoftheeldrazi/InduceDespair.java | 2 +- .../riseoftheeldrazi/InquisitionOfKozilek.java | 2 +- .../sets/riseoftheeldrazi/IrresistiblePrey.java | 2 +- .../sets/riseoftheeldrazi/JaddiLifestrider.java | 2 +- .../mage/sets/riseoftheeldrazi/KeeningStone.java | 2 +- .../sets/riseoftheeldrazi/KorLineSlinger.java | 2 +- .../src/mage/sets/riseoftheeldrazi/LastKiss.java | 2 +- .../src/mage/sets/riseoftheeldrazi/LeafArrow.java | 2 +- .../mage/sets/riseoftheeldrazi/LuminousWake.java | 2 +- .../mage/sets/riseoftheeldrazi/LustForWar.java | 2 +- .../mage/sets/riseoftheeldrazi/MammothUmbra.java | 2 +- .../sets/riseoftheeldrazi/MerfolkObserver.java | 2 +- .../sets/riseoftheeldrazi/MerfolkSkyscout.java | 2 +- .../sets/riseoftheeldrazi/MightOfTheMasses.java | 2 +- .../mage/sets/riseoftheeldrazi/MomentousFall.java | 2 +- .../mage/sets/riseoftheeldrazi/Narcolepsy.java | 2 +- .../src/mage/sets/riseoftheeldrazi/Nighthaze.java | 2 +- .../src/mage/sets/riseoftheeldrazi/Oust.java | 2 +- .../sets/riseoftheeldrazi/PerishTheThought.java | 2 +- .../sets/riseoftheeldrazi/PreysVengeance.java | 2 +- .../sets/riseoftheeldrazi/PuncturingLight.java | 2 +- .../mage/sets/riseoftheeldrazi/RageNimbus.java | 2 +- .../sets/riseoftheeldrazi/RecurringInsight.java | 2 +- .../mage/sets/riseoftheeldrazi/SarkhanTheMad.java | 4 ++-- .../src/mage/sets/riseoftheeldrazi/Smite.java | 2 +- .../mage/sets/riseoftheeldrazi/SnakeUmbra.java | 2 +- .../mage/sets/riseoftheeldrazi/SpiderUmbra.java | 2 +- .../mage/sets/riseoftheeldrazi/SplinterTwin.java | 2 +- .../mage/sets/riseoftheeldrazi/SufferThePast.java | 2 +- .../sets/riseoftheeldrazi/TraitorousInstinct.java | 2 +- .../riseoftheeldrazi/UlamogTheInfiniteGyre.java | 2 +- .../src/mage/sets/riseoftheeldrazi/Vendetta.java | 2 +- .../mage/sets/riseoftheeldrazi/VentSentinel.java | 2 +- .../mage/sets/riseoftheeldrazi/VirulentSwipe.java | 2 +- .../sets/riseoftheeldrazi/WildheartInvoker.java | 2 +- .../sets/saviorsofkamigawa/AkkiDrillmaster.java | 2 +- .../saviorsofkamigawa/BarrelDownSokenzan.java | 2 +- .../mage/sets/saviorsofkamigawa/BloodClock.java | 2 +- .../sets/saviorsofkamigawa/BriarknitKami.java | 2 +- .../mage/sets/saviorsofkamigawa/CaptiveFlame.java | 2 +- .../saviorsofkamigawa/ChoiceOfDamnations.java | 2 +- .../sets/saviorsofkamigawa/CloudhoofKirin.java | 2 +- .../sets/saviorsofkamigawa/CutTheEarthlyBond.java | 2 +- .../sets/saviorsofkamigawa/EternalDominion.java | 2 +- .../sets/saviorsofkamigawa/FreedFromTheReal.java | 2 +- .../sets/saviorsofkamigawa/GhostLitNourisher.java | 2 +- .../sets/saviorsofkamigawa/GhostLitRaider.java | 4 ++-- .../sets/saviorsofkamigawa/GhostLitStalker.java | 4 ++-- .../sets/saviorsofkamigawa/GodosIrregulars.java | 4 ++-- .../saviorsofkamigawa/HidetsugusSecondRite.java | 2 +- .../sets/saviorsofkamigawa/InfernalKirin.java | 2 +- .../mage/sets/saviorsofkamigawa/KemuriOnna.java | 2 +- .../src/mage/sets/saviorsofkamigawa/KiriOnna.java | 2 +- .../sets/saviorsofkamigawa/KitsuneDawnblade.java | 2 +- .../sets/saviorsofkamigawa/ManrikiGusari.java | 2 +- .../mage/sets/saviorsofkamigawa/MoltingSkin.java | 2 +- .../saviorsofkamigawa/NeverendingTorment.java | 2 +- .../sets/saviorsofkamigawa/PlowThroughReito.java | 2 +- .../saviorsofkamigawa/ShinenOfFearsChill.java | 2 +- .../saviorsofkamigawa/ShinenOfFlightsWings.java | 2 +- .../sets/saviorsofkamigawa/ShinenOfFurysFire.java | 2 +- .../sets/saviorsofkamigawa/ShinenOfLifesRoar.java | 2 +- .../saviorsofkamigawa/ShinenOfStarsLight.java | 2 +- .../sets/saviorsofkamigawa/SinkIntoTakenuma.java | 2 +- .../mage/sets/saviorsofkamigawa/SkyfireKirin.java | 4 ++-- .../sets/saviorsofkamigawa/SunderFromWithin.java | 2 +- .../sets/saviorsofkamigawa/UndyingFlames.java | 2 +- .../saviorsofkamigawa/WineOfBloodAndIron.java | 2 +- .../mage/sets/scarsofmirrodin/AbunaAcolyte.java | 2 +- .../mage/sets/scarsofmirrodin/AcidWebSpider.java | 2 +- .../mage/sets/scarsofmirrodin/ArgentumArmor.java | 2 +- .../src/mage/sets/scarsofmirrodin/Asceticism.java | 2 +- .../mage/sets/scarsofmirrodin/AssaultStrobe.java | 2 +- .../sets/scarsofmirrodin/BleakCovenVampires.java | 2 +- .../sets/scarsofmirrodin/BloodshotTrainee.java | 2 +- .../sets/scarsofmirrodin/BondsOfQuicksilver.java | 2 +- .../sets/scarsofmirrodin/CerebralEruption.java | 2 +- .../mage/sets/scarsofmirrodin/ContagionClasp.java | 2 +- .../sets/scarsofmirrodin/ContagionEngine.java | 2 +- .../sets/scarsofmirrodin/CorruptedHarvester.java | 2 +- .../mage/sets/scarsofmirrodin/CullingDais.java | 2 +- .../sets/scarsofmirrodin/DispenseJustice.java | 2 +- .../mage/sets/scarsofmirrodin/DrossHopper.java | 2 +- .../mage/sets/scarsofmirrodin/FleshAllergy.java | 4 ++-- .../sets/scarsofmirrodin/FlightSpellbomb.java | 2 +- .../mage/sets/scarsofmirrodin/FumeSpitter.java | 2 +- .../sets/scarsofmirrodin/GlimmerpointStag.java | 2 +- .../mage/sets/scarsofmirrodin/GolemArtisan.java | 4 ++-- .../sets/scarsofmirrodin/GraspOfDarkness.java | 2 +- .../src/mage/sets/scarsofmirrodin/Grindclock.java | 2 +- .../sets/scarsofmirrodin/HandOfThePraetors.java | 2 +- .../sets/scarsofmirrodin/HoardSmelterDragon.java | 2 +- .../sets/scarsofmirrodin/InstillInfection.java | 2 +- .../sets/scarsofmirrodin/LiquimetalCoating.java | 2 +- .../mage/sets/scarsofmirrodin/LumengridDrake.java | 2 +- .../src/mage/sets/scarsofmirrodin/LuxCannon.java | 2 +- .../src/mage/sets/scarsofmirrodin/Memoricide.java | 2 +- .../src/mage/sets/scarsofmirrodin/Mindslaver.java | 2 +- .../mage/sets/scarsofmirrodin/NecrogenCenser.java | 2 +- .../src/mage/sets/scarsofmirrodin/Necropede.java | 2 +- .../sets/scarsofmirrodin/NeurokInvisimancer.java | 2 +- .../mage/sets/scarsofmirrodin/NeurokReplica.java | 2 +- .../mage/sets/scarsofmirrodin/NihilSpellbomb.java | 2 +- .../sets/scarsofmirrodin/OxiddaScrapmelter.java | 2 +- .../src/mage/sets/scarsofmirrodin/Painsmith.java | 2 +- .../mage/sets/scarsofmirrodin/PanicSpellbomb.java | 2 +- .../mage/sets/scarsofmirrodin/PsychicMiasma.java | 2 +- .../scarsofmirrodin/QuicksilverGargantuan.java | 2 +- .../sets/scarsofmirrodin/RevokeExistence.java | 2 +- .../sets/scarsofmirrodin/SeizeTheInitiative.java | 2 +- .../src/mage/sets/scarsofmirrodin/ShapeAnew.java | 2 +- .../src/mage/sets/scarsofmirrodin/Skinrender.java | 2 +- .../mage/sets/scarsofmirrodin/SliceinTwain.java | 2 +- .../mage/sets/scarsofmirrodin/SylvokReplica.java | 2 +- .../mage/sets/scarsofmirrodin/TaintedStrike.java | 2 +- .../mage/sets/scarsofmirrodin/TangleAngler.java | 2 +- .../sets/scarsofmirrodin/TelJiladDefiance.java | 2 +- .../sets/scarsofmirrodin/TowerOfCalamities.java | 2 +- .../sets/scarsofmirrodin/TrigonOfCorruption.java | 2 +- .../mage/sets/scarsofmirrodin/TrigonOfRage.java | 2 +- .../mage/sets/scarsofmirrodin/TumbleMagnet.java | 2 +- .../src/mage/sets/scarsofmirrodin/TurnToSlag.java | 2 +- .../mage/sets/scarsofmirrodin/TwistedImage.java | 2 +- .../mage/sets/scarsofmirrodin/UntamedMight.java | 2 +- .../mage/sets/scarsofmirrodin/VaultSkyward.java | 2 +- .../sets/scarsofmirrodin/VedalkenCertarch.java | 2 +- .../sets/scarsofmirrodin/VenserTheSojourner.java | 4 ++-- .../mage/sets/scarsofmirrodin/VolitionReins.java | 2 +- .../sets/scarsofmirrodin/VulshokHeartstoker.java | 2 +- .../mage/sets/scarsofmirrodin/VulshokReplica.java | 2 +- .../mage/sets/scarsofmirrodin/WingPuncture.java | 4 ++-- .../mage/sets/scarsofmirrodin/WithstandDeath.java | 2 +- Mage.Sets/src/mage/sets/scourge/AstralSteel.java | 2 +- Mage.Sets/src/mage/sets/scourge/BrainFreeze.java | 2 +- .../src/mage/sets/scourge/CarrionFeeder.java | 2 +- .../src/mage/sets/scourge/GoblinWarStrike.java | 2 +- Mage.Sets/src/mage/sets/scourge/Scattershot.java | 2 +- .../src/mage/sets/scourge/TemporalFissure.java | 2 +- .../src/mage/sets/scourge/TendrilsOfAgony.java | 2 +- Mage.Sets/src/mage/sets/scourge/WingShards.java | 2 +- .../src/mage/sets/scourge/WirewoodSymbiote.java | 2 +- .../sets/seventhedition/AgonizingMemories.java | 2 +- .../mage/sets/seventhedition/CrimsonHellkite.java | 2 +- .../sets/seventhedition/DisruptingScepter.java | 2 +- .../src/mage/sets/seventhedition/FallenAngel.java | 2 +- .../mage/sets/seventhedition/FlyingCarpet.java | 2 +- .../sets/seventhedition/GrapeshotCatapult.java | 2 +- .../mage/sets/seventhedition/HealingSalve.java | 2 +- .../sets/seventhedition/JandorsSaddlebags.java | 2 +- .../mage/sets/seventhedition/MonstrousGrowth.java | 2 +- .../src/mage/sets/seventhedition/Pillage.java | 2 +- .../src/mage/sets/seventhedition/Reprisal.java | 2 +- .../src/mage/sets/seventhedition/SpiritLink.java | 2 +- .../mage/sets/seventhedition/StreamOfLife.java | 2 +- .../src/mage/sets/seventhedition/Vengeance.java | 2 +- .../src/mage/sets/shadowmoor/AphoticWisps.java | 2 +- .../src/mage/sets/shadowmoor/BarrentonMedic.java | 2 +- .../src/mage/sets/shadowmoor/BitingTether.java | 2 +- .../mage/sets/shadowmoor/BlowflyInfestation.java | 2 +- .../mage/sets/shadowmoor/BoggartArsonists.java | 2 +- .../src/mage/sets/shadowmoor/CeruleanWisps.java | 2 +- .../mage/sets/shadowmoor/CinderhazeWretch.java | 2 +- .../src/mage/sets/shadowmoor/ConsignToDream.java | 2 +- .../src/mage/sets/shadowmoor/CrimsonWisps.java | 2 +- .../src/mage/sets/shadowmoor/CultbrandCinder.java | 2 +- .../src/mage/sets/shadowmoor/DrownerInitiate.java | 2 +- .../src/mage/sets/shadowmoor/ElvishHexhunter.java | 2 +- .../mage/sets/shadowmoor/FistsOfTheDemigod.java | 2 +- .../src/mage/sets/shadowmoor/GnarledEffigy.java | 2 +- .../mage/sets/shadowmoor/HelmOfTheGhastlord.java | 2 +- .../mage/sets/shadowmoor/KinscaerHarpoonist.java | 2 +- .../mage/sets/shadowmoor/KithkinShielddare.java | 2 +- .../src/mage/sets/shadowmoor/KnacksawClique.java | 2 +- .../src/mage/sets/shadowmoor/LastBreath.java | 2 +- .../src/mage/sets/shadowmoor/LeechBonder.java | 4 ++-- .../src/mage/sets/shadowmoor/MistmeadowWitch.java | 2 +- .../src/mage/sets/shadowmoor/NiveousWisps.java | 2 +- .../mage/sets/shadowmoor/OonaQueenOfTheFae.java | 2 +- .../src/mage/sets/shadowmoor/PaleWayfarer.java | 2 +- .../src/mage/sets/shadowmoor/PrisonTerm.java | 2 +- .../src/mage/sets/shadowmoor/PunctureBolt.java | 2 +- .../src/mage/sets/shadowmoor/ReaperKing.java | 2 +- Mage.Sets/src/mage/sets/shadowmoor/Reknit.java | 2 +- .../src/mage/sets/shadowmoor/RevelsongHorn.java | 4 ++-- .../mage/sets/shadowmoor/RiteOfConsumption.java | 2 +- .../src/mage/sets/shadowmoor/RunesOfTheDeus.java | 2 +- Mage.Sets/src/mage/sets/shadowmoor/Scar.java | 2 +- .../src/mage/sets/shadowmoor/SeedcradleWitch.java | 2 +- .../mage/sets/shadowmoor/ShieldOfTheOversoul.java | 2 +- .../src/mage/sets/shadowmoor/SmolderInitiate.java | 2 +- .../src/mage/sets/shadowmoor/Somnomancer.java | 2 +- .../mage/sets/shadowmoor/SootstokeKindler.java | 2 +- .../mage/sets/shadowmoor/SteelOfTheGodhead.java | 2 +- Mage.Sets/src/mage/sets/shadowmoor/StripBare.java | 2 +- .../src/mage/sets/shadowmoor/TurnToMist.java | 2 +- .../mage/sets/shadowmoor/ViridescentWisps.java | 2 +- .../src/mage/sets/shadowmoor/Woeleecher.java | 2 +- .../src/mage/sets/shadowmoor/WoodfallPrimus.java | 2 +- .../mage/sets/shardsofalara/AjaniVengeant.java | 4 ++-- .../sets/shardsofalara/AngelicBenediction.java | 2 +- .../sets/shardsofalara/BanewaspAffliction.java | 2 +- .../mage/sets/shardsofalara/BantBattlemage.java | 4 ++-- .../src/mage/sets/shardsofalara/BantCharm.java | 2 +- .../src/mage/sets/shardsofalara/Blightning.java | 2 +- .../mage/sets/shardsofalara/BlisterBeetle.java | 2 +- .../src/mage/sets/shardsofalara/BloodCultist.java | 2 +- .../sets/shardsofalara/BloodpyreElemental.java | 2 +- .../sets/shardsofalara/BloodthornTaunter.java | 2 +- .../mage/sets/shardsofalara/BoneSplinters.java | 4 ++-- .../sets/shardsofalara/BrilliantUltimatum.java | 2 +- .../src/mage/sets/shardsofalara/CallToHeel.java | 2 +- .../mage/sets/shardsofalara/CatharticAdept.java | 2 +- .../src/mage/sets/shardsofalara/ComaVeil.java | 2 +- .../mage/sets/shardsofalara/CovenantOfMinds.java | 2 +- .../mage/sets/shardsofalara/CradleOfVitality.java | 2 +- .../mage/sets/shardsofalara/CruelUltimatum.java | 2 +- .../sets/shardsofalara/DispellersCapsule.java | 2 +- .../sets/shardsofalara/ElspethKnightErrant.java | 2 +- .../mage/sets/shardsofalara/EsperBattlemage.java | 2 +- .../src/mage/sets/shardsofalara/EsperCharm.java | 4 ++-- .../mage/sets/shardsofalara/Excommunicate.java | 2 +- .../sets/shardsofalara/ExecutionersCapsule.java | 2 +- .../sets/shardsofalara/ExuberantFirestoker.java | 2 +- .../src/mage/sets/shardsofalara/Fatestitcher.java | 2 +- .../mage/sets/shardsofalara/FiligreeSages.java | 2 +- .../mage/sets/shardsofalara/FlameblastDragon.java | 2 +- .../src/mage/sets/shardsofalara/Godtoucher.java | 2 +- .../mage/sets/shardsofalara/GrixisBattlemage.java | 2 +- .../src/mage/sets/shardsofalara/GrixisCharm.java | 4 ++-- .../mage/sets/shardsofalara/HissingIguanar.java | 2 +- .../mage/sets/shardsofalara/JundBattlemage.java | 2 +- .../src/mage/sets/shardsofalara/JundCharm.java | 4 ++-- .../mage/sets/shardsofalara/KissOfTheAmesha.java | 2 +- .../mage/sets/shardsofalara/LightningTalons.java | 2 +- .../src/mage/sets/shardsofalara/MagmaSpray.java | 2 +- .../src/mage/sets/shardsofalara/Mosstodon.java | 2 +- .../mage/sets/shardsofalara/NayaBattlemage.java | 4 ++-- .../src/mage/sets/shardsofalara/NayaCharm.java | 4 ++-- .../src/mage/sets/shardsofalara/OnyxGoblet.java | 2 +- .../sets/shardsofalara/RakeclawGargantuan.java | 2 +- .../sets/shardsofalara/RelicOfProgenitus.java | 2 +- .../mage/sets/shardsofalara/ResoundingRoar.java | 4 ++-- .../mage/sets/shardsofalara/ResoundingScream.java | 4 ++-- .../sets/shardsofalara/ResoundingThunder.java | 2 +- .../mage/sets/shardsofalara/ResoundingWave.java | 2 +- .../mage/sets/shardsofalara/SangriteSurge.java | 2 +- .../src/mage/sets/shardsofalara/SarkhanVol.java | 2 +- .../src/mage/sets/shardsofalara/SavageHunger.java | 2 +- .../mage/sets/shardsofalara/SigilBlessing.java | 2 +- .../mage/sets/shardsofalara/SkeletalKathari.java | 2 +- .../src/mage/sets/shardsofalara/Skeletonize.java | 2 +- .../src/mage/sets/shardsofalara/SoulsFire.java | 2 +- .../src/mage/sets/shardsofalara/SoulsGrace.java | 2 +- .../src/mage/sets/shardsofalara/SoulsMight.java | 2 +- .../sets/shardsofalara/SpearbreakerBehemoth.java | 2 +- .../src/mage/sets/shardsofalara/TarFiend.java | 2 +- .../sets/shardsofalara/ThoughtcutterAgent.java | 2 +- .../sets/shardsofalara/TidehollowSculler.java | 2 +- .../src/mage/sets/shardsofalara/VeinDrinker.java | 2 +- .../mage/sets/shardsofalara/ViciousShadows.java | 2 +- .../sets/shardsofalara/VolcanicSubmersion.java | 2 +- .../src/mage/sets/shardsofalara/WelkinGuide.java | 2 +- .../mage/sets/stronghold/StrongholdAssassin.java | 2 +- Mage.Sets/src/mage/sets/tempest/AdvanceScout.java | 2 +- Mage.Sets/src/mage/sets/tempest/Aftershock.java | 2 +- .../src/mage/sets/tempest/AltarOfDementia.java | 2 +- Mage.Sets/src/mage/sets/tempest/BrokenFall.java | 2 +- Mage.Sets/src/mage/sets/tempest/Capsize.java | 2 +- .../src/mage/sets/tempest/CloudchaserEagle.java | 2 +- .../mage/sets/tempest/CommanderGrevenIlVec.java | 2 +- .../src/mage/sets/tempest/CrownOfFlames.java | 2 +- .../src/mage/sets/tempest/DarkBanishing.java | 2 +- .../src/mage/sets/tempest/DiabolicEdict.java | 2 +- Mage.Sets/src/mage/sets/tempest/Disenchant.java | 2 +- .../src/mage/sets/tempest/EliteJavelineer.java | 2 +- Mage.Sets/src/mage/sets/tempest/ElvishFury.java | 2 +- Mage.Sets/src/mage/sets/tempest/Enfeeblement.java | 2 +- .../src/mage/sets/tempest/FeveredConvulsions.java | 2 +- Mage.Sets/src/mage/sets/tempest/FrogTongue.java | 2 +- Mage.Sets/src/mage/sets/tempest/Gallantry.java | 2 +- Mage.Sets/src/mage/sets/tempest/GaseousForm.java | 2 +- .../src/mage/sets/tempest/GiantStrength.java | 2 +- Mage.Sets/src/mage/sets/tempest/Grindstone.java | 2 +- .../src/mage/sets/tempest/HeartwoodGiant.java | 2 +- Mage.Sets/src/mage/sets/tempest/HerosResolve.java | 2 +- Mage.Sets/src/mage/sets/tempest/Intuition.java | 2 +- Mage.Sets/src/mage/sets/tempest/Lobotomy.java | 2 +- Mage.Sets/src/mage/sets/tempest/MasterDecoy.java | 2 +- Mage.Sets/src/mage/sets/tempest/MoggRaider.java | 2 +- .../src/mage/sets/tempest/NaturalSpring.java | 2 +- Mage.Sets/src/mage/sets/tempest/Opportunist.java | 2 +- .../src/mage/sets/tempest/PuppetStrings.java | 2 +- .../src/mage/sets/tempest/RootwaterMatriarch.java | 2 +- .../src/mage/sets/tempest/SeekerOfSkybreak.java | 2 +- .../src/mage/sets/tempest/ShimmeringWings.java | 2 +- Mage.Sets/src/mage/sets/tempest/SpikeDrone.java | 2 +- .../mage/sets/tempest/SpontaneousCombustion.java | 2 +- Mage.Sets/src/mage/sets/tempest/SqueesToy.java | 2 +- Mage.Sets/src/mage/sets/tempest/TimeEbb.java | 2 +- .../src/mage/sets/tempest/TortureChamber.java | 2 +- .../src/mage/sets/tempest/TradewindRider.java | 2 +- Mage.Sets/src/mage/sets/tempest/Verdigris.java | 2 +- Mage.Sets/src/mage/sets/tempest/WindDancer.java | 2 +- Mage.Sets/src/mage/sets/tenth/Afflict.java | 2 +- Mage.Sets/src/mage/sets/tenth/AggressiveUrge.java | 2 +- .../src/mage/sets/tenth/AmbassadorLaquatus.java | 2 +- .../src/mage/sets/tenth/AngelicBlessing.java | 2 +- .../src/mage/sets/tenth/ArcaneTeachings.java | 2 +- Mage.Sets/src/mage/sets/tenth/Assassinate.java | 2 +- .../src/mage/sets/tenth/AvenCloudchaser.java | 2 +- .../src/mage/sets/tenth/BeaconOfImmortality.java | 2 +- .../src/mage/sets/tenth/BlanchwoodArmor.java | 2 +- Mage.Sets/src/mage/sets/tenth/Boomerang.java | 2 +- Mage.Sets/src/mage/sets/tenth/CraftyPathmage.java | 2 +- Mage.Sets/src/mage/sets/tenth/CreepingMold.java | 2 +- Mage.Sets/src/mage/sets/tenth/CruelEdict.java | 2 +- Mage.Sets/src/mage/sets/tenth/Deathmark.java | 2 +- Mage.Sets/src/mage/sets/tenth/Dehydration.java | 2 +- Mage.Sets/src/mage/sets/tenth/Demolish.java | 2 +- Mage.Sets/src/mage/sets/tenth/Demystify.java | 2 +- Mage.Sets/src/mage/sets/tenth/Distress.java | 2 +- Mage.Sets/src/mage/sets/tenth/Fear.java | 2 +- Mage.Sets/src/mage/sets/tenth/FemerefArchers.java | 2 +- .../src/mage/sets/tenth/FistsOfTheAnvil.java | 2 +- .../src/mage/sets/tenth/FlamewaveInvoker.java | 2 +- Mage.Sets/src/mage/sets/tenth/GhostWarden.java | 2 +- Mage.Sets/src/mage/sets/tenth/GiantGrowth.java | 2 +- Mage.Sets/src/mage/sets/tenth/HateWeaver.java | 2 +- Mage.Sets/src/mage/sets/tenth/HighwayRobber.java | 2 +- Mage.Sets/src/mage/sets/tenth/HolyStrength.java | 2 +- Mage.Sets/src/mage/sets/tenth/IcatianPriest.java | 2 +- Mage.Sets/src/mage/sets/tenth/IcyManipulator.java | 2 +- Mage.Sets/src/mage/sets/tenth/Incinerate.java | 2 +- Mage.Sets/src/mage/sets/tenth/LavaAxe.java | 2 +- Mage.Sets/src/mage/sets/tenth/Megrim.java | 2 +- Mage.Sets/src/mage/sets/tenth/MightWeaver.java | 2 +- Mage.Sets/src/mage/sets/tenth/MindRot.java | 2 +- Mage.Sets/src/mage/sets/tenth/NantukoHusk.java | 2 +- Mage.Sets/src/mage/sets/tenth/Naturalize.java | 2 +- Mage.Sets/src/mage/sets/tenth/Pacifism.java | 2 +- Mage.Sets/src/mage/sets/tenth/Peek.java | 2 +- Mage.Sets/src/mage/sets/tenth/Persuasion.java | 2 +- Mage.Sets/src/mage/sets/tenth/PhyrexianVault.java | 2 +- Mage.Sets/src/mage/sets/tenth/Puppeteer.java | 2 +- Mage.Sets/src/mage/sets/tenth/Quicksand.java | 2 +- Mage.Sets/src/mage/sets/tenth/RageWeaver.java | 2 +- Mage.Sets/src/mage/sets/tenth/RavenousRats.java | 2 +- .../src/mage/sets/tenth/RazormaneMasticore.java | 2 +- Mage.Sets/src/mage/sets/tenth/Righteousness.java | 2 +- Mage.Sets/src/mage/sets/tenth/RobeOfMirrors.java | 2 +- Mage.Sets/src/mage/sets/tenth/RoyalAssassin.java | 2 +- Mage.Sets/src/mage/sets/tenth/SerrasEmbrace.java | 2 +- Mage.Sets/src/mage/sets/tenth/SkyWeaver.java | 2 +- Mage.Sets/src/mage/sets/tenth/SoulFeast.java | 2 +- Mage.Sets/src/mage/sets/tenth/Soulblast.java | 2 +- Mage.Sets/src/mage/sets/tenth/SpiritWeaver.java | 2 +- Mage.Sets/src/mage/sets/tenth/SpittingEarth.java | 2 +- Mage.Sets/src/mage/sets/tenth/Terror.java | 2 +- Mage.Sets/src/mage/sets/tenth/Threaten.java | 2 +- Mage.Sets/src/mage/sets/tenth/ThrullSurgeon.java | 2 +- Mage.Sets/src/mage/sets/tenth/TimeStretch.java | 2 +- Mage.Sets/src/mage/sets/tenth/Traumatize.java | 2 +- Mage.Sets/src/mage/sets/tenth/UnholyStrength.java | 2 +- Mage.Sets/src/mage/sets/tenth/Unsummon.java | 2 +- .../src/mage/sets/tenth/VedalkenMastermind.java | 2 +- Mage.Sets/src/mage/sets/tenth/ViridianShaman.java | 2 +- Mage.Sets/src/mage/sets/thedark/BarlsCage.java | 2 +- .../src/mage/sets/thedark/GoblinDiggingTeam.java | 2 +- Mage.Sets/src/mage/sets/thedark/MazeOfIth.java | 2 +- Mage.Sets/src/mage/sets/thedark/RagMan.java | 2 +- Mage.Sets/src/mage/sets/thedark/Venom.java | 2 +- Mage.Sets/src/mage/sets/theros/AkroanHorse.java | 2 +- Mage.Sets/src/mage/sets/theros/AqueousForm.java | 2 +- Mage.Sets/src/mage/sets/theros/ArborColossus.java | 2 +- Mage.Sets/src/mage/sets/theros/ArenaAthlete.java | 2 +- .../src/mage/sets/theros/ArtisansSorrow.java | 2 +- Mage.Sets/src/mage/sets/theros/AshenRider.java | 2 +- .../mage/sets/theros/AshiokNightmareWeaver.java | 2 +- .../src/mage/sets/theros/BattlewiseValor.java | 2 +- Mage.Sets/src/mage/sets/theros/BoonOfErebos.java | 2 +- Mage.Sets/src/mage/sets/theros/BowOfNylea.java | 2 +- .../src/mage/sets/theros/BreachingHippocamp.java | 2 +- .../src/mage/sets/theros/ChainedToTheRocks.java | 2 +- .../src/mage/sets/theros/ChosenByHeliod.java | 2 +- .../src/mage/sets/theros/CracklingTriton.java | 2 +- .../src/mage/sets/theros/CurseOfTheSwine.java | 4 ++-- Mage.Sets/src/mage/sets/theros/DarkBetrayal.java | 2 +- .../src/mage/sets/theros/DestructiveRevelry.java | 2 +- .../src/mage/sets/theros/DiscipleOfPhenax.java | 2 +- Mage.Sets/src/mage/sets/theros/DragonMantle.java | 2 +- Mage.Sets/src/mage/sets/theros/EpharasWarden.java | 2 +- .../src/mage/sets/theros/FadeIntoAntiquity.java | 2 +- Mage.Sets/src/mage/sets/theros/FateForetold.java | 2 +- .../src/mage/sets/theros/FeralInvocation.java | 2 +- .../src/mage/sets/theros/FlamecastWheel.java | 2 +- .../src/mage/sets/theros/GiftOfImmortality.java | 2 +- Mage.Sets/src/mage/sets/theros/GlareOfHeresy.java | 2 +- Mage.Sets/src/mage/sets/theros/GodsWilling.java | 2 +- .../src/mage/sets/theros/HeliodsEmissary.java | 4 ++-- Mage.Sets/src/mage/sets/theros/HerosDownfall.java | 2 +- Mage.Sets/src/mage/sets/theros/HuntTheHunter.java | 2 +- .../src/mage/sets/theros/KeepsakeGorgon.java | 2 +- .../src/mage/sets/theros/LabyrinthChampion.java | 2 +- Mage.Sets/src/mage/sets/theros/LashOfTheWhip.java | 2 +- .../src/mage/sets/theros/LeoninSnarecaster.java | 2 +- .../src/mage/sets/theros/LoathsomeCatoblepas.java | 2 +- .../src/mage/sets/theros/LostInALabyrinth.java | 2 +- .../src/mage/sets/theros/MessengersSpeed.java | 2 +- .../src/mage/sets/theros/MogissMarauder.java | 2 +- .../src/mage/sets/theros/NyleaGodOfTheHunt.java | 2 +- .../src/mage/sets/theros/OrdealOfErebos.java | 4 ++-- .../src/mage/sets/theros/OrdealOfHeliod.java | 2 +- Mage.Sets/src/mage/sets/theros/OrdealOfNylea.java | 2 +- .../src/mage/sets/theros/OrdealOfPurphoros.java | 2 +- .../src/mage/sets/theros/OrdealOfThassa.java | 2 +- Mage.Sets/src/mage/sets/theros/PharikasCure.java | 2 +- .../src/mage/sets/theros/PortentOfBetrayal.java | 2 +- .../src/mage/sets/theros/PsychicIntrusion.java | 2 +- .../src/mage/sets/theros/RageOfPurphoros.java | 2 +- .../src/mage/sets/theros/ReturnedCentaur.java | 2 +- Mage.Sets/src/mage/sets/theros/SatyrPiper.java | 2 +- Mage.Sets/src/mage/sets/theros/Scourgemark.java | 2 +- .../src/mage/sets/theros/ShipwreckSinger.java | 2 +- .../src/mage/sets/theros/ShreddingWinds.java | 2 +- Mage.Sets/src/mage/sets/theros/SipOfHemlock.java | 2 +- Mage.Sets/src/mage/sets/theros/SparkJolt.java | 2 +- Mage.Sets/src/mage/sets/theros/SpearOfHeliod.java | 2 +- Mage.Sets/src/mage/sets/theros/SteamAugury.java | 2 +- .../src/mage/sets/theros/ThassaGodOfTheSea.java | 2 +- Mage.Sets/src/mage/sets/theros/ThassasBounty.java | 2 +- Mage.Sets/src/mage/sets/theros/TimeToFeed.java | 2 +- .../src/mage/sets/theros/TitansStrength.java | 2 +- Mage.Sets/src/mage/sets/theros/TriadOfFates.java | 2 +- .../mage/sets/theros/TymaretTheMurderKing.java | 6 +++--- .../src/mage/sets/theros/VanquishTheFoul.java | 2 +- Mage.Sets/src/mage/sets/theros/VipersKiss.java | 2 +- Mage.Sets/src/mage/sets/theros/VoyagesEnd.java | 2 +- .../src/mage/sets/theros/WavecrashTriton.java | 2 +- Mage.Sets/src/mage/sets/theros/WhipOfErebos.java | 2 +- Mage.Sets/src/mage/sets/timeshifted/Desert.java | 2 +- Mage.Sets/src/mage/sets/timeshifted/FireWhip.java | 2 +- .../src/mage/sets/timeshifted/FuneralCharm.java | 6 +++--- .../src/mage/sets/timeshifted/GaeasBlessing.java | 2 +- .../src/mage/sets/timeshifted/GrinningTotem.java | 2 +- .../src/mage/sets/timeshifted/Pendelhaven.java | 2 +- .../src/mage/sets/timeshifted/SpikeFeeder.java | 2 +- Mage.Sets/src/mage/sets/timeshifted/Stupor.java | 2 +- .../src/mage/sets/timeshifted/TormodsCrypt.java | 2 +- .../mage/sets/timeshifted/ZhalfirinCommander.java | 2 +- .../src/mage/sets/timespiral/AncestralVision.java | 2 +- .../mage/sets/timespiral/AspectOfMongoose.java | 2 +- .../src/mage/sets/timespiral/AssemblyWorker.java | 2 +- Mage.Sets/src/mage/sets/timespiral/Bewilder.java | 2 +- .../sets/timespiral/CarefulConsideration.java | 2 +- .../src/mage/sets/timespiral/ClockworkHydra.java | 2 +- .../src/mage/sets/timespiral/DarkWithering.java | 2 +- .../src/mage/sets/timespiral/DreadReturn.java | 2 +- .../src/mage/sets/timespiral/EternitySnare.java | 2 +- .../src/mage/sets/timespiral/GriffinGuide.java | 2 +- .../src/mage/sets/timespiral/GroundRift.java | 2 +- .../src/mage/sets/timespiral/HarmonicSliver.java | 2 +- .../src/mage/sets/timespiral/IgniteMemories.java | 2 +- .../mage/sets/timespiral/JayaBallardTaskMage.java | 4 ++-- .../mage/sets/timespiral/KaervekTheMerciless.java | 2 +- .../src/mage/sets/timespiral/KrosanGrip.java | 2 +- .../src/mage/sets/timespiral/LightningAxe.java | 2 +- .../mage/sets/timespiral/MangaraOfCorondor.java | 2 +- .../src/mage/sets/timespiral/MightOfOldKrosa.java | 2 +- Mage.Sets/src/mage/sets/timespiral/Mindstab.java | 2 +- .../src/mage/sets/timespiral/MomentaryBlink.java | 2 +- Mage.Sets/src/mage/sets/timespiral/Phthisis.java | 2 +- Mage.Sets/src/mage/sets/timespiral/RiftBolt.java | 2 +- .../mage/sets/timespiral/RiftwingCloudskate.java | 2 +- .../src/mage/sets/timespiral/StuffyDoll.java | 2 +- .../src/mage/sets/timespiral/SuddenShock.java | 2 +- .../src/mage/sets/timespiral/SuddenSpoiling.java | 2 +- .../mage/sets/timespiral/TemporalIsolation.java | 2 +- .../mage/sets/timespiral/ThallidGerminator.java | 2 +- .../src/mage/sets/timespiral/WalkTheAeons.java | 2 +- Mage.Sets/src/mage/sets/timespiral/WipeAway.java | 2 +- Mage.Sets/src/mage/sets/torment/Accelerate.java | 2 +- Mage.Sets/src/mage/sets/torment/DeepAnalysis.java | 2 +- .../mage/sets/torment/FranticPurification.java | 2 +- .../src/mage/sets/torment/LaquatussChampion.java | 2 +- .../src/mage/sets/torment/MesmericFiend.java | 2 +- Mage.Sets/src/mage/sets/torment/SoulScourge.java | 2 +- .../src/mage/sets/urzasdestiny/Attrition.java | 4 ++-- .../mage/sets/urzasdestiny/BloodshotCyclops.java | 2 +- .../src/mage/sets/urzasdestiny/Extruder.java | 2 +- .../src/mage/sets/urzasdestiny/FodderCannon.java | 4 ++-- .../src/mage/sets/urzasdestiny/HuntingMoa.java | 2 +- .../src/mage/sets/urzasdestiny/KeldonVandals.java | 2 +- .../src/mage/sets/urzasdestiny/Masticore.java | 2 +- .../src/mage/sets/urzasdestiny/SigilOfSleep.java | 4 ++-- .../src/mage/sets/urzasdestiny/Treachery.java | 2 +- .../mage/sets/urzasdestiny/YavimayaHollow.java | 2 +- .../src/mage/sets/urzaslegacy/AboutFace.java | 2 +- .../src/mage/sets/urzaslegacy/BoneShredder.java | 2 +- .../src/mage/sets/urzaslegacy/BrinkOfMadness.java | 2 +- .../src/mage/sets/urzaslegacy/BurstOfEnergy.java | 2 +- .../src/mage/sets/urzaslegacy/Cessation.java | 2 +- .../src/mage/sets/urzaslegacy/DevoutHarpist.java | 2 +- Mage.Sets/src/mage/sets/urzaslegacy/Erase.java | 2 +- .../src/mage/sets/urzaslegacy/GhituWarCry.java | 2 +- .../src/mage/sets/urzaslegacy/GraniteGrip.java | 2 +- Mage.Sets/src/mage/sets/urzaslegacy/IronWill.java | 2 +- Mage.Sets/src/mage/sets/urzaslegacy/KingCrab.java | 2 +- .../src/mage/sets/urzaslegacy/MotherOfRunes.java | 2 +- .../src/mage/sets/urzaslegacy/Opportunity.java | 2 +- .../src/mage/sets/urzaslegacy/Ostracize.java | 2 +- Mage.Sets/src/mage/sets/urzaslegacy/Parch.java | 2 +- .../sets/urzaslegacy/PhyrexianBroodlings.java | 2 +- .../mage/sets/urzaslegacy/PhyrexianDebaser.java | 2 +- .../mage/sets/urzaslegacy/PhyrexianDefiler.java | 2 +- .../mage/sets/urzaslegacy/PhyrexianDenouncer.java | 2 +- .../sets/urzaslegacy/PhyrexianPlaguelord.java | 6 +++--- .../mage/sets/urzaslegacy/RadiantsJudgment.java | 2 +- Mage.Sets/src/mage/sets/urzaslegacy/Rancor.java | 2 +- .../src/mage/sets/urzaslegacy/Repopulate.java | 2 +- .../src/mage/sets/urzaslegacy/RingOfGix.java | 2 +- Mage.Sets/src/mage/sets/urzaslegacy/SilkNet.java | 2 +- .../src/mage/sets/urzaslegacy/SleepersGuile.java | 2 +- .../src/mage/sets/urzaslegacy/SlowMotion.java | 2 +- .../src/mage/sets/urzaslegacy/Sluggishness.java | 2 +- Mage.Sets/src/mage/sets/urzaslegacy/Snap.java | 2 +- .../src/mage/sets/urzaslegacy/WeatherseedElf.java | 2 +- .../src/mage/sets/urzaslegacy/WingSnare.java | 2 +- .../src/mage/sets/urzassaga/AbyssalHorror.java | 2 +- .../mage/sets/urzassaga/BarrinMasterWizard.java | 4 ++-- Mage.Sets/src/mage/sets/urzassaga/Bravado.java | 2 +- Mage.Sets/src/mage/sets/urzassaga/Breach.java | 2 +- .../src/mage/sets/urzassaga/BrilliantHalo.java | 2 +- Mage.Sets/src/mage/sets/urzassaga/Bulwark.java | 2 +- .../src/mage/sets/urzassaga/CarpetOfFlowers.java | 2 +- Mage.Sets/src/mage/sets/urzassaga/ClawsOfGix.java | 2 +- Mage.Sets/src/mage/sets/urzassaga/Clear.java | 2 +- .../src/mage/sets/urzassaga/CloakOfMists.java | 2 +- Mage.Sets/src/mage/sets/urzassaga/Confiscate.java | 2 +- Mage.Sets/src/mage/sets/urzassaga/Congregate.java | 2 +- .../src/mage/sets/urzassaga/DarkHatchling.java | 2 +- .../src/mage/sets/urzassaga/EasternPaladin.java | 2 +- Mage.Sets/src/mage/sets/urzassaga/Expunge.java | 2 +- .../src/mage/sets/urzassaga/GaeasEmbrace.java | 2 +- .../src/mage/sets/urzassaga/GoblinCadets.java | 2 +- .../src/mage/sets/urzassaga/IntrepidHero.java | 2 +- Mage.Sets/src/mage/sets/urzassaga/Pariah.java | 2 +- .../src/mage/sets/urzassaga/PhyrexianTower.java | 2 +- Mage.Sets/src/mage/sets/urzassaga/Reflexes.java | 2 +- Mage.Sets/src/mage/sets/urzassaga/Rescind.java | 2 +- Mage.Sets/src/mage/sets/urzassaga/Scrap.java | 2 +- Mage.Sets/src/mage/sets/urzassaga/Sicken.java | 2 +- .../src/mage/sets/urzassaga/SternProctor.java | 2 +- .../src/mage/sets/urzassaga/StrokeOfGenius.java | 2 +- Mage.Sets/src/mage/sets/urzassaga/Turnabout.java | 2 +- .../src/mage/sets/urzassaga/VampiricEmbrace.java | 2 +- .../src/mage/sets/urzassaga/WesternPaladin.java | 2 +- .../src/mage/sets/urzassaga/ZephidsEmbrace.java | 2 +- Mage.Sets/src/mage/sets/visions/Coercion.java | 2 +- .../src/mage/sets/visions/DarajaGriffin.java | 2 +- Mage.Sets/src/mage/sets/visions/DragonMask.java | 2 +- Mage.Sets/src/mage/sets/visions/ManOWar.java | 2 +- Mage.Sets/src/mage/sets/visions/Necrosavant.java | 2 +- .../src/mage/sets/visions/QuirionRanger.java | 2 +- .../src/mage/sets/visions/ResistanceFighter.java | 2 +- Mage.Sets/src/mage/sets/visions/WandOfDenial.java | 2 +- .../src/mage/sets/weatherlight/Abduction.java | 2 +- .../src/mage/sets/weatherlight/FatalBlow.java | 2 +- .../src/mage/sets/weatherlight/FitOfRage.java | 2 +- .../src/mage/sets/weatherlight/JabarisBanner.java | 2 +- .../src/mage/sets/worldwake/AEtherTradewinds.java | 4 ++-- .../src/mage/sets/worldwake/AdmonitionAngel.java | 2 +- .../src/mage/sets/worldwake/BazaarTrader.java | 2 +- .../mage/sets/worldwake/BloodhuskRitualist.java | 2 +- Mage.Sets/src/mage/sets/worldwake/BojukaBog.java | 2 +- .../src/mage/sets/worldwake/BrinkOfDisaster.java | 2 +- Mage.Sets/src/mage/sets/worldwake/BullRush.java | 2 +- .../src/mage/sets/worldwake/CanopyCover.java | 2 +- .../src/mage/sets/worldwake/CausticCrawler.java | 2 +- .../src/mage/sets/worldwake/ClawsOfValakut.java | 2 +- .../src/mage/sets/worldwake/CosisRavager.java | 2 +- .../src/mage/sets/worldwake/DeadReckoning.java | 2 +- .../src/mage/sets/worldwake/DeathforgeShaman.java | 2 +- .../src/mage/sets/worldwake/FeralContest.java | 4 ++-- .../src/mage/sets/worldwake/GrotagThrasher.java | 2 +- .../src/mage/sets/worldwake/Groundswell.java | 2 +- .../src/mage/sets/worldwake/HalimarExcavator.java | 2 +- .../src/mage/sets/worldwake/HammerOfRuin.java | 2 +- .../src/mage/sets/worldwake/IonasJudgment.java | 2 +- .../mage/sets/worldwake/JaceTheMindSculptor.java | 6 +++--- .../mage/sets/worldwake/KalastriaHighborn.java | 2 +- Mage.Sets/src/mage/sets/worldwake/MiresToll.java | 2 +- .../src/mage/sets/worldwake/MordantDragon.java | 2 +- .../src/mage/sets/worldwake/NaturesClaim.java | 2 +- .../src/mage/sets/worldwake/RestForTheWeary.java | 2 +- .../src/mage/sets/worldwake/ScribNibblers.java | 2 +- .../src/mage/sets/worldwake/SearingBlaze.java | 2 +- .../src/mage/sets/worldwake/SejiriSteppe.java | 2 +- .../src/mage/sets/worldwake/SmolderingSpires.java | 2 +- Mage.Sets/src/mage/sets/worldwake/Smother.java | 2 +- .../src/mage/sets/worldwake/SurrakarBanisher.java | 2 +- .../mage/sets/worldwake/TideforceElemental.java | 2 +- Mage.Sets/src/mage/sets/worldwake/TombHex.java | 2 +- Mage.Sets/src/mage/sets/worldwake/Twitch.java | 2 +- Mage.Sets/src/mage/sets/worldwake/UrgeToFeed.java | 4 ++-- Mage.Sets/src/mage/sets/worldwake/VaporSnare.java | 2 +- .../src/mage/sets/worldwake/VeteransReflexes.java | 2 +- .../src/mage/sets/zendikar/AdventuringGear.java | 2 +- Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java | 2 +- .../src/mage/sets/zendikar/BalaGedThief.java | 2 +- .../src/mage/sets/zendikar/BloodTribute.java | 2 +- .../src/mage/sets/zendikar/CallerOfGales.java | 2 +- .../src/mage/sets/zendikar/CarnageAltar.java | 2 +- .../src/mage/sets/zendikar/CelestialMantle.java | 2 +- Mage.Sets/src/mage/sets/zendikar/Disfigure.java | 2 +- .../src/mage/sets/zendikar/EldraziMonument.java | 2 +- .../src/mage/sets/zendikar/Electropotence.java | 2 +- .../src/mage/sets/zendikar/FeastOfBlood.java | 2 +- .../mage/sets/zendikar/GatekeeperOfMalakir.java | 2 +- Mage.Sets/src/mage/sets/zendikar/Gigantiform.java | 2 +- .../src/mage/sets/zendikar/GoblinShortcutter.java | 2 +- .../src/mage/sets/zendikar/GoblinWarPaint.java | 2 +- .../src/mage/sets/zendikar/GrapplingHook.java | 2 +- .../src/mage/sets/zendikar/HagraDiabolist.java | 2 +- Mage.Sets/src/mage/sets/zendikar/HaloHunter.java | 2 +- .../mage/sets/zendikar/HeartstabberMosquito.java | 2 +- Mage.Sets/src/mage/sets/zendikar/HedronCrab.java | 2 +- Mage.Sets/src/mage/sets/zendikar/HideousEnd.java | 2 +- Mage.Sets/src/mage/sets/zendikar/InfernoTrap.java | 2 +- .../src/mage/sets/zendikar/JourneyToNowhere.java | 2 +- .../sets/zendikar/KalitasBloodchiefOfGhet.java | 2 +- Mage.Sets/src/mage/sets/zendikar/KorAeronaut.java | 2 +- .../src/mage/sets/zendikar/KorHookmaster.java | 2 +- .../src/mage/sets/zendikar/KorOutfitter.java | 2 +- .../src/mage/sets/zendikar/KorSanctifiers.java | 2 +- Mage.Sets/src/mage/sets/zendikar/MagmaRift.java | 2 +- .../src/mage/sets/zendikar/MarkOfMutiny.java | 2 +- .../src/mage/sets/zendikar/MarshCasualties.java | 2 +- .../mage/sets/zendikar/MerfolkSeastalkers.java | 2 +- Mage.Sets/src/mage/sets/zendikar/MindSludge.java | 2 +- Mage.Sets/src/mage/sets/zendikar/MireBlight.java | 2 +- .../src/mage/sets/zendikar/MoldShambler.java | 2 +- .../src/mage/sets/zendikar/MurasaPyromancer.java | 2 +- .../src/mage/sets/zendikar/NarrowEscape.java | 2 +- .../src/mage/sets/zendikar/NeedlebiteTrap.java | 2 +- Mage.Sets/src/mage/sets/zendikar/NimbusWings.java | 2 +- .../src/mage/sets/zendikar/NobleVestige.java | 2 +- .../mage/sets/zendikar/ObNixilisTheFallen.java | 2 +- .../src/mage/sets/zendikar/OranRiefRecluse.java | 2 +- .../src/mage/sets/zendikar/ParalyzingGrasp.java | 2 +- .../src/mage/sets/zendikar/PiranhaMarsh.java | 2 +- .../src/mage/sets/zendikar/PredatoryUrge.java | 4 ++-- .../src/mage/sets/zendikar/PrimalBellow.java | 2 +- .../sets/zendikar/QuestForAncientSecrets.java | 2 +- .../mage/sets/zendikar/QuestForTheGemblades.java | 2 +- .../mage/sets/zendikar/QuestForTheHolyRelic.java | 2 +- .../src/mage/sets/zendikar/RavenousTrap.java | 2 +- .../src/mage/sets/zendikar/RecklessScholar.java | 2 +- Mage.Sets/src/mage/sets/zendikar/RelicCrush.java | 2 +- .../src/mage/sets/zendikar/RiteOfReplication.java | 2 +- .../src/mage/sets/zendikar/RoilElemental.java | 2 +- .../src/mage/sets/zendikar/RuneflareTrap.java | 2 +- .../src/mage/sets/zendikar/SadisticSacrament.java | 2 +- .../src/mage/sets/zendikar/SavageSilhouette.java | 2 +- .../src/mage/sets/zendikar/SlaughterCry.java | 2 +- .../src/mage/sets/zendikar/SoaringSeacliff.java | 2 +- Mage.Sets/src/mage/sets/zendikar/SorinMarkov.java | 4 ++-- .../src/mage/sets/zendikar/TeeteringPeaks.java | 2 +- .../src/mage/sets/zendikar/TorchSlinger.java | 2 +- .../src/mage/sets/zendikar/TrapfindersTrick.java | 2 +- .../mage/sets/zendikar/TurntimberBasilisk.java | 2 +- .../src/mage/sets/zendikar/TurntimberGrove.java | 2 +- .../src/mage/sets/zendikar/UnstableFooting.java | 2 +- .../sets/zendikar/ValakutTheMoltenPinnacle.java | 2 +- .../src/mage/sets/zendikar/VampireHexmage.java | 2 +- .../src/mage/sets/zendikar/VampiresBite.java | 2 +- .../src/mage/sets/zendikar/VinesOfVastwood.java | 2 +- Mage/src/mage/abilities/Modes.java | 8 +++++--- .../abilities/effects/common/CipherEffect.java | 2 +- Mage/src/mage/abilities/keyword/EquipAbility.java | 2 +- Mage/src/mage/abilities/keyword/HauntAbility.java | 2 +- .../mage/abilities/keyword/ScavengeAbility.java | 2 +- .../mage/abilities/keyword/TributeAbility.java | 2 +- Mage/src/mage/target/TargetPermanent.java | 10 ---------- Mage/src/mage/target/TargetPlayer.java | 5 ----- .../target/common/TargetArtifactPermanent.java | 6 +----- .../target/common/TargetAttackingCreature.java | 5 ----- .../mage/target/common/TargetCardInGraveyard.java | 5 ----- .../target/common/TargetCardInYourGraveyard.java | 10 ---------- .../common/TargetControlledCreaturePermanent.java | 10 ---------- .../target/common/TargetControlledPermanent.java | 5 ----- .../target/common/TargetCreatureOrPlayer.java | 5 ----- .../target/common/TargetCreaturePermanent.java | 15 --------------- .../target/common/TargetEnchantmentPermanent.java | 5 ----- Mage/src/mage/target/common/TargetOpponent.java | 9 +-------- 2272 files changed, 2454 insertions(+), 2538 deletions(-) diff --git a/Mage.Sets/src/mage/sets/alarareborn/Anathemancer.java b/Mage.Sets/src/mage/sets/alarareborn/Anathemancer.java index 1a5f3fa1b14..b209e917ca5 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/Anathemancer.java +++ b/Mage.Sets/src/mage/sets/alarareborn/Anathemancer.java @@ -64,7 +64,7 @@ public class Anathemancer extends CardImpl { // When Anathemancer enters the battlefield, it deals damage to target player equal to the number of nonbasic lands that player controls. EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(new AnathemancerCount())); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); // Unearth {5}{B}{R} this.addAbility(new UnearthAbility(new ManaCostsImpl("{5}{B}{R}"))); diff --git a/Mage.Sets/src/mage/sets/alarareborn/ArchitectsOfWill.java b/Mage.Sets/src/mage/sets/alarareborn/ArchitectsOfWill.java index de2d9e46aa6..39bac2325a0 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/ArchitectsOfWill.java +++ b/Mage.Sets/src/mage/sets/alarareborn/ArchitectsOfWill.java @@ -67,7 +67,7 @@ public class ArchitectsOfWill extends CardImpl { // When Architects of Will enters the battlefield, look at the top three cards of target player's library, then put them back in any order. Ability ability = new EntersBattlefieldTriggeredAbility(new ArchitectsOfWillEffect(), false); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); // Cycling {UB} diff --git a/Mage.Sets/src/mage/sets/alarareborn/AvenMimeomancer.java b/Mage.Sets/src/mage/sets/alarareborn/AvenMimeomancer.java index d468a94ce2f..a270faa8697 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/AvenMimeomancer.java +++ b/Mage.Sets/src/mage/sets/alarareborn/AvenMimeomancer.java @@ -67,7 +67,7 @@ public class AvenMimeomancer extends CardImpl { // At the beginning of your upkeep, you may put a feather counter on target creature. If you do, that creature is 3/1 and has flying for as long as it has a feather counter on it. Ability ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.FEATHER.createInstance()), TargetController.YOU, true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); ability.addEffect(new AvenEffect()); ability.addEffect(new AvenEffect2()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/alarareborn/BituminousBlast.java b/Mage.Sets/src/mage/sets/alarareborn/BituminousBlast.java index cdf8cfe935f..f0b12297bd9 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/BituminousBlast.java +++ b/Mage.Sets/src/mage/sets/alarareborn/BituminousBlast.java @@ -47,7 +47,7 @@ public class BituminousBlast extends CardImpl { this.expansionSetCode = "ARB"; this.color.setBlack(true); this.color.setRed(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DamageTargetEffect(4)); this.addAbility(new CascadeAbility()); } diff --git a/Mage.Sets/src/mage/sets/alarareborn/Brainbite.java b/Mage.Sets/src/mage/sets/alarareborn/Brainbite.java index 40e3026cf2c..bf7028065a5 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/Brainbite.java +++ b/Mage.Sets/src/mage/sets/alarareborn/Brainbite.java @@ -52,7 +52,7 @@ public class Brainbite extends CardImpl { this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect()); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); } public Brainbite(final Brainbite card) { diff --git a/Mage.Sets/src/mage/sets/alarareborn/ColossalMight.java b/Mage.Sets/src/mage/sets/alarareborn/ColossalMight.java index fc6f9eb0d62..b8246d69a3f 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/ColossalMight.java +++ b/Mage.Sets/src/mage/sets/alarareborn/ColossalMight.java @@ -49,7 +49,7 @@ public class ColossalMight extends CardImpl { this.expansionSetCode = "ARB"; this.color.setRed(true); this.color.setGreen(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(4, 2, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/alarareborn/Crystallization.java b/Mage.Sets/src/mage/sets/alarareborn/Crystallization.java index 3cda6aca3e0..d95da23c0a3 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/Crystallization.java +++ b/Mage.Sets/src/mage/sets/alarareborn/Crystallization.java @@ -64,7 +64,7 @@ public class Crystallization extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/alarareborn/DeadshotMinotaur.java b/Mage.Sets/src/mage/sets/alarareborn/DeadshotMinotaur.java index fdb8142e709..1e6fceecbd0 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/DeadshotMinotaur.java +++ b/Mage.Sets/src/mage/sets/alarareborn/DeadshotMinotaur.java @@ -66,7 +66,7 @@ public class DeadshotMinotaur extends CardImpl { // When Deadshot Minotaur enters the battlefield, it deals 3 damage to target creature with flying. Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(3), false); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); // Cycling {RG} this.addAbility(new CyclingAbility(new ManaCostsImpl("{R/G}"))); diff --git a/Mage.Sets/src/mage/sets/alarareborn/DemonicDread.java b/Mage.Sets/src/mage/sets/alarareborn/DemonicDread.java index 629637d804d..0ff6eedab30 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/DemonicDread.java +++ b/Mage.Sets/src/mage/sets/alarareborn/DemonicDread.java @@ -55,7 +55,7 @@ public class DemonicDread extends CardImpl { this.addAbility(new CascadeAbility()); // Target creature can't block this turn. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new CantBlockTargetEffect(Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/alarareborn/DenyReality.java b/Mage.Sets/src/mage/sets/alarareborn/DenyReality.java index d69e3079681..8709c33fafb 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/DenyReality.java +++ b/Mage.Sets/src/mage/sets/alarareborn/DenyReality.java @@ -47,7 +47,7 @@ public class DenyReality extends CardImpl { this.expansionSetCode = "ARB"; this.color.setBlue(true); this.color.setBlack(true); - this.getSpellAbility().addTarget(new TargetPermanent(true)); + this.getSpellAbility().addTarget(new TargetPermanent()); this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); this.addAbility(new CascadeAbility()); } diff --git a/Mage.Sets/src/mage/sets/alarareborn/EsperSojourners.java b/Mage.Sets/src/mage/sets/alarareborn/EsperSojourners.java index ad4056f58ee..0b178ec1f74 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/EsperSojourners.java +++ b/Mage.Sets/src/mage/sets/alarareborn/EsperSojourners.java @@ -61,8 +61,8 @@ public class EsperSojourners extends CardImpl { // When you cycle Esper Sojourners or it dies, you may tap or untap target permanent. Ability ability1 = new CycleTriggeredAbility(new MayTapOrUntapTargetEffect()); Ability ability2 = new DiesTriggeredAbility(new MayTapOrUntapTargetEffect()); - ability1.addTarget(new TargetPermanent(true)); - ability2.addTarget(new TargetPermanent(true)); + ability1.addTarget(new TargetPermanent()); + ability2.addTarget(new TargetPermanent()); this.addAbility(ability1); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/sets/alarareborn/GiantAmbushBeetle.java b/Mage.Sets/src/mage/sets/alarareborn/GiantAmbushBeetle.java index 23bdb2cbf8e..00ac023a34f 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/GiantAmbushBeetle.java +++ b/Mage.Sets/src/mage/sets/alarareborn/GiantAmbushBeetle.java @@ -61,7 +61,7 @@ public class GiantAmbushBeetle extends CardImpl { // When Giant Ambush Beetle enters the battlefield, you may have target creature block it this turn if able. Ability ability = new EntersBattlefieldTriggeredAbility(new MustBeBlockedByTargetSourceEffect(Duration.EndOfTurn), true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/alarareborn/IdentityCrisis.java b/Mage.Sets/src/mage/sets/alarareborn/IdentityCrisis.java index cdaa6c02806..37e2269f877 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/IdentityCrisis.java +++ b/Mage.Sets/src/mage/sets/alarareborn/IdentityCrisis.java @@ -53,7 +53,7 @@ public class IdentityCrisis extends CardImpl { this.color.setWhite(true); this.color.setBlack(true); this.getSpellAbility().addEffect(new IdentityCrisisEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public IdentityCrisis (final IdentityCrisis card) { diff --git a/Mage.Sets/src/mage/sets/alarareborn/IntimidationBolt.java b/Mage.Sets/src/mage/sets/alarareborn/IntimidationBolt.java index 4c7132bd9db..ee03cdcdb4a 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/IntimidationBolt.java +++ b/Mage.Sets/src/mage/sets/alarareborn/IntimidationBolt.java @@ -55,7 +55,7 @@ public class IntimidationBolt extends CardImpl { // Intimidation Bolt deals 3 damage to target creature. Other creatures can't attack this turn. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addEffect(new IntimidationEffect(Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/alarareborn/Lavalanche.java b/Mage.Sets/src/mage/sets/alarareborn/Lavalanche.java index f3fa8436ed8..93303d69af7 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/Lavalanche.java +++ b/Mage.Sets/src/mage/sets/alarareborn/Lavalanche.java @@ -61,7 +61,7 @@ public class Lavalanche extends CardImpl { // Lavalanche deals X damage to target player and each creature he or she controls. this.getSpellAbility().addEffect(new LavalancheEffect(new ManacostVariableValue())); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } diff --git a/Mage.Sets/src/mage/sets/alarareborn/LichLordOfUnx.java b/Mage.Sets/src/mage/sets/alarareborn/LichLordOfUnx.java index 4e9bc4aaf83..df483ed54b5 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/LichLordOfUnx.java +++ b/Mage.Sets/src/mage/sets/alarareborn/LichLordOfUnx.java @@ -75,7 +75,7 @@ public class LichLordOfUnx extends CardImpl { this.addAbility(ability); ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(new PermanentsOnBattlefieldCount(filter)), new ManaCostsImpl("{U}{U}{B}{B}")); ability.addEffect(new PutLibraryIntoGraveTargetEffect(new PermanentsOnBattlefieldCount(filter, 1))); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/alarareborn/MageSlayer.java b/Mage.Sets/src/mage/sets/alarareborn/MageSlayer.java index 1e6af3e6806..73805567419 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/MageSlayer.java +++ b/Mage.Sets/src/mage/sets/alarareborn/MageSlayer.java @@ -59,7 +59,7 @@ public class MageSlayer extends CardImpl { this.addAbility(new AttacksAttachedTriggeredAbility(new MageSlayerEffect(), false)); // Equip {3} - this.addAbility(new EquipAbility(Outcome.Benefit, new GenericManaCost(3), new TargetControlledCreaturePermanent(true))); + this.addAbility(new EquipAbility(Outcome.Benefit, new GenericManaCost(3), new TargetControlledCreaturePermanent())); } diff --git a/Mage.Sets/src/mage/sets/alarareborn/MagefireWings.java b/Mage.Sets/src/mage/sets/alarareborn/MagefireWings.java index 24e935f09aa..9e1eb5af958 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/MagefireWings.java +++ b/Mage.Sets/src/mage/sets/alarareborn/MagefireWings.java @@ -60,7 +60,7 @@ public class MagefireWings extends CardImpl { this.color.setBlue(true); this.color.setRed(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/alarareborn/MindFuneral.java b/Mage.Sets/src/mage/sets/alarareborn/MindFuneral.java index 51aecedc2d0..601ebf90912 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/MindFuneral.java +++ b/Mage.Sets/src/mage/sets/alarareborn/MindFuneral.java @@ -57,7 +57,7 @@ public class MindFuneral extends CardImpl { // Target opponent reveals cards from the top of his or her library until four land cards are revealed. That player puts all cards revealed this way into his or her graveyard. this.getSpellAbility().addEffect(new MindFuneralEffect()); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); } diff --git a/Mage.Sets/src/mage/sets/alarareborn/NayaSojourners.java b/Mage.Sets/src/mage/sets/alarareborn/NayaSojourners.java index 9b321bf3169..8511cf9dcbc 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/NayaSojourners.java +++ b/Mage.Sets/src/mage/sets/alarareborn/NayaSojourners.java @@ -62,8 +62,8 @@ public class NayaSojourners extends CardImpl { // When you cycle Naya Sojourners or it dies, you may put a +1/+1 counter on target creature. Ability ability1 = new CycleTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance())); Ability ability2 = new DiesTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance())); - ability1.addTarget(new TargetCreaturePermanent(true)); - ability2.addTarget(new TargetCreaturePermanent(true)); + ability1.addTarget(new TargetCreaturePermanent()); + ability2.addTarget(new TargetCreaturePermanent()); this.addAbility(ability1); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/sets/alarareborn/NecromancersCovenant.java b/Mage.Sets/src/mage/sets/alarareborn/NecromancersCovenant.java index b582d57aff9..2135ced9060 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/NecromancersCovenant.java +++ b/Mage.Sets/src/mage/sets/alarareborn/NecromancersCovenant.java @@ -70,7 +70,7 @@ public class NecromancersCovenant extends CardImpl { // When Necromancer's Covenant enters the battlefield, exile all creature cards from target player's graveyard, then put a 2/2 black Zombie creature token onto the battlefield for each card exiled this way. Ability ability = new EntersBattlefieldTriggeredAbility(new NecromancersConvenantEffect(), false); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); // Zombies you control have lifelink. diff --git a/Mage.Sets/src/mage/sets/alarareborn/NulltreadGargantuan.java b/Mage.Sets/src/mage/sets/alarareborn/NulltreadGargantuan.java index 7b3c19320e2..8d5e9b22cc4 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/NulltreadGargantuan.java +++ b/Mage.Sets/src/mage/sets/alarareborn/NulltreadGargantuan.java @@ -54,7 +54,7 @@ public class NulltreadGargantuan extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(6); Ability ability = new EntersBattlefieldTriggeredAbility(new PutOnLibraryTargetEffect(true), false); - Target target = new TargetControlledCreaturePermanent(true); + Target target = new TargetControlledCreaturePermanent(); target.setRequired(true); target.setNotTarget(true); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/sets/alarareborn/QasaliPridemage.java b/Mage.Sets/src/mage/sets/alarareborn/QasaliPridemage.java index f806bb2630f..fa0891aa0e3 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/QasaliPridemage.java +++ b/Mage.Sets/src/mage/sets/alarareborn/QasaliPridemage.java @@ -76,7 +76,7 @@ public class QasaliPridemage extends CardImpl { // {1}, Sacrifice Qasali Pridemage: Destroy target artifact or enchantment. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}")); ability.addCost(new SacrificeSourceCost()); - Target target = new TargetPermanent(filter, true); + Target target = new TargetPermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/alarareborn/SangriteBacklash.java b/Mage.Sets/src/mage/sets/alarareborn/SangriteBacklash.java index f368a8819f2..2a6c3cc6c7f 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/SangriteBacklash.java +++ b/Mage.Sets/src/mage/sets/alarareborn/SangriteBacklash.java @@ -57,7 +57,7 @@ public class SangriteBacklash extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/alarareborn/SanityGnawers.java b/Mage.Sets/src/mage/sets/alarareborn/SanityGnawers.java index 3a1e2dd46bd..f522e5254a3 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/SanityGnawers.java +++ b/Mage.Sets/src/mage/sets/alarareborn/SanityGnawers.java @@ -55,7 +55,7 @@ public class SanityGnawers extends CardImpl { // When Sanity Gnawers enters the battlefield, target player discards a card at random. Ability ability = new EntersBattlefieldTriggeredAbility(new DiscardTargetEffect(1, true), false); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/alarareborn/ShieldOfTheRighteous.java b/Mage.Sets/src/mage/sets/alarareborn/ShieldOfTheRighteous.java index df4b4d3bd78..2cff90deeae 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/ShieldOfTheRighteous.java +++ b/Mage.Sets/src/mage/sets/alarareborn/ShieldOfTheRighteous.java @@ -66,7 +66,7 @@ public class ShieldOfTheRighteous extends CardImpl { this.addAbility(new BlocksCreatureAttachedTriggeredAbility(new SkipNextUntapTargetEffect("that creature"), "equipped", false, false, true)); // Equip {2} - this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2), new TargetControlledCreaturePermanent(true))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2), new TargetControlledCreaturePermanent())); } public ShieldOfTheRighteous(final ShieldOfTheRighteous card) { diff --git a/Mage.Sets/src/mage/sets/alarareborn/SigilOfTheNayanGods.java b/Mage.Sets/src/mage/sets/alarareborn/SigilOfTheNayanGods.java index 9b625cf2f3f..963b66d71e2 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/SigilOfTheNayanGods.java +++ b/Mage.Sets/src/mage/sets/alarareborn/SigilOfTheNayanGods.java @@ -61,7 +61,7 @@ public class SigilOfTheNayanGods extends CardImpl { this.color.setGreen(true); this.color.setWhite(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/alarareborn/SingeMindOgre.java b/Mage.Sets/src/mage/sets/alarareborn/SingeMindOgre.java index c5aacc9fc39..d0e817e5f84 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/SingeMindOgre.java +++ b/Mage.Sets/src/mage/sets/alarareborn/SingeMindOgre.java @@ -62,7 +62,7 @@ public class SingeMindOgre extends CardImpl { // When Singe-Mind Ogre enters the battlefield, target player reveals a card at random from his or her hand, then loses life equal to that card's converted mana cost. Ability ability = new EntersBattlefieldTriggeredAbility(new SingeMindOgreEffect(), false); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/alarareborn/SlaveOfBolas.java b/Mage.Sets/src/mage/sets/alarareborn/SlaveOfBolas.java index 4fb714119a7..befd78ca813 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/SlaveOfBolas.java +++ b/Mage.Sets/src/mage/sets/alarareborn/SlaveOfBolas.java @@ -65,7 +65,7 @@ public class SlaveOfBolas extends CardImpl { this.getSpellAbility().addEffect(new UntapTargetEffect()); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addEffect(new SlaveOfBolasEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public SlaveOfBolas(final SlaveOfBolas card) { diff --git a/Mage.Sets/src/mage/sets/alarareborn/StunSniper.java b/Mage.Sets/src/mage/sets/alarareborn/StunSniper.java index f38fbaf5d5b..3755903f191 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/StunSniper.java +++ b/Mage.Sets/src/mage/sets/alarareborn/StunSniper.java @@ -60,7 +60,7 @@ public class StunSniper extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addEffect(new TapTargetEffect()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/alarareborn/Terminate.java b/Mage.Sets/src/mage/sets/alarareborn/Terminate.java index 8bbc49f2c49..9d1b08f8dbf 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/Terminate.java +++ b/Mage.Sets/src/mage/sets/alarareborn/Terminate.java @@ -48,7 +48,7 @@ public class Terminate extends CardImpl { this.color.setRed(true); // Destroy target creature. It can't be regenerated. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); } diff --git a/Mage.Sets/src/mage/sets/alarareborn/ThoughtHemorrhage.java b/Mage.Sets/src/mage/sets/alarareborn/ThoughtHemorrhage.java index 29abcbe4328..fa3acab19d1 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/ThoughtHemorrhage.java +++ b/Mage.Sets/src/mage/sets/alarareborn/ThoughtHemorrhage.java @@ -56,7 +56,7 @@ public class ThoughtHemorrhage extends CardImpl { this.color.setBlack(true); // Name a nonland card. Target player reveals his or her hand. Thought Hemorrhage deals 3 damage to that player for each card with that name revealed this way. Search that player's graveyard, hand, and library for all cards with that name and exile them. Then that player shuffles his or her library. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new ThoughtHemorrhageEffect()); } diff --git a/Mage.Sets/src/mage/sets/alarareborn/UnbenderTine.java b/Mage.Sets/src/mage/sets/alarareborn/UnbenderTine.java index 902dfcdc3ad..38d20cdfc98 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/UnbenderTine.java +++ b/Mage.Sets/src/mage/sets/alarareborn/UnbenderTine.java @@ -65,7 +65,7 @@ public class UnbenderTine extends CardImpl { // {tap}: Untap another target permanent. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UnbenderTineEffect(), new TapSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/alarareborn/UnscytheKillerOfKings.java b/Mage.Sets/src/mage/sets/alarareborn/UnscytheKillerOfKings.java index 582afe9d190..00570bd2859 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/UnscytheKillerOfKings.java +++ b/Mage.Sets/src/mage/sets/alarareborn/UnscytheKillerOfKings.java @@ -83,7 +83,7 @@ public class UnscytheKillerOfKings extends CardImpl { this.addWatcher(new EquippedDidDamageWatcher()); // Equip {2} - this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2), new TargetControlledCreaturePermanent(true))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2), new TargetControlledCreaturePermanent())); } public UnscytheKillerOfKings(final UnscytheKillerOfKings card) { diff --git a/Mage.Sets/src/mage/sets/alarareborn/VectisDominator.java b/Mage.Sets/src/mage/sets/alarareborn/VectisDominator.java index 6ce4c2b9821..2bf2b6765b6 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/VectisDominator.java +++ b/Mage.Sets/src/mage/sets/alarareborn/VectisDominator.java @@ -66,7 +66,7 @@ public class VectisDominator extends CardImpl { // {tap}: Tap target creature unless its controller pays 2 life. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VectisDominatorEffect(new PayLifeCost(2)), new ManaCostsImpl("{1}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/alarareborn/VengefulRebirth.java b/Mage.Sets/src/mage/sets/alarareborn/VengefulRebirth.java index 717a248209d..5c01eed5aa2 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/VengefulRebirth.java +++ b/Mage.Sets/src/mage/sets/alarareborn/VengefulRebirth.java @@ -60,7 +60,7 @@ public class VengefulRebirth extends CardImpl { Target target = new TargetCardInYourGraveyard(); target.setRequired(true); this.getSpellAbility().addTarget(target); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); this.getSpellAbility().addEffect(new VengefulRebirthEffect()); // Exile Vengeful Rebirth. this.getSpellAbility().addEffect(ExileSpellEffect.getInstance()); diff --git a/Mage.Sets/src/mage/sets/alarareborn/VithianRenegades.java b/Mage.Sets/src/mage/sets/alarareborn/VithianRenegades.java index e033ef8b258..babf34ba4dc 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/VithianRenegades.java +++ b/Mage.Sets/src/mage/sets/alarareborn/VithianRenegades.java @@ -61,7 +61,7 @@ public class VithianRenegades extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(2); Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/alliances/Exile.java b/Mage.Sets/src/mage/sets/alliances/Exile.java index 93dce5cac61..521c2579b83 100644 --- a/Mage.Sets/src/mage/sets/alliances/Exile.java +++ b/Mage.Sets/src/mage/sets/alliances/Exile.java @@ -66,7 +66,7 @@ public class Exile extends CardImpl { this.color.setWhite(true); // Exile target nonwhite attacking creature. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new ExileTargetEffect()); // You gain life equal to its toughness. this.getSpellAbility().addEffect(new ExileEffect()); diff --git a/Mage.Sets/src/mage/sets/alliances/HelmOfObedience.java b/Mage.Sets/src/mage/sets/alliances/HelmOfObedience.java index 58de22deb18..04bb21be887 100644 --- a/Mage.Sets/src/mage/sets/alliances/HelmOfObedience.java +++ b/Mage.Sets/src/mage/sets/alliances/HelmOfObedience.java @@ -60,7 +60,7 @@ public class HelmOfObedience extends CardImpl { xCosts.setMinX(1); SimpleActivatedAbility abilitiy = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HelmOfObedienceEffect(), xCosts); abilitiy.addCost(new TapSourceCost()); - abilitiy.addTarget(new TargetOpponent(true)); + abilitiy.addTarget(new TargetOpponent()); this.addAbility(abilitiy); } diff --git a/Mage.Sets/src/mage/sets/alliances/LordOfTresserhorn.java b/Mage.Sets/src/mage/sets/alliances/LordOfTresserhorn.java index 38e12497c90..cde1b70adf5 100644 --- a/Mage.Sets/src/mage/sets/alliances/LordOfTresserhorn.java +++ b/Mage.Sets/src/mage/sets/alliances/LordOfTresserhorn.java @@ -76,7 +76,7 @@ public class LordOfTresserhorn extends CardImpl { effect.setText(", and target opponent draws two cards"); effect.setTargetPointer(new SecondTargetPointer()); ability.addEffect(effect); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); // {B}: Regenerate Lord of Tresserhorn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}"))); diff --git a/Mage.Sets/src/mage/sets/alliances/Phelddagrif.java b/Mage.Sets/src/mage/sets/alliances/Phelddagrif.java index 143fd35c994..31bb571fd3d 100644 --- a/Mage.Sets/src/mage/sets/alliances/Phelddagrif.java +++ b/Mage.Sets/src/mage/sets/alliances/Phelddagrif.java @@ -70,17 +70,17 @@ public class Phelddagrif extends CardImpl { // {G}: Phelddagrif gains trample until end of turn. Target opponent puts a 1/1 green Hippo creature token onto the battlefield. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn),new ManaCostsImpl("{G}")); ability.addEffect(new CreateTokenTargetEffect(new HippoToken())); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); // {W}: Phelddagrif gains flying until end of turn. Target opponent gains 2 life. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn),new ManaCostsImpl("{W}")); ability.addEffect(new GainLifeTargetEffect(2)); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); // {U}: Return Phelddagrif to its owner's hand. Target opponent may draw a card. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true),new ManaCostsImpl("{U}")); ability.addEffect(new DrawCardTargetEffect(1, true)); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/alliances/SoldierOfFortune.java b/Mage.Sets/src/mage/sets/alliances/SoldierOfFortune.java index fc0e863ba31..dd28a5a3815 100644 --- a/Mage.Sets/src/mage/sets/alliances/SoldierOfFortune.java +++ b/Mage.Sets/src/mage/sets/alliances/SoldierOfFortune.java @@ -61,7 +61,7 @@ public class SoldierOfFortune extends CardImpl { // {R}, {T}: Target player shuffles his or her library. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SoldierOfFortuneEffect(), new TapSourceCost()); ability.addManaCost(new ManaCostsImpl("{R}")); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/AEtherMutation.java b/Mage.Sets/src/mage/sets/apocalypse/AEtherMutation.java index 53015c7c86c..8a476f5dce8 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/AEtherMutation.java +++ b/Mage.Sets/src/mage/sets/apocalypse/AEtherMutation.java @@ -52,7 +52,7 @@ public class AEtherMutation extends CardImpl { // Return target creature to its owner's hand. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Put X 1/1 green Saproling creature tokens onto the battlefield, where X is that creature's converted mana cost. this.getSpellAbility().addEffect(new CreateTokenEffect(new SaprolingToken(), new TargetConvertedManaCost())); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/AnaDisciple.java b/Mage.Sets/src/mage/sets/apocalypse/AnaDisciple.java index 383a84ff8b7..e4bce14c525 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/AnaDisciple.java +++ b/Mage.Sets/src/mage/sets/apocalypse/AnaDisciple.java @@ -57,11 +57,11 @@ public class AnaDisciple extends CardImpl { this.toughness = new MageInt(1); Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U)); firstAbility.addCost(new TapSourceCost()); - firstAbility.addTarget(new TargetCreaturePermanent(true)); + firstAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(firstAbility); Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); secondAbility.addCost(new TapSourceCost()); - secondAbility.addTarget(new TargetCreaturePermanent(true)); + secondAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/CetaDisciple.java b/Mage.Sets/src/mage/sets/apocalypse/CetaDisciple.java index 13aca608bd3..7656e79b593 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/CetaDisciple.java +++ b/Mage.Sets/src/mage/sets/apocalypse/CetaDisciple.java @@ -55,7 +55,7 @@ public class CetaDisciple extends CardImpl { this.toughness = new MageInt(1); Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); firstAbility.addCost(new TapSourceCost()); - firstAbility.addTarget(new TargetCreaturePermanent(true)); + firstAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(firstAbility); Ability secondAbility = new AnyColorManaAbility(new ColoredManaCost(ColoredManaSymbol.G)); secondAbility.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/apocalypse/ConsumeStrength.java b/Mage.Sets/src/mage/sets/apocalypse/ConsumeStrength.java index 67c09c0f2a1..340508d2922 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/ConsumeStrength.java +++ b/Mage.Sets/src/mage/sets/apocalypse/ConsumeStrength.java @@ -56,7 +56,7 @@ public class ConsumeStrength extends CardImpl { // Target creature gets +2/+2 until end of turn. Another target creature gets -2/-2 until end of turn. this.getSpellAbility().addEffect(new ConsumeStrengthEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(2, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(2)); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/Cromat.java b/Mage.Sets/src/mage/sets/apocalypse/Cromat.java index 973e984bc69..24356d737e6 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/Cromat.java +++ b/Mage.Sets/src/mage/sets/apocalypse/Cromat.java @@ -74,7 +74,7 @@ public class Cromat extends CardImpl { filter.add(Predicates.or(new BlockedByIdPredicate(this.getId()), new BlockingAttackerIdPredicate(this.getId()))); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{W}{B}")); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); // {U}{R}: Cromat gains flying until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{U}{R}"))); diff --git a/Mage.Sets/src/mage/sets/apocalypse/DeathMutation.java b/Mage.Sets/src/mage/sets/apocalypse/DeathMutation.java index e04152e11e7..c4b065b5c3c 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/DeathMutation.java +++ b/Mage.Sets/src/mage/sets/apocalypse/DeathMutation.java @@ -62,7 +62,7 @@ public class DeathMutation extends CardImpl { // Destroy target nonblack creature. It can't be regenerated. this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); // Put X 1/1 green Saproling creature tokens onto the battlefield, where X is that creature's converted mana cost. this.getSpellAbility().addEffect(new CreateTokenEffect(new SaprolingToken(), new TargetConvertedManaCost())); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/DegaDisciple.java b/Mage.Sets/src/mage/sets/apocalypse/DegaDisciple.java index 58429428baf..e323df08584 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/DegaDisciple.java +++ b/Mage.Sets/src/mage/sets/apocalypse/DegaDisciple.java @@ -55,11 +55,11 @@ public class DegaDisciple extends CardImpl { this.toughness = new MageInt(1); Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); firstAbility.addCost(new TapSourceCost()); - firstAbility.addTarget(new TargetCreaturePermanent(true)); + firstAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(firstAbility); Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); secondAbility.addCost(new TapSourceCost()); - secondAbility.addTarget(new TargetCreaturePermanent(true)); + secondAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/DiversionaryTactics.java b/Mage.Sets/src/mage/sets/apocalypse/DiversionaryTactics.java index 7b07ee140bc..9a5fa3e4ad6 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/DiversionaryTactics.java +++ b/Mage.Sets/src/mage/sets/apocalypse/DiversionaryTactics.java @@ -59,7 +59,7 @@ public class DiversionaryTactics extends CardImpl { this.expansionSetCode = "APC"; this.color.setWhite(true); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, false))); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/FireIce.java b/Mage.Sets/src/mage/sets/apocalypse/FireIce.java index 100d78f4c76..7f0394cdcd8 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/FireIce.java +++ b/Mage.Sets/src/mage/sets/apocalypse/FireIce.java @@ -67,7 +67,7 @@ public class FireIce extends SplitCard { // Draw a card. getRightHalfCard().getColor().setBlue(true); getRightHalfCard().getSpellAbility().addEffect(new TapTargetEffect()); - getRightHalfCard().getSpellAbility().addTarget(new TargetPermanent(true)); + getRightHalfCard().getSpellAbility().addTarget(new TargetPermanent()); getRightHalfCard().getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/IllusionReality.java b/Mage.Sets/src/mage/sets/apocalypse/IllusionReality.java index 543245fbe2b..52162fb53fd 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/IllusionReality.java +++ b/Mage.Sets/src/mage/sets/apocalypse/IllusionReality.java @@ -66,7 +66,7 @@ public class IllusionReality extends SplitCard { // Reality // Destroy target artifact. getRightHalfCard().getColor().setGreen(true); - getRightHalfCard().getSpellAbility().addTarget(new TargetArtifactPermanent(true)); + getRightHalfCard().getSpellAbility().addTarget(new TargetArtifactPermanent()); getRightHalfCard().getSpellAbility().addEffect(new DestroyTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/LastCaress.java b/Mage.Sets/src/mage/sets/apocalypse/LastCaress.java index 63526a096fd..cc847b22f4f 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/LastCaress.java +++ b/Mage.Sets/src/mage/sets/apocalypse/LastCaress.java @@ -47,7 +47,7 @@ public class LastCaress extends CardImpl { this.expansionSetCode = "APC"; this.color.setBlack(true); this.getSpellAbility().addEffect(new LoseLifeTargetEffect(1)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new GainLifeEffect(1)); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/LegacyWeapon.java b/Mage.Sets/src/mage/sets/apocalypse/LegacyWeapon.java index baf3d4c1da9..543c069303a 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/LegacyWeapon.java +++ b/Mage.Sets/src/mage/sets/apocalypse/LegacyWeapon.java @@ -61,7 +61,7 @@ public class LegacyWeapon extends CardImpl { SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl("{W}{U}{B}{R}{G}")); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); this.addAbility(ability); // If Legacy Weapon would be put into a graveyard from anywhere, reveal Legacy Weapon and shuffle it into its owner's library instead. this.addAbility(new PutIntoGraveFromAnywhereTriggeredAbility(new LegacyWeaponEffect())); diff --git a/Mage.Sets/src/mage/sets/apocalypse/ManaclesOfDecay.java b/Mage.Sets/src/mage/sets/apocalypse/ManaclesOfDecay.java index 709c9bcc03b..01859a20adc 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/ManaclesOfDecay.java +++ b/Mage.Sets/src/mage/sets/apocalypse/ManaclesOfDecay.java @@ -55,7 +55,7 @@ public class ManaclesOfDecay extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/apocalypse/MartyrsTomb.java b/Mage.Sets/src/mage/sets/apocalypse/MartyrsTomb.java index 2554bb28faf..4aa480164e2 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/MartyrsTomb.java +++ b/Mage.Sets/src/mage/sets/apocalypse/MartyrsTomb.java @@ -52,7 +52,7 @@ public class MartyrsTomb extends CardImpl { this.color.setBlack(true); this.color.setWhite(true); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new PayLifeCost(2)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/NightDay.java b/Mage.Sets/src/mage/sets/apocalypse/NightDay.java index 5c3dd614d13..521297a69de 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/NightDay.java +++ b/Mage.Sets/src/mage/sets/apocalypse/NightDay.java @@ -64,12 +64,12 @@ public class NightDay extends SplitCard { // Target creature gets -1/-1 until end of turn. getLeftHalfCard().getColor().setBlack(true); getLeftHalfCard().getSpellAbility().addEffect(new BoostTargetEffect(-1,-1,Duration.EndOfTurn)); - getLeftHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + getLeftHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent()); // Day // Creatures target player controls get +1/+1 until end of turn. getRightHalfCard().getColor().setWhite(true); - getRightHalfCard().getSpellAbility().addTarget(new TargetPlayer(true)); + getRightHalfCard().getSpellAbility().addTarget(new TargetPlayer()); getRightHalfCard().getSpellAbility().addEffect(new DayEffect()); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/OrimsThunder.java b/Mage.Sets/src/mage/sets/apocalypse/OrimsThunder.java index 6ae6c8cb20a..cff3adad59e 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/OrimsThunder.java +++ b/Mage.Sets/src/mage/sets/apocalypse/OrimsThunder.java @@ -74,7 +74,7 @@ public class OrimsThunder extends CardImpl { // Destroy target artifact or enchantment. If Orim's Thunder was kicked, it deals damage equal to that permanent's converted mana cost to target creature. this.getSpellAbility().addEffect(new OrimsThunderEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new OrimsThunderEffect2(), KickedCondition.getInstance(), @@ -86,7 +86,7 @@ public class OrimsThunder extends CardImpl { public void adjustTargets(Ability ability, Game game) { if (ability instanceof SpellAbility) { if (KickedCondition.getInstance().apply(game, ability)) { - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); } } } diff --git a/Mage.Sets/src/mage/sets/apocalypse/QuagmireDruid.java b/Mage.Sets/src/mage/sets/apocalypse/QuagmireDruid.java index 87dbbaf4230..35ae5f3a0b5 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/QuagmireDruid.java +++ b/Mage.Sets/src/mage/sets/apocalypse/QuagmireDruid.java @@ -72,8 +72,8 @@ public class QuagmireDruid extends CardImpl { // {G}, {T}, Sacrifice a creature: Destroy target enchantment. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(false), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new TapSourceCost()); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/QuicksilverDagger.java b/Mage.Sets/src/mage/sets/apocalypse/QuicksilverDagger.java index 146fc26a485..18590d4cdaf 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/QuicksilverDagger.java +++ b/Mage.Sets/src/mage/sets/apocalypse/QuicksilverDagger.java @@ -62,7 +62,7 @@ public class QuicksilverDagger extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); @@ -70,7 +70,7 @@ public class QuicksilverDagger extends CardImpl { // Enchanted creature has "{tap}: This creature deals 1 damage to target player. You draw a card." Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - gainAbility.addTarget(new TargetPlayer(true)); + gainAbility.addTarget(new TargetPlayer()); gainAbility.addEffect(new DrawCardSourceControllerEffect(1)); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/RakaDisciple.java b/Mage.Sets/src/mage/sets/apocalypse/RakaDisciple.java index e43b4b2fbae..ccf1ce5dc7e 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/RakaDisciple.java +++ b/Mage.Sets/src/mage/sets/apocalypse/RakaDisciple.java @@ -61,7 +61,7 @@ public class RakaDisciple extends CardImpl { this.addAbility(firstAbility); Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U)); secondAbility.addCost(new TapSourceCost()); - secondAbility.addTarget(new TargetCreaturePermanent(true)); + secondAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/SavageGorilla.java b/Mage.Sets/src/mage/sets/apocalypse/SavageGorilla.java index 6ea90f8935d..c45fe52beb5 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/SavageGorilla.java +++ b/Mage.Sets/src/mage/sets/apocalypse/SavageGorilla.java @@ -61,7 +61,7 @@ public class SavageGorilla extends CardImpl { ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addEffect(new DrawCardSourceControllerEffect(1)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/TemporalSpring.java b/Mage.Sets/src/mage/sets/apocalypse/TemporalSpring.java index 4a3e067e045..968bb3cec9a 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/TemporalSpring.java +++ b/Mage.Sets/src/mage/sets/apocalypse/TemporalSpring.java @@ -46,7 +46,7 @@ public class TemporalSpring extends CardImpl { this.color.setBlue(true); this.color.setGreen(true); this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true)); - this.getSpellAbility().addTarget(new TargetPermanent(true)); + this.getSpellAbility().addTarget(new TargetPermanent()); } public TemporalSpring(final TemporalSpring card) { diff --git a/Mage.Sets/src/mage/sets/apocalypse/Vindicate.java b/Mage.Sets/src/mage/sets/apocalypse/Vindicate.java index 18e2766cc7c..64da14c3614 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/Vindicate.java +++ b/Mage.Sets/src/mage/sets/apocalypse/Vindicate.java @@ -47,7 +47,7 @@ public class Vindicate extends CardImpl { this.color.setWhite(true); this.color.setBlack(true); this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(true)); + this.getSpellAbility().addTarget(new TargetPermanent()); } public Vindicate (final Vindicate card) { diff --git a/Mage.Sets/src/mage/sets/arabiannights/KingSuleiman.java b/Mage.Sets/src/mage/sets/arabiannights/KingSuleiman.java index 3d858509a8e..e7cde8bb508 100644 --- a/Mage.Sets/src/mage/sets/arabiannights/KingSuleiman.java +++ b/Mage.Sets/src/mage/sets/arabiannights/KingSuleiman.java @@ -67,7 +67,7 @@ public class KingSuleiman extends CardImpl { // {tap}: Destroy target Djinn or Efreet. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/arabiannights/OldManOfTheSea.java b/Mage.Sets/src/mage/sets/arabiannights/OldManOfTheSea.java index 47b18d89d69..302923550e6 100644 --- a/Mage.Sets/src/mage/sets/arabiannights/OldManOfTheSea.java +++ b/Mage.Sets/src/mage/sets/arabiannights/OldManOfTheSea.java @@ -82,7 +82,7 @@ public class OldManOfTheSea extends CardImpl { "Gain control of target creature with power less than or equal to {this}'s power for as long as {this} remains tapped and that creature's power remains less than or equal to {this}'s power"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new GenericManaCost(2)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(controllableCreatures, true)); + ability.addTarget(new TargetCreaturePermanent(controllableCreatures)); this.addAbility(ability); // internal ability to check condition this.addAbility(new OldManOfTheSeaStateBasedTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Aggravate.java b/Mage.Sets/src/mage/sets/avacynrestored/Aggravate.java index 9d7a5df11da..c811cfd5146 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Aggravate.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Aggravate.java @@ -59,7 +59,7 @@ public class Aggravate extends CardImpl { // Aggravate deals 1 damage to each creature target player controls. this.getSpellAbility().addEffect(new AggraveteEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); // Each creature dealt damage this way attacks this turn if able. this.getSpellAbility().addEffect(new AggravateRequirementEffect()); this.addWatcher(new DamagedByWatcher()); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/AppetiteForBrains.java b/Mage.Sets/src/mage/sets/avacynrestored/AppetiteForBrains.java index af6bb2346a4..82e1a713564 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/AppetiteForBrains.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/AppetiteForBrains.java @@ -56,7 +56,7 @@ public class AppetiteForBrains extends CardImpl { // Target opponent reveals his or her hand. You choose a card from it with converted mana cost 4 or greater and exile that card. this.getSpellAbility().addEffect(new ExileCardYouChooseTargetOpponentEffect(filter)); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); } public AppetiteForBrains(final AppetiteForBrains card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/BanishingStroke.java b/Mage.Sets/src/mage/sets/avacynrestored/BanishingStroke.java index 217bd5350fe..82bba6e34d3 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/BanishingStroke.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/BanishingStroke.java @@ -63,7 +63,7 @@ public class BanishingStroke extends CardImpl { // Put target artifact, creature, or enchantment on the bottom of its owner's library. this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(false)); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); // Miracle {W} this.addAbility(new MiracleAbility(new ManaCostsImpl("{W}"))); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/BloodArtist.java b/Mage.Sets/src/mage/sets/avacynrestored/BloodArtist.java index a37d1310fca..4f22e3ba6a8 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/BloodArtist.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/BloodArtist.java @@ -58,7 +58,7 @@ public class BloodArtist extends CardImpl { // Whenever Blood Artist or another creature dies, target player loses 1 life and you gain 1 life. Ability ability = new DiesThisOrAnotherCreatureTriggeredAbility(new LoseLifeTargetEffect(1), false); ability.addEffect(new GainLifeEffect(1)); - Target target = new TargetPlayer(true); + Target target = new TargetPlayer(); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/BloodflowConnoisseur.java b/Mage.Sets/src/mage/sets/avacynrestored/BloodflowConnoisseur.java index ababd554a09..c99e015076d 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/BloodflowConnoisseur.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/BloodflowConnoisseur.java @@ -59,7 +59,7 @@ public class BloodflowConnoisseur extends CardImpl { // Sacrifice a creature: Put a +1/+1 counter on Bloodflow Connoisseur. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl()); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/BonfireOfTheDamned.java b/Mage.Sets/src/mage/sets/avacynrestored/BonfireOfTheDamned.java index e004441c36a..6f7ac127e73 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/BonfireOfTheDamned.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/BonfireOfTheDamned.java @@ -58,7 +58,7 @@ public class BonfireOfTheDamned extends CardImpl { // Bonfire of the Damned deals X damage to target player and each creature he or she controls. this.getSpellAbility().addEffect(new BonfireOfTheDamnedEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); // Miracle {X}{R} this.addAbility(new MiracleAbility(new ManaCostsImpl("{X}{R}"))); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/BurnAtTheStake.java b/Mage.Sets/src/mage/sets/avacynrestored/BurnAtTheStake.java index e38c8605fa4..eca5bb0cf16 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/BurnAtTheStake.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/BurnAtTheStake.java @@ -66,7 +66,7 @@ public class BurnAtTheStake extends CardImpl { this.getSpellAbility().addCost(new TapVariableTargetCost(filter, true, "any number of")); // Burn at the Stake deals damage to target creature or player equal to three times the number of creatures tapped this way. this.getSpellAbility().addEffect(new BurnAtTheStakeEffect()); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); } public BurnAtTheStake(final BurnAtTheStake card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/CallToServe.java b/Mage.Sets/src/mage/sets/avacynrestored/CallToServe.java index 05e5df4b3b3..4e3f2375112 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/CallToServe.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/CallToServe.java @@ -65,7 +65,7 @@ public class CallToServe extends CardImpl { this.color.setWhite(true); // Enchant nonblack creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/CaptainOfTheMists.java b/Mage.Sets/src/mage/sets/avacynrestored/CaptainOfTheMists.java index 4639e821304..4507175e8fd 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/CaptainOfTheMists.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/CaptainOfTheMists.java @@ -76,7 +76,7 @@ public class CaptainOfTheMists extends CardImpl { // {1}{U}, {tap}: You may tap or untap target permanent. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new ManaCostsImpl("{1}{U}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Cloudshift.java b/Mage.Sets/src/mage/sets/avacynrestored/Cloudshift.java index 7bcce9d8dac..72f9fb906f2 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Cloudshift.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Cloudshift.java @@ -49,7 +49,7 @@ public class Cloudshift extends CardImpl { this.color.setWhite(true); // Exile target creature you control, then return that card to the battlefield under your control. - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); this.getSpellAbility().addEffect(new ExileTargetForSourceEffect("Cloudshift")); this.getSpellAbility().addEffect(new ReturnToBattlefieldUnderYourControlTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/CommandersAuthority.java b/Mage.Sets/src/mage/sets/avacynrestored/CommandersAuthority.java index eb1d379c74c..b87870aa951 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/CommandersAuthority.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/CommandersAuthority.java @@ -55,7 +55,7 @@ public class CommandersAuthority extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/ConjurersCloset.java b/Mage.Sets/src/mage/sets/avacynrestored/ConjurersCloset.java index cd94a0d234b..8ebd02418f6 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/ConjurersCloset.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/ConjurersCloset.java @@ -50,7 +50,7 @@ public class ConjurersCloset extends CardImpl { // At the beginning of your end step, you may exile target creature you control, then return that card to the battlefield under your control. Ability ability = new BeginningOfYourEndStepTriggeredAbility(new ExileTargetForSourceEffect("Conjurer's Closet Exile"), true); ability.addEffect(new ReturnToBattlefieldUnderYourControlTargetEffect()); - ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/CorpseTraders.java b/Mage.Sets/src/mage/sets/avacynrestored/CorpseTraders.java index d5ff3774a10..fec02aacf23 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/CorpseTraders.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/CorpseTraders.java @@ -59,8 +59,8 @@ public class CorpseTraders extends CardImpl { // {2}{B}, Sacrifice a creature: Target opponent reveals his or her hand. You choose a card from it. That player discards that card. Activate this ability only any time you could cast a sorcery. Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardCardYouChooseTargetEffect(), new ManaCostsImpl("{2}{B}")); - ability.addTarget(new TargetOpponent(true)); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addTarget(new TargetOpponent()); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/CripplingChill.java b/Mage.Sets/src/mage/sets/avacynrestored/CripplingChill.java index 337f93af014..5345ff00c6f 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/CripplingChill.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/CripplingChill.java @@ -50,7 +50,7 @@ public class CripplingChill extends CardImpl { this.color.setBlue(true); // Tap target creature. It doesn't untap during its controller's next untap step. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new TapTargetEffect()); this.getSpellAbility().addEffect(new SkipNextUntapTargetEffect()); // Draw a card. diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Cursebreak.java b/Mage.Sets/src/mage/sets/avacynrestored/Cursebreak.java index a60ee8f6f69..fa8d3bbb023 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Cursebreak.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Cursebreak.java @@ -56,7 +56,7 @@ public class Cursebreak extends CardImpl { this.color.setWhite(true); // Destroy target enchantment. You gain 2 life. - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new GainLifeEffect(2)); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/DarkImpostor.java b/Mage.Sets/src/mage/sets/avacynrestored/DarkImpostor.java index bfdd9d93565..81475eee33c 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/DarkImpostor.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/DarkImpostor.java @@ -68,7 +68,7 @@ public class DarkImpostor extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ImprintTargetEffect(), new ManaCostsImpl("{4}{B}{B}")); ability.addEffect(new ExileTargetEffect(null, "Dark Impostor")); ability.addEffect(new AddCountersSourceEffect(CounterType.P1P1.createInstance())); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Dark Impostor has all activated abilities of all creature cards exiled with it. diff --git a/Mage.Sets/src/mage/sets/avacynrestored/DeathWind.java b/Mage.Sets/src/mage/sets/avacynrestored/DeathWind.java index 005887f1acf..c6af443c2c0 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/DeathWind.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/DeathWind.java @@ -53,7 +53,7 @@ public class DeathWind extends CardImpl { // Target creature gets -X/-X until end of turn. DynamicValue x = new SignInversionDynamicValue(new ManacostVariableValue()); this.getSpellAbility().addEffect(new BoostTargetEffect(x, x, Duration.EndOfTurn, true)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public DeathWind(final DeathWind card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Defang.java b/Mage.Sets/src/mage/sets/avacynrestored/Defang.java index 86ae70a8951..c49e34b6ccc 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Defang.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Defang.java @@ -55,7 +55,7 @@ public class Defang extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/DevoutChaplain.java b/Mage.Sets/src/mage/sets/avacynrestored/DevoutChaplain.java index 06e01f24194..a1a951f8103 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/DevoutChaplain.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/DevoutChaplain.java @@ -81,7 +81,7 @@ public class DevoutChaplain extends CardImpl { // {tap}, Tap two untapped Humans you control: Exile target artifact or enchantment. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledPermanent(2, 2, humanFilter, false))); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Dreadwaters.java b/Mage.Sets/src/mage/sets/avacynrestored/Dreadwaters.java index 37096a92a47..7be558bb078 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Dreadwaters.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Dreadwaters.java @@ -59,7 +59,7 @@ public class Dreadwaters extends CardImpl { this.color.setBlue(true); // Target player puts the top X cards of his or her library into his or her graveyard, where X is the number of lands you control. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(new PermanentsOnBattlefieldCount(filter))); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/DualCasting.java b/Mage.Sets/src/mage/sets/avacynrestored/DualCasting.java index 2be6771055b..c2859b9ff33 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/DualCasting.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/DualCasting.java @@ -68,7 +68,7 @@ public class DualCasting extends CardImpl { this.color.setRed(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/EatenBySpiders.java b/Mage.Sets/src/mage/sets/avacynrestored/EatenBySpiders.java index 95462f0affc..659c527ca89 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/EatenBySpiders.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/EatenBySpiders.java @@ -62,7 +62,7 @@ public class EatenBySpiders extends CardImpl { // Destroy target creature with flying and all Equipment attached to that creature. this.getSpellAbility().addEffect(new EatenBySpidersEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); } public EatenBySpiders(final EatenBySpiders card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/EssenceHarvest.java b/Mage.Sets/src/mage/sets/avacynrestored/EssenceHarvest.java index 3df48a76662..f9d0283b8b2 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/EssenceHarvest.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/EssenceHarvest.java @@ -55,7 +55,7 @@ public class EssenceHarvest extends CardImpl { // Target player loses X life and you gain X life, where X is the greatest power among creatures you control. this.getSpellAbility().addEffect(new EssenceHarvestEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public EssenceHarvest(final EssenceHarvest card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/FalkenrathExterminator.java b/Mage.Sets/src/mage/sets/avacynrestored/FalkenrathExterminator.java index 76d99cbd35b..2aed32a8555 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/FalkenrathExterminator.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/FalkenrathExterminator.java @@ -64,7 +64,7 @@ public class FalkenrathExterminator extends CardImpl { this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false)); // {2}{R}: Falkenrath Exterminator deals damage to target creature equal to the number of +1/+1 counters on Falkenrath Exterminator. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new CountersCount(CounterType.P1P1)), new ManaCostsImpl("{2}{R}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/FerventCathar.java b/Mage.Sets/src/mage/sets/avacynrestored/FerventCathar.java index 8c60ea30e78..ef5d1b4a691 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/FerventCathar.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/FerventCathar.java @@ -59,7 +59,7 @@ public class FerventCathar extends CardImpl { // When Fervent Cathar enters the battlefield, target creature can't block this turn. Ability ability = new EntersBattlefieldTriggeredAbility(new CantBlockTargetEffect(Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/GallowsAtWillowHill.java b/Mage.Sets/src/mage/sets/avacynrestored/GallowsAtWillowHill.java index 114390ff3fd..1b7ace061d2 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/GallowsAtWillowHill.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/GallowsAtWillowHill.java @@ -72,7 +72,7 @@ public class GallowsAtWillowHill extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GallowsAtWillowHillEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledPermanent(3, 3, humanFilter, false))); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/GhostlyTouch.java b/Mage.Sets/src/mage/sets/avacynrestored/GhostlyTouch.java index 2fa12aac9e4..b8fbca8cfb2 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/GhostlyTouch.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/GhostlyTouch.java @@ -56,7 +56,7 @@ public class GhostlyTouch extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); @@ -64,7 +64,7 @@ public class GhostlyTouch extends CardImpl { // Enchanted creature has "Whenever this creature attacks, you may tap or untap target permanent." Ability gainedAbility = new AttacksTriggeredAbility(new MayTapOrUntapTargetEffect(), true); - gainedAbility.addTarget(new TargetPermanent(true)); + gainedAbility.addTarget(new TargetPermanent()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Ghoulflesh.java b/Mage.Sets/src/mage/sets/avacynrestored/Ghoulflesh.java index 548febb3950..03a871d3bfa 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Ghoulflesh.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Ghoulflesh.java @@ -54,7 +54,7 @@ public class Ghoulflesh extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/GraveExchange.java b/Mage.Sets/src/mage/sets/avacynrestored/GraveExchange.java index 0237d8949fd..0a5c13750f3 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/GraveExchange.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/GraveExchange.java @@ -64,7 +64,7 @@ public class GraveExchange extends CardImpl { this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(filter)); // Target player sacrifices a creature. this.getSpellAbility().addEffect(new GraveExchangeEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public GraveExchange(final GraveExchange card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Grounded.java b/Mage.Sets/src/mage/sets/avacynrestored/Grounded.java index 3bf2052ba0b..ee8b9d2952b 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Grounded.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Grounded.java @@ -53,7 +53,7 @@ public class Grounded extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.LoseAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/GuiseOfFire.java b/Mage.Sets/src/mage/sets/avacynrestored/GuiseOfFire.java index 8fa434c3d73..cca15f4cf6b 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/GuiseOfFire.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/GuiseOfFire.java @@ -54,7 +54,7 @@ public class GuiseOfFire extends CardImpl { this.color.setRed(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/HavengulSkaab.java b/Mage.Sets/src/mage/sets/avacynrestored/HavengulSkaab.java index 91d0dfc844c..df11c0238e5 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/HavengulSkaab.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/HavengulSkaab.java @@ -93,7 +93,7 @@ class HavengulSkaabAbility extends TriggeredAbilityImpl { @Override public boolean checkTrigger(GameEvent event, Game game) { if (event.getType() == GameEvent.EventType.ATTACKER_DECLARED && event.getSourceId().equals(this.getSourceId())) { - TargetControlledCreaturePermanent target = new TargetControlledCreaturePermanent(1, 1, filter, false, true); + TargetControlledCreaturePermanent target = new TargetControlledCreaturePermanent(1, 1, filter, false); this.addTarget(target); return true; } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/HolyJusticiar.java b/Mage.Sets/src/mage/sets/avacynrestored/HolyJusticiar.java index 60a3b55116c..784d262fef6 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/HolyJusticiar.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/HolyJusticiar.java @@ -62,7 +62,7 @@ public class HolyJusticiar extends CardImpl { // {2}{W}, {tap}: Tap target creature. If that creature is a Zombie, exile it. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HolyJusticiarEffect(), new ManaCostsImpl("{2}{W}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/HumanFrailty.java b/Mage.Sets/src/mage/sets/avacynrestored/HumanFrailty.java index 8dd1e8e5e06..0f78f7644e3 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/HumanFrailty.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/HumanFrailty.java @@ -55,7 +55,7 @@ public class HumanFrailty extends CardImpl { this.color.setBlack(true); // Destroy target Human creature. - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/InfiniteReflection.java b/Mage.Sets/src/mage/sets/avacynrestored/InfiniteReflection.java index d52401b88ee..1043f6cee35 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/InfiniteReflection.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/InfiniteReflection.java @@ -63,7 +63,7 @@ public class InfiniteReflection extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Copy)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/JointAssault.java b/Mage.Sets/src/mage/sets/avacynrestored/JointAssault.java index 65268da0caa..103f57f2bf0 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/JointAssault.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/JointAssault.java @@ -55,7 +55,7 @@ public class JointAssault extends CardImpl { // Target creature gets +2/+2 until end of turn. If it's paired with a creature, that creature also gets +2/+2 until end of turn. this.getSpellAbility().addEffect(new JointAssaultBoostTargetEffect(2, 2, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public JointAssault(final JointAssault card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/KessigMalcontents.java b/Mage.Sets/src/mage/sets/avacynrestored/KessigMalcontents.java index 86ac27b5f91..ba9a835a0e1 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/KessigMalcontents.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/KessigMalcontents.java @@ -64,7 +64,7 @@ public class KessigMalcontents extends CardImpl { // When Kessig Malcontents enters the battlefield, it deals damage to target player equal to the number of Humans you control. Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter))); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/LeapOfFaith.java b/Mage.Sets/src/mage/sets/avacynrestored/LeapOfFaith.java index d0dfe840407..916b4378cda 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/LeapOfFaith.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/LeapOfFaith.java @@ -53,7 +53,7 @@ public class LeapOfFaith extends CardImpl { // Target creature gains flying until end of turn. Prevent all damage that would be dealt to that creature this turn. this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, Integer.MAX_VALUE)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public LeapOfFaith(final LeapOfFaith card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/LightningProwess.java b/Mage.Sets/src/mage/sets/avacynrestored/LightningProwess.java index 333af89637e..349a152bc13 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/LightningProwess.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/LightningProwess.java @@ -58,7 +58,7 @@ public class LightningProwess extends CardImpl { this.color.setRed(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/MaliciousIntent.java b/Mage.Sets/src/mage/sets/avacynrestored/MaliciousIntent.java index 08cdf8e552c..e6da786d898 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/MaliciousIntent.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/MaliciousIntent.java @@ -57,7 +57,7 @@ public class MaliciousIntent extends CardImpl { this.color.setRed(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); @@ -65,7 +65,7 @@ public class MaliciousIntent extends CardImpl { // Enchanted creature has "{tap}: Target creature can't block this turn." Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBlockTargetEffect(Duration.EndOfTurn), new TapSourceCost()); - gainedAbility.addTarget(new TargetCreaturePermanent(true)); + gainedAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/MentalAgony.java b/Mage.Sets/src/mage/sets/avacynrestored/MentalAgony.java index 4f5321265d1..9a06701d6b2 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/MentalAgony.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/MentalAgony.java @@ -50,7 +50,7 @@ public class MentalAgony extends CardImpl { // Target player discards two cards and loses 2 life. this.getSpellAbility().addEffect(new DiscardTargetEffect(2)); this.getSpellAbility().addEffect(new LoseLifeTargetEffect(2)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public MentalAgony(final MentalAgony card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/MidvastProtector.java b/Mage.Sets/src/mage/sets/avacynrestored/MidvastProtector.java index 84d190311c8..b252857dfd8 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/MidvastProtector.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/MidvastProtector.java @@ -57,7 +57,7 @@ public class MidvastProtector extends CardImpl { // When Midvast Protector enters the battlefield, target creature you control gains protection from the color of your choice until end of turn. EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new GainProtectionFromColorTargetEffect(Duration.EndOfTurn), false); - ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); ability.addChoice(new ChoiceColor()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/MistRaven.java b/Mage.Sets/src/mage/sets/avacynrestored/MistRaven.java index e2e7b5b6757..bca7cdcde19 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/MistRaven.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/MistRaven.java @@ -58,7 +58,7 @@ public class MistRaven extends CardImpl { // When Mist Raven enters the battlefield, return target creature to its owner's hand. Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/NaturalEnd.java b/Mage.Sets/src/mage/sets/avacynrestored/NaturalEnd.java index 7c76f32f355..17dd347ad02 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/NaturalEnd.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/NaturalEnd.java @@ -61,7 +61,7 @@ public class NaturalEnd extends CardImpl { // Destroy target artifact or enchantment. You gain 3 life. this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new GainLifeEffect(3)); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); } public NaturalEnd(final NaturalEnd card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Necrobite.java b/Mage.Sets/src/mage/sets/avacynrestored/Necrobite.java index 465cdfbd0b1..b3ed2ee5145 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Necrobite.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Necrobite.java @@ -54,7 +54,7 @@ public class Necrobite extends CardImpl { // Target creature gains deathtouch until end of turn. Regenerate it. this.getSpellAbility().addEffect(new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addEffect(new RegenerateTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public Necrobite(final Necrobite card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/NephaliaSmuggler.java b/Mage.Sets/src/mage/sets/avacynrestored/NephaliaSmuggler.java index 408ad151bee..a99bb63730f 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/NephaliaSmuggler.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/NephaliaSmuggler.java @@ -61,7 +61,7 @@ public class NephaliaSmuggler extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetForSourceEffect("Exile Nephalia Smuggler"), new ManaCostsImpl("{3}{U}")); ability.addCost(new TapSourceCost()); ability.addEffect(new ReturnToBattlefieldUnderYourControlTargetEffect()); - ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/PeelFromReality.java b/Mage.Sets/src/mage/sets/avacynrestored/PeelFromReality.java index 855782633d5..211412aac36 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/PeelFromReality.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/PeelFromReality.java @@ -63,8 +63,8 @@ public class PeelFromReality extends CardImpl { // Return target creature you control and target creature you don't control to their owners' hands. this.getSpellAbility().addEffect(new PeelFromRealityEffect()); - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); } public PeelFromReality(final PeelFromReality card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/PredatorsGambit.java b/Mage.Sets/src/mage/sets/avacynrestored/PredatorsGambit.java index 2262978b58c..306e6978b9a 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/PredatorsGambit.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/PredatorsGambit.java @@ -59,7 +59,7 @@ public class PredatorsGambit extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/RestorationAngel.java b/Mage.Sets/src/mage/sets/avacynrestored/RestorationAngel.java index 03418a9d7b8..89a667da264 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/RestorationAngel.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/RestorationAngel.java @@ -75,7 +75,7 @@ public class RestorationAngel extends CardImpl { // When Restoration Angel enters the battlefield, you may exile target non-Angel creature you control, then return that card to the battlefield under your control Ability ability = new EntersBattlefieldTriggeredAbility(new RestorationAngelEffect(), true); - ability.addTarget(new TargetControlledCreaturePermanent(1, 1, filter, false, true)); + ability.addTarget(new TargetControlledCreaturePermanent(1, 1, filter, false)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/RevengeOfTheHunted.java b/Mage.Sets/src/mage/sets/avacynrestored/RevengeOfTheHunted.java index 8d2398cb5c6..9364ac48e6b 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/RevengeOfTheHunted.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/RevengeOfTheHunted.java @@ -58,7 +58,7 @@ public class RevengeOfTheHunted extends CardImpl { this.color.setGreen(true); // Until end of turn, target creature gets +6/+6 and gains trample, and all creatures able to block it this turn do so. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(6, 6, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); Effect effect = new MustBeBlockedByAllTargetEffect(Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/RotcrownGhoul.java b/Mage.Sets/src/mage/sets/avacynrestored/RotcrownGhoul.java index 1786907b1b3..88cb4533833 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/RotcrownGhoul.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/RotcrownGhoul.java @@ -54,7 +54,7 @@ public class RotcrownGhoul extends CardImpl { // When Rotcrown Ghoul dies, target player puts the top five cards of his or her library into his or her graveyard. Ability ability = new DiesTriggeredAbility(new PutLibraryIntoGraveTargetEffect(5)); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/RushOfBlood.java b/Mage.Sets/src/mage/sets/avacynrestored/RushOfBlood.java index 050d87c046c..64201525e90 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/RushOfBlood.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/RushOfBlood.java @@ -51,7 +51,7 @@ public class RushOfBlood extends CardImpl { // Target creature gets +X/+0 until end of turn, where X is its power. this.getSpellAbility().addEffect(new BoostTargetEffect(new TargetPermanentPowerCount(), new StaticValue(0), Duration.EndOfTurn, true)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public RushOfBlood(final RushOfBlood card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/ScaldingDevil.java b/Mage.Sets/src/mage/sets/avacynrestored/ScaldingDevil.java index 9068a8106d9..e0fa5a4d7f8 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/ScaldingDevil.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/ScaldingDevil.java @@ -57,7 +57,7 @@ public class ScaldingDevil extends CardImpl { // {2}{R}: Scalding Devil deals 1 damage to target player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{2}{R}")); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/ScrollOfGriselbrand.java b/Mage.Sets/src/mage/sets/avacynrestored/ScrollOfGriselbrand.java index 1d70956870a..0fcbb157607 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/ScrollOfGriselbrand.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/ScrollOfGriselbrand.java @@ -64,7 +64,7 @@ public class ScrollOfGriselbrand extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new GenericManaCost(1)); ability.addCost(new SacrificeSourceCost()); ability.addEffect(new ConditionalOneShotEffect(new LoseLifeTargetEffect(3), new ControlsPermanentCondition(filter), "If you control a Demon, that player loses 3 life")); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/ShelteringWord.java b/Mage.Sets/src/mage/sets/avacynrestored/ShelteringWord.java index b2f7a497cab..c02f7434b71 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/ShelteringWord.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/ShelteringWord.java @@ -57,7 +57,7 @@ public class ShelteringWord extends CardImpl { // Target creature you control gains hexproof until end of turn. You gain life equal to that creature's toughness. this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HexproofAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addEffect(new ShelteringWordEffect()); - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); } public ShelteringWord(final ShelteringWord card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/SlayersStronghold.java b/Mage.Sets/src/mage/sets/avacynrestored/SlayersStronghold.java index 155be216bb1..86cb715d3ac 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/SlayersStronghold.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/SlayersStronghold.java @@ -62,7 +62,7 @@ public class SlayersStronghold extends CardImpl { ability.addEffect(new GainAbilityTargetEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn)); ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/SnareTheSkies.java b/Mage.Sets/src/mage/sets/avacynrestored/SnareTheSkies.java index c50b3f17077..0e6c283edff 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/SnareTheSkies.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/SnareTheSkies.java @@ -53,7 +53,7 @@ public class SnareTheSkies extends CardImpl { // Target creature gets +1/+1 and gains reach until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(1, 1, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(ReachAbility.getInstance(), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public SnareTheSkies(final SnareTheSkies card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/SpectralPrison.java b/Mage.Sets/src/mage/sets/avacynrestored/SpectralPrison.java index 5027251242a..9e85cf66eaf 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/SpectralPrison.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/SpectralPrison.java @@ -63,7 +63,7 @@ public class SpectralPrison extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/SpiritAway.java b/Mage.Sets/src/mage/sets/avacynrestored/SpiritAway.java index ec01c80733b..78b270e80f5 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/SpiritAway.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/SpiritAway.java @@ -57,7 +57,7 @@ public class SpiritAway extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/SternMentor.java b/Mage.Sets/src/mage/sets/avacynrestored/SternMentor.java index c50dcc4598d..e22cd632590 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/SternMentor.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/SternMentor.java @@ -65,7 +65,7 @@ public class SternMentor extends CardImpl { // As long as Stern Mentor is paired with another creature, each of those creatures has "{t}: Target player puts the top two cards of his or her library into his or her graveyard." Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(2), new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(ability, ruleText))); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/StolenGoods.java b/Mage.Sets/src/mage/sets/avacynrestored/StolenGoods.java index 72fe586b88a..de872b835af 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/StolenGoods.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/StolenGoods.java @@ -55,7 +55,7 @@ public class StolenGoods extends CardImpl { // Target opponent exiles cards from the top of his or her library until he or she exiles a nonland card. Until end of turn, you may cast that card without paying its mana cost. this.getSpellAbility().addEffect(new StolenGoodsEffect()); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); } public StolenGoods(final StolenGoods card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/TamiyoTheMoonSage.java b/Mage.Sets/src/mage/sets/avacynrestored/TamiyoTheMoonSage.java index 7f3f0290475..0e8bbaa9550 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/TamiyoTheMoonSage.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/TamiyoTheMoonSage.java @@ -80,14 +80,14 @@ public class TamiyoTheMoonSage extends CardImpl { // +1: Tap target permanent. It doesn't untap during its controller's next untap step. LoyaltyAbility ability = new LoyaltyAbility(new TapTargetEffect(), 1); ability.addEffect(new SkipNextUntapTargetEffect()); - Target target = new TargetPermanent(true); + Target target = new TargetPermanent(); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); // -2: Draw a card for each tapped creature target player controls. ability = new LoyaltyAbility(new DrawCardSourceControllerEffect(new TappedCreaturesControlledByTargetCount()), -2); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); // -8: You get an emblem with "You have no maximum hand size" and "Whenever a card is put into your graveyard from anywhere, you may return it to your hand." diff --git a/Mage.Sets/src/mage/sets/avacynrestored/TerrifyingPresence.java b/Mage.Sets/src/mage/sets/avacynrestored/TerrifyingPresence.java index 7c9828c99aa..428726212f4 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/TerrifyingPresence.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/TerrifyingPresence.java @@ -52,7 +52,7 @@ public class TerrifyingPresence extends CardImpl { // Prevent all combat damage that would be dealt by creatures other than target creature this turn. this.getSpellAbility().addEffect(new TerrifyingPresenceEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public TerrifyingPresence(final TerrifyingPresence card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Thunderbolt.java b/Mage.Sets/src/mage/sets/avacynrestored/Thunderbolt.java index 7492fd0446f..b4062ef773e 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Thunderbolt.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Thunderbolt.java @@ -59,10 +59,10 @@ public class Thunderbolt extends CardImpl { // Choose one - Thunderbolt deals 3 damage to target player; or Thunderbolt deals 4 damage to target creature with flying. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); Mode mode = new Mode(); mode.getEffects().add(new DamageTargetEffect(4)); - mode.getTargets().add(new TargetCreaturePermanent(filter, true)); + mode.getTargets().add(new TargetCreaturePermanent(filter)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/TibaltTheFiendBlooded.java b/Mage.Sets/src/mage/sets/avacynrestored/TibaltTheFiendBlooded.java index 1a300261440..6948b5760f0 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/TibaltTheFiendBlooded.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/TibaltTheFiendBlooded.java @@ -83,7 +83,7 @@ public class TibaltTheFiendBlooded extends CardImpl { // -4: Tibalt, the Fiend-Blooded deals damage equal to the number of cards in target player's hand to that player. //effect = ability = new LoyaltyAbility(new DamageTargetEffect(new CardsInTargetHandCount(), true, "that player"), -4); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); // -6: Gain control of all creatures until end of turn. Untap them. They gain haste until end of turn. this.addAbility(new LoyaltyAbility(new TibaltTheFiendBloodedThirdEffect(), -6)); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/TimberlandGuide.java b/Mage.Sets/src/mage/sets/avacynrestored/TimberlandGuide.java index 0b59149bfa2..2a44b0a48e5 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/TimberlandGuide.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/TimberlandGuide.java @@ -56,7 +56,7 @@ public class TimberlandGuide extends CardImpl { // When Timberland Guide enters the battlefield, put a +1/+1 counter on target creature. Ability ability = new EntersBattlefieldTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance())); - TargetCreaturePermanent target = new TargetCreaturePermanent(true); + TargetCreaturePermanent target = new TargetCreaturePermanent(); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/TreacherousPitDweller.java b/Mage.Sets/src/mage/sets/avacynrestored/TreacherousPitDweller.java index 2ba98052a9f..8d7b923b578 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/TreacherousPitDweller.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/TreacherousPitDweller.java @@ -78,7 +78,7 @@ class TreacherousPitDwellerTriggeredAbility extends ZoneChangeTriggeredAbility { public TreacherousPitDwellerTriggeredAbility() { super(Zone.GRAVEYARD, Zone.BATTLEFIELD, new TreacherousPitDwellerEffect(), ruleText, false); zone = Zone.BATTLEFIELD; - addTarget(new TargetOpponent(true)); + addTarget(new TargetOpponent()); } public TreacherousPitDwellerTriggeredAbility(final TreacherousPitDwellerTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/TriumphOfCruelty.java b/Mage.Sets/src/mage/sets/avacynrestored/TriumphOfCruelty.java index e6820340f94..0ad8ce356a0 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/TriumphOfCruelty.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/TriumphOfCruelty.java @@ -57,7 +57,7 @@ public class TriumphOfCruelty extends CardImpl { // At the beginning of your upkeep, target opponent discards a card if you control the creature with the greatest power or tied for the greatest power. TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new DiscardTargetEffect(1), TargetController.YOU, false); - Target target = new TargetOpponent(true); + Target target = new TargetOpponent(); target.setRequired(true); ability.addTarget(target); this.addAbility(new ConditionalTriggeredAbility(ability, ControlsBiggestOrTiedCreatureCondition.getInstance(), ruleText)); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/TyrantOfDiscord.java b/Mage.Sets/src/mage/sets/avacynrestored/TyrantOfDiscord.java index 4a3b6d84822..d33b7cd2677 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/TyrantOfDiscord.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/TyrantOfDiscord.java @@ -59,7 +59,7 @@ public class TyrantOfDiscord extends CardImpl { // When Tyrant of Discord enters the battlefield, target opponent chooses a permanent he or she controls at random and sacrifices it. If a nonland permanent is sacrificed this way, repeat this process. Ability ability = new EntersBattlefieldTriggeredAbility(new TyrantOfDiscordEffect()); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/UlvenwaldTracker.java b/Mage.Sets/src/mage/sets/avacynrestored/UlvenwaldTracker.java index afd1ac3f23a..e8a5225a5fe 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/UlvenwaldTracker.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/UlvenwaldTracker.java @@ -61,8 +61,8 @@ public class UlvenwaldTracker extends CardImpl { // {1}{G}, {tap}: Target creature you control fights another target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new FightTargetsEffect(), new ManaCostsImpl("{1}{G}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetControlledCreaturePermanent(true)); - ability.addTarget(new TargetOtherCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); + ability.addTarget(new TargetOtherCreaturePermanent()); this.addAbility(ability); } @@ -76,9 +76,9 @@ public class UlvenwaldTracker extends CardImpl { } } class TargetOtherCreaturePermanent extends TargetCreaturePermanent { - - public TargetOtherCreaturePermanent(boolean required) { - super(true); + + public TargetOtherCreaturePermanent() { + super(); } public TargetOtherCreaturePermanent(final TargetOtherCreaturePermanent target) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/UncannySpeed.java b/Mage.Sets/src/mage/sets/avacynrestored/UncannySpeed.java index a63aad9a236..0257c41c89d 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/UncannySpeed.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/UncannySpeed.java @@ -52,7 +52,7 @@ public class UncannySpeed extends CardImpl { // Target creature gets +3/+0 and gains haste until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(3, 0, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public UncannySpeed(final UncannySpeed card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/UndeadExecutioner.java b/Mage.Sets/src/mage/sets/avacynrestored/UndeadExecutioner.java index 148358f5c1e..7181cb6c5a4 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/UndeadExecutioner.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/UndeadExecutioner.java @@ -57,7 +57,7 @@ public class UndeadExecutioner extends CardImpl { // When Undead Executioner dies, you may have target creature get -2/-2 until end of turn. Ability ability = new DiesTriggeredAbility(new BoostTargetEffect(-2, -2, Duration.EndOfTurn), true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/UnhallowedPact.java b/Mage.Sets/src/mage/sets/avacynrestored/UnhallowedPact.java index 0210ff0104d..1a4f885faba 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/UnhallowedPact.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/UnhallowedPact.java @@ -54,7 +54,7 @@ public class UnhallowedPact extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/ZealousConscripts.java b/Mage.Sets/src/mage/sets/avacynrestored/ZealousConscripts.java index 97707367934..290f21ca483 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/ZealousConscripts.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/ZealousConscripts.java @@ -61,7 +61,7 @@ public class ZealousConscripts extends CardImpl { this.addAbility(HasteAbility.getInstance()); // When Zealous Conscripts enters the battlefield, gain control of target permanent until end of turn. Untap that permanent. It gains haste until end of turn. Ability ability = new EntersBattlefieldTriggeredAbility(new GainControlTargetEffect(Duration.EndOfTurn)); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); ability.addEffect(new UntapTargetEffect()); ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn, "It gains haste until end of turn")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/ZealousStrike.java b/Mage.Sets/src/mage/sets/avacynrestored/ZealousStrike.java index b98eca442e6..7f4ea178955 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/ZealousStrike.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/ZealousStrike.java @@ -53,7 +53,7 @@ public class ZealousStrike extends CardImpl { // Target creature gets +2/+2 and gains first strike until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public ZealousStrike(final ZealousStrike card) { diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BileUrchin.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BileUrchin.java index 484703c4ed0..94bf4c2b982 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BileUrchin.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BileUrchin.java @@ -55,7 +55,7 @@ public class BileUrchin extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Bile Urchin: Target player loses 1 life. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new SacrificeSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlazingShoal.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlazingShoal.java index bb588379e7d..b558b36793b 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlazingShoal.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlazingShoal.java @@ -65,7 +65,7 @@ public class BlazingShoal extends CardImpl { // Target creature gets +X/+0 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(new ExileFromHandCostCardConvertedMana(), new StaticValue(0), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public BlazingShoal(final BlazingShoal card) { diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlessingOfLeeches.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlessingOfLeeches.java index 079a134210a..7d4e89e4722 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlessingOfLeeches.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlessingOfLeeches.java @@ -58,7 +58,7 @@ public class BlessingOfLeeches extends CardImpl { this.addAbility(FlashAbility.getInstance()); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Regenerate)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BudokaPupil.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BudokaPupil.java index 811da8ec53d..65c2488a1fc 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BudokaPupil.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BudokaPupil.java @@ -110,7 +110,7 @@ class IchigaWhoTopplesOaks extends Token { Zone.BATTLEFIELD, new BoostTargetEffect(2,2, Duration.EndOfTurn), new RemoveCountersSourceCost(CounterType.KI.createInstance())); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ChildOfThorns.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ChildOfThorns.java index 4bfba72d1c0..ad3fc9d5ffa 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ChildOfThorns.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ChildOfThorns.java @@ -56,7 +56,7 @@ public class ChildOfThorns extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Child of Thorns: Target creature gets +1/+1 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/CunningBandit.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/CunningBandit.java index ac2dd5d7072..f45a71791a2 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/CunningBandit.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/CunningBandit.java @@ -106,7 +106,7 @@ class AzamukiTreacheryIncarnate extends Token { Zone.BATTLEFIELD, new GainControlTargetEffect(Duration.EndOfTurn), new RemoveCountersSourceCost(CounterType.KI.createInstance())); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Eradicate.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Eradicate.java index ac8c6a35a92..f01659db324 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Eradicate.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Eradicate.java @@ -57,7 +57,7 @@ public class Eradicate extends CardImpl { // Exile target nonblack creature. Search its controller's graveyard, hand, and library for all cards // with the same name as that creature and exile them. Then that player shuffles his or her library. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new ExileTargetAndSearchGraveyardHandLibraryEffect(false, "its controller's","all cards with the same name as that creature")); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/FaithfulSquire.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/FaithfulSquire.java index bb2ec30a5bf..09df36179a9 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/FaithfulSquire.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/FaithfulSquire.java @@ -112,7 +112,7 @@ class KaisoMemoryOfLoyalty extends Token { Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, Integer.MAX_VALUE), new RemoveCountersSourceCost(CounterType.KI.createInstance())); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/FirstVolley.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/FirstVolley.java index 3533f4b4ad5..cdb81249232 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/FirstVolley.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/FirstVolley.java @@ -53,7 +53,7 @@ public class FirstVolley extends CardImpl { // First Volley deals 1 damage to target creature and 1 damage to that creature's controller. this.getSpellAbility().addEffect(new FirstVolleyEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/FlamesOfTheBloodHand.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/FlamesOfTheBloodHand.java index 64059ceb179..04e3903cb15 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/FlamesOfTheBloodHand.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/FlamesOfTheBloodHand.java @@ -55,7 +55,7 @@ public class FlamesOfTheBloodHand extends CardImpl { Effect effect = new CantGainLifeTargetEffect(Duration.EndOfTurn); effect.setText("If that player would gain life this turn, that player gains no life instead"); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public FlamesOfTheBloodHand(final FlamesOfTheBloodHand card) { diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Frostling.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Frostling.java index a49714f6f50..2808f7b26fa 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Frostling.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Frostling.java @@ -55,7 +55,7 @@ public class Frostling extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Frostling: Frostling deals 1 damage to target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GoryosVengeance.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GoryosVengeance.java index d3fc57315e8..322be918199 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GoryosVengeance.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GoryosVengeance.java @@ -74,7 +74,7 @@ public class GoryosVengeance extends CardImpl { // Return target legendary creature card from your graveyard to the battlefield. That creature gains haste. Exile it at the beginning of the next end step. this.getSpellAbility().addEffect(new GoryosVengeanceEffect()); - this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(filter, true)); + this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(filter)); // Splice onto Arcane {2}{B} this.addAbility(new SpliceOntoArcaneAbility("{2}{B}")); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HeartOfLight.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HeartOfLight.java index bcded4302d4..0e8174ac27b 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HeartOfLight.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HeartOfLight.java @@ -59,7 +59,7 @@ public class HeartOfLight extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HerosDemise.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HerosDemise.java index b9c4552e6a9..63d3492bb1c 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HerosDemise.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HerosDemise.java @@ -54,7 +54,7 @@ public class HerosDemise extends CardImpl { this.color.setBlack(true); // Destroy target legendary creature. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); } public HerosDemise(final HerosDemise card) { diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HiredMuscle.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HiredMuscle.java index 26999d3d2ff..187cb67cc1d 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HiredMuscle.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HiredMuscle.java @@ -107,7 +107,7 @@ class Scarmaker extends Token { Zone.BATTLEFIELD, new GainAbilityTargetEffect(FearAbility.getInstance(), Duration.EndOfTurn), new RemoveCountersSourceCost(CounterType.KI.createInstance())); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HundredTalonStrike.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HundredTalonStrike.java index 7003feea308..49ecadc7115 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HundredTalonStrike.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HundredTalonStrike.java @@ -72,7 +72,7 @@ public class HundredTalonStrike extends CardImpl { effect.setText("and gains first strike until end of turn"); this.getSpellAbility().addEffect(effect); // Splice onto Arcane-Tap an untapped white creature you control. - this.addAbility(new SpliceOntoArcaneAbility(new TapTargetCost(new TargetControlledCreaturePermanent(1,1,filter,false,true)))); + this.addAbility(new SpliceOntoArcaneAbility(new TapTargetCost(new TargetControlledCreaturePermanent(1,1,filter,false)))); } public HundredTalonStrike(final HundredTalonStrike card) { diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/IsaoEnlightenedBushi.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/IsaoEnlightenedBushi.java index f3b1ce4df6f..149e08b5c36 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/IsaoEnlightenedBushi.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/IsaoEnlightenedBushi.java @@ -71,7 +71,7 @@ public class IsaoEnlightenedBushi extends CardImpl { this.addAbility(new BushidoAbility(2)); // {2}: Regenerate target Samurai. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new GenericManaCost(2)); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KumanosBlessing.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KumanosBlessing.java index 0c6c4cb04b2..91ad5d943cb 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KumanosBlessing.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KumanosBlessing.java @@ -69,7 +69,7 @@ public class KumanosBlessing extends CardImpl { // Flash this.addAbility(FlashAbility.getInstance()); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MarkOfTheOni.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MarkOfTheOni.java index ecd66ebbbf0..534880282ce 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MarkOfTheOni.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MarkOfTheOni.java @@ -66,7 +66,7 @@ public class MarkOfTheOni extends CardImpl { this.subtype.add("Aura"); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MinamoSightbender.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MinamoSightbender.java index aa01c99f8dd..84b200cc7fe 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MinamoSightbender.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MinamoSightbender.java @@ -73,7 +73,7 @@ public class MinamoSightbender extends CardImpl { // {X}, {T}: Target creature with power X or less is unblockable this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UnblockableTargetEffect(), new ManaCostsImpl("{X}")); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MistbladeShinobi.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MistbladeShinobi.java index 2effb5f75f5..8a0a1c85425 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MistbladeShinobi.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MistbladeShinobi.java @@ -102,7 +102,7 @@ class MistbladeShinobiTriggeredAbility extends TriggeredAbilityImpl { FilterCreaturePermanent filter = new FilterCreaturePermanent("creature " + opponent.getName() + " controls"); filter.add(new ControllerIdPredicate(opponent.getId())); this.getTargets().clear(); - this.addTarget(new TargetCreaturePermanent(filter, true)); + this.addTarget(new TargetCreaturePermanent(filter)); return true; } } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MoonlitStrider.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MoonlitStrider.java index d2a7255aad2..9e9e447afa6 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MoonlitStrider.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MoonlitStrider.java @@ -60,7 +60,7 @@ public class MoonlitStrider extends CardImpl { // Sacrifice Moonlit Strider: Target creature you control gains protection from the color of your choice until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainProtectionFromColorTargetEffect(Duration.EndOfTurn), new SacrificeSourceCost()); ability.addChoice(new ChoiceColor()); - ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); // Soulshift 3 (When this creature dies, you may return target Spirit card with converted mana cost 3 or less from your graveyard to your hand.) diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/NezumiShadowWatcher.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/NezumiShadowWatcher.java index 54d10884f30..b49c3e92acb 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/NezumiShadowWatcher.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/NezumiShadowWatcher.java @@ -64,7 +64,7 @@ public class NezumiShadowWatcher extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Nezumi Shadow-Watcher: Destroy target Ninja. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/OrnateKanzashi.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/OrnateKanzashi.java index d4a9fb01810..a45fb5b91b8 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/OrnateKanzashi.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/OrnateKanzashi.java @@ -60,7 +60,7 @@ public class OrnateKanzashi extends CardImpl { // {2}, {T}: Target opponent exiles the top card of his or her library. You may play that card this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new OrnateKanzashiEffect(), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Overblaze.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Overblaze.java index 34a364c45cd..0a18b424a36 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Overblaze.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Overblaze.java @@ -57,7 +57,7 @@ public class Overblaze extends CardImpl { // Each time target permanent would deal damage to a creature or player this turn, it deals double that damage to that creature or player instead. this.getSpellAbility().addEffect(new FireServantEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(true)); + this.getSpellAbility().addTarget(new TargetPermanent()); // Splice onto Arcane {2}{R}{R} this.addAbility(new SpliceOntoArcaneAbility("{2}{R}{R}")); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PhantomWings.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PhantomWings.java index a4187cb38b4..c9d997b6d87 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PhantomWings.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PhantomWings.java @@ -63,7 +63,7 @@ public class PhantomWings extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PsychicSpear.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PsychicSpear.java index 1f8e63238e8..55a2e8fe620 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PsychicSpear.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PsychicSpear.java @@ -58,7 +58,7 @@ public class PsychicSpear extends CardImpl { this.color.setBlack(true); // Target player reveals his or her hand. You choose a Spirit or Arcane card from it. That player discards that card. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(filter, TargetController.ANY)); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PusKami.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PusKami.java index 0b9edce6fe2..aef4d1e0f30 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PusKami.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PusKami.java @@ -69,7 +69,7 @@ public class PusKami extends CardImpl { // {B}, Sacrifice Pus Kami: Destroy target nonblack creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); this.addAbility(new SoulshiftAbility(6)); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/QuillmaneBaku.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/QuillmaneBaku.java index 320f79725ee..ca0127b3cc3 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/QuillmaneBaku.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/QuillmaneBaku.java @@ -77,7 +77,7 @@ public class QuillmaneBaku extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new QuillmaneBakuReturnEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveVariableCountersSourceCost(CounterType.KI.createInstance(1))); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } @@ -93,7 +93,7 @@ public class QuillmaneBaku extends CardImpl { ability.getTargets().clear(); FilterCreaturePermanent newFilter = new FilterCreaturePermanent("creature with converted mana cost " + maxConvManaCost + " or less"); newFilter.add(new ConvertedManaCostPredicate(Filter.ComparisonType.LessThan, maxConvManaCost + 1)); - TargetCreaturePermanent target = new TargetCreaturePermanent(newFilter, true); + TargetCreaturePermanent target = new TargetCreaturePermanent(newFilter); ability.getTargets().add(target); } } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/RoninWarclub.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/RoninWarclub.java index 34d1bb26253..6281f011d0c 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/RoninWarclub.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/RoninWarclub.java @@ -61,7 +61,7 @@ public class RoninWarclub extends CardImpl { // Whenever a creature enters the battlefield under your control, attach Ronin Warclub to that creature. Ability ability = new RoninWarclubTriggeredAbility(); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Equip {5} ({5}: Attach to target creature you control. Equip only as a sorcery.) @@ -98,7 +98,7 @@ public class RoninWarclub extends CardImpl { // remove previous target if (this.getTargets().get(0).getTargets().size() > 0) { this.getTargets().clear(); - this.addTarget(new TargetCreaturePermanent(true)); + this.addTarget(new TargetCreaturePermanent()); } Target target = this.getTargets().get(0); if (target instanceof TargetCreaturePermanent) { diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Scour.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Scour.java index 7226fc45653..54f22d069da 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Scour.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Scour.java @@ -55,7 +55,7 @@ public class Scour extends CardImpl { // Exile target enchantment. // Search its controller's graveyard, hand, and library for all cards with the same name as that enchantment and exile them. Then that player shuffles his or her library. - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new ExileTargetAndSearchGraveyardHandLibraryEffect(false, "its controller's","all cards with the same name as that enchantment")); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Shuriken.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Shuriken.java index 388c623647a..beaab6578c6 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Shuriken.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Shuriken.java @@ -68,7 +68,7 @@ public class Shuriken extends CardImpl { // Equipped creature has "{tap}, Unattach Shuriken: Shuriken deals 2 damage to target creature. That creature's controller gains control of Shuriken unless it was unattached from a Ninja." Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShurikenDamageEffect(), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new ShurikenUnattachCost()); ability.addEffect(new ShurikenControlEffect()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.EQUIPMENT, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SickeningShoal.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SickeningShoal.java index 2a097342061..b1b37039fe0 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SickeningShoal.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SickeningShoal.java @@ -67,7 +67,7 @@ public class SickeningShoal extends CardImpl { // Target creature gets -X/-X until end of turn. DynamicValue x = new SignInversionDynamicValue(new ExileFromHandCostCardConvertedMana()); this.getSpellAbility().addEffect(new BoostTargetEffect(x, x, Duration.EndOfTurn, true)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public SickeningShoal(final SickeningShoal card) { diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SkullmaneBaku.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SkullmaneBaku.java index 41683c316a1..147d3e7a8ed 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SkullmaneBaku.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SkullmaneBaku.java @@ -76,7 +76,7 @@ public class SkullmaneBaku extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SkullmaneBakuUnboostEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveVariableCountersSourceCost(CounterType.KI.createInstance(1))); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SoratamiMindsweeper.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SoratamiMindsweeper.java index 5e2cf44678f..291b1fcb3f8 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SoratamiMindsweeper.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SoratamiMindsweeper.java @@ -66,7 +66,7 @@ public class SoratamiMindsweeper extends CardImpl { // {2}, Return a land you control to its owner's hand: Target player puts the top two cards of his or her library into his or her graveyard. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,new PutLibraryIntoGraveTargetEffect(2), new ManaCostsImpl("{2}")); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); ability.addCost(new ReturnToHandTargetCost(new TargetControlledPermanent(filter))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SowingSalt.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SowingSalt.java index bac84f261b1..4319e42cfa2 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SowingSalt.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SowingSalt.java @@ -56,7 +56,7 @@ public class SowingSalt extends CardImpl { // Exile target nonbasic land. Search its controller's graveyard, hand, and library for all cards with // the same name as that land and exile them. Then that player shuffles his or her library. - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new ExileTargetAndSearchGraveyardHandLibraryEffect(false, "its controller's","all cards with the same name as that land")); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Splinter.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Splinter.java index ba09dd04afd..8487a48415d 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Splinter.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Splinter.java @@ -51,7 +51,7 @@ public class Splinter extends CardImpl { // Exile target artifact. Search its controller's graveyard, hand, and library for all cards // with the same name as that artifact and exile them. Then that player shuffles his or her library. - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new ExileTargetAndSearchGraveyardHandLibraryEffect(false, "its controller's","all cards with the same name as that artifact")); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/StreamOfConsciousness.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/StreamOfConsciousness.java index 6918b58a2d9..078a119957c 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/StreamOfConsciousness.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/StreamOfConsciousness.java @@ -57,7 +57,7 @@ public class StreamOfConsciousness extends CardImpl { // Target player shuffles up to four target cards from his or her graveyard into his or her library. this.getSpellAbility().addEffect(new StreamOfConsciousnessEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addTarget(new StreamOfConsciousnessTarget()); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TeardropKami.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TeardropKami.java index 5c3d11c9569..40558e9d0ce 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TeardropKami.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TeardropKami.java @@ -56,7 +56,7 @@ public class TeardropKami extends CardImpl { // Sacrifice Teardrop Kami: You may tap or untap target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,new MayTapOrUntapTargetEffect(), new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisGrasp.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisGrasp.java index c731329d8c1..b512534441b 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisGrasp.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisGrasp.java @@ -65,7 +65,7 @@ public class TerashisGrasp extends CardImpl { this.color.setWhite(true); // Destroy target artifact or enchantment. - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); // You gain life equal to its converted mana cost. this.getSpellAbility().addEffect(new TerashisGraspEffect()); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThatWhichWasTaken.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThatWhichWasTaken.java index 64c052ae67e..0bde0394ef9 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThatWhichWasTaken.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThatWhichWasTaken.java @@ -72,7 +72,7 @@ public class ThatWhichWasTaken extends CardImpl { // {4}, {T}: Put a divinity counter on target permanent other than That Which Was Taken. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.DIVINITY.createInstance()), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); // Each permanent with a divinity counter on it is indestructible. diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreadsOfDisloyalty.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreadsOfDisloyalty.java index de2d930a0f5..a8375ce40ae 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreadsOfDisloyalty.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreadsOfDisloyalty.java @@ -64,7 +64,7 @@ public class ThreadsOfDisloyalty extends CardImpl { this.subtype.add("Aura"); // Enchant creature with converted mana cost 2 or less - TargetPermanent auraTarget = new TargetCreaturePermanent(filter, true); + TargetPermanent auraTarget = new TargetCreaturePermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreeTragedies.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreeTragedies.java index 9b9a73bde32..796bdb38ca6 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreeTragedies.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreeTragedies.java @@ -47,7 +47,7 @@ public class ThreeTragedies extends CardImpl { this.color.setBlack(true); // Target player discards three cards. this.getSpellAbility().addEffect(new DiscardTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public ThreeTragedies(final ThreeTragedies card) { diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThroatSlitter.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThroatSlitter.java index a17ca648c8c..f19f9d5e95e 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThroatSlitter.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThroatSlitter.java @@ -105,7 +105,7 @@ class ThroatSlitterTriggeredAbility extends TriggeredAbilityImpl { filter.add(Predicates.not(new ColorPredicate(ObjectColor.BLACK))); filter.setMessage("nonblack creature controlled by " + game.getPlayer(event.getTargetId()).getName()); this.getTargets().clear(); - this.addTarget(new TargetPermanent(filter, true)); + this.addTarget(new TargetPermanent(filter)); return true; } return false; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TorrentOfStone.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TorrentOfStone.java index b80c0b45670..6c148278bc0 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TorrentOfStone.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TorrentOfStone.java @@ -59,7 +59,7 @@ public class TorrentOfStone extends CardImpl { // Torrent of Stone deals 4 damage to target creature. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Splice onto Arcane-Sacrifice two Mountains. this.addAbility(new SpliceOntoArcaneAbility(new SacrificeTargetCost(new TargetControlledPermanent(2,2, filterSacrifice, false)))); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/UmezawasJitte.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/UmezawasJitte.java index 63bdfe3b3d4..cc18024cadf 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/UmezawasJitte.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/UmezawasJitte.java @@ -67,7 +67,7 @@ public class UmezawasJitte extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2, Duration.EndOfTurn), new RemoveCountersSourceCost(CounterType.CHARGE.createInstance())); Mode mode = new Mode(); mode.getEffects().add(new BoostTargetEffect(-1, -1, Duration.EndOfTurn)); - mode.getTargets().add(new TargetCreaturePermanent(true)); + mode.getTargets().add(new TargetCreaturePermanent()); ability.addMode(mode); mode = new Mode(); mode.getEffects().add(new GainLifeEffect(2)); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/UncheckedGrowth.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/UncheckedGrowth.java index 0c662fea910..7f54f8e8b1b 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/UncheckedGrowth.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/UncheckedGrowth.java @@ -60,7 +60,7 @@ public class UncheckedGrowth extends CardImpl { this.getSpellAbility().addEffect(new BoostTargetEffect(4, 4, Duration.EndOfTurn)); // If it's a Spirit, it gains trample until end of turn. this.getSpellAbility().addEffect(new UncheckedGrowthTrampleEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public UncheckedGrowth(final UncheckedGrowth card) { diff --git a/Mage.Sets/src/mage/sets/bornofthegods/AcolytesReward.java b/Mage.Sets/src/mage/sets/bornofthegods/AcolytesReward.java index 36efe7ab956..8000ce46c03 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/AcolytesReward.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/AcolytesReward.java @@ -57,8 +57,8 @@ public class AcolytesReward extends CardImpl { // Prevent the next X damage that would be dealt to target creature this turn, where X is your devotion to white. If damage is prevented this way, Acolyte's Reward deals that much damage to target creature or player. this.getSpellAbility().addEffect(new AcolytesRewardEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); } public AcolytesReward(final AcolytesReward card) { diff --git a/Mage.Sets/src/mage/sets/bornofthegods/AkroanConscriptor.java b/Mage.Sets/src/mage/sets/bornofthegods/AkroanConscriptor.java index 322d3e7f034..a999efd8ecc 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/AkroanConscriptor.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/AkroanConscriptor.java @@ -74,7 +74,7 @@ public class AkroanConscriptor extends CardImpl { effect = new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn); effect.setText("It gains haste until end of turn"); ability.addEffect(effect); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/bornofthegods/AspectOfHydra.java b/Mage.Sets/src/mage/sets/bornofthegods/AspectOfHydra.java index fb3c75e5db7..fe47180f8de 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/AspectOfHydra.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/AspectOfHydra.java @@ -56,7 +56,7 @@ public class AspectOfHydra extends CardImpl { Effect effect = new BoostTargetEffect(greenDevotion, greenDevotion, Duration.EndOfTurn, true); effect.setText("Target creature gets +X/+X until end of turn, where X is your devotion to green"); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public AspectOfHydra(final AspectOfHydra card) { diff --git a/Mage.Sets/src/mage/sets/bornofthegods/Asphyxiate.java b/Mage.Sets/src/mage/sets/bornofthegods/Asphyxiate.java index f13bb082bdc..38b5e58333a 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/Asphyxiate.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/Asphyxiate.java @@ -57,7 +57,7 @@ public class Asphyxiate extends CardImpl { // Destroy target untapped creature. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter,true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); } public Asphyxiate(final Asphyxiate card) { diff --git a/Mage.Sets/src/mage/sets/bornofthegods/BileBlight.java b/Mage.Sets/src/mage/sets/bornofthegods/BileBlight.java index 45fe9314ccf..3c9972dda6b 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/BileBlight.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/BileBlight.java @@ -55,7 +55,7 @@ public class BileBlight extends CardImpl { // Target creature and all creatures with the same name as that creature get -3/-3 until end of turn. this.getSpellAbility().addEffect(new BileBlightEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public BileBlight(final BileBlight card) { diff --git a/Mage.Sets/src/mage/sets/bornofthegods/BoltOfKeranos.java b/Mage.Sets/src/mage/sets/bornofthegods/BoltOfKeranos.java index 85b2358f6d2..d0189c02dab 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/BoltOfKeranos.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/BoltOfKeranos.java @@ -49,7 +49,7 @@ public class BoltOfKeranos extends CardImpl { // Bolt of Keranos deals 3 damage to target creature and/or player. Scry 1. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); this.getSpellAbility().addEffect(new ScryEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/bornofthegods/ClaimOfErebos.java b/Mage.Sets/src/mage/sets/bornofthegods/ClaimOfErebos.java index b3dffccabc5..934250ac086 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/ClaimOfErebos.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/ClaimOfErebos.java @@ -62,7 +62,7 @@ public class ClaimOfErebos extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); @@ -70,7 +70,7 @@ public class ClaimOfErebos extends CardImpl { // Enchanted creature has "{1}{B}, {T}: Target player loses 2 life." Ability grantedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2), new ManaCostsImpl("{1}{B}")); grantedAbility.addCost(new TapSourceCost()); - grantedAbility.addTarget(new TargetPlayer(true)); + grantedAbility.addTarget(new TargetPlayer()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(grantedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/Crypsis.java b/Mage.Sets/src/mage/sets/bornofthegods/Crypsis.java index 6545d6a3d08..9221ef4207c 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/Crypsis.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/Crypsis.java @@ -66,7 +66,7 @@ public class Crypsis extends CardImpl { Effect effect = new UntapTargetEffect(); effect.setText("Untap it."); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/bornofthegods/CullingMark.java b/Mage.Sets/src/mage/sets/bornofthegods/CullingMark.java index 405adb56f43..2d094256597 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/CullingMark.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/CullingMark.java @@ -52,7 +52,7 @@ public class CullingMark extends CardImpl { // Target creature blocks this turn if able. this.getSpellAbility().addEffect(new BlocksIfAbleTargetEffect(Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public CullingMark(final CullingMark card) { diff --git a/Mage.Sets/src/mage/sets/bornofthegods/DawnToDusk.java b/Mage.Sets/src/mage/sets/bornofthegods/DawnToDusk.java index 41dfeb070c6..037b19ab328 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/DawnToDusk.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/DawnToDusk.java @@ -70,7 +70,7 @@ public class DawnToDusk extends CardImpl { // and/or destroy target enchantment. Mode mode = new Mode(); mode.getEffects().add(new DestroyTargetEffect()); - mode.getTargets().add(new TargetPermanent(filter, true)); + mode.getTargets().add(new TargetPermanent(filter)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/sets/bornofthegods/DeepwaterHypnotist.java b/Mage.Sets/src/mage/sets/bornofthegods/DeepwaterHypnotist.java index eb2346f37a0..1cd7eb69cf1 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/DeepwaterHypnotist.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/DeepwaterHypnotist.java @@ -66,7 +66,7 @@ public class DeepwaterHypnotist extends CardImpl { // Inspired - Whenever Deepwater Hypnotist becomes untapped, target creature an opponent controls gets -3/-0 until end of turn. Ability ability = new InspiredAbility(new BoostTargetEffect(-3,0,Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/bornofthegods/EaterOfHope.java b/Mage.Sets/src/mage/sets/bornofthegods/EaterOfHope.java index 5e51ad73b7e..abf998066ee 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/EaterOfHope.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/EaterOfHope.java @@ -73,13 +73,13 @@ public class EaterOfHope extends CardImpl { // {B}, Sacrifice another creature: Regenerate Eater of Hope. Ability regenAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}")); - regenAbility.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, regenFilter, true, true))); + regenAbility.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, regenFilter, true))); this.addAbility(regenAbility); // {2}{B}, Sacrifice two other creatures: Destroy target creature. Ability destroyAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{2}{B}")); - destroyAbility.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(2, 2, destroyFilter, true, true))); - destroyAbility.addTarget(new TargetCreaturePermanent(true)); + destroyAbility.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(2, 2, destroyFilter, true))); + destroyAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(destroyAbility); } diff --git a/Mage.Sets/src/mage/sets/bornofthegods/EliteSkirmisher.java b/Mage.Sets/src/mage/sets/bornofthegods/EliteSkirmisher.java index 0e03c6138bd..2bdc43cd398 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/EliteSkirmisher.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/EliteSkirmisher.java @@ -55,7 +55,7 @@ public class EliteSkirmisher extends CardImpl { // Heroic - Whenever you cast a spell that targets Elite Skirmisher, you may tap target creature. Ability ability = new HeroicAbility(new TapTargetEffect(), true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/bornofthegods/EpharasEnlightenment.java b/Mage.Sets/src/mage/sets/bornofthegods/EpharasEnlightenment.java index af8f10b4662..daeeda1505b 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/EpharasEnlightenment.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/EpharasEnlightenment.java @@ -64,7 +64,7 @@ public class EpharasEnlightenment extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/EpharasRadiance.java b/Mage.Sets/src/mage/sets/bornofthegods/EpharasRadiance.java index 1dfea70eb78..8c2d765d1f4 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/EpharasRadiance.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/EpharasRadiance.java @@ -61,7 +61,7 @@ public class EpharasRadiance extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/EpiphanyStorm.java b/Mage.Sets/src/mage/sets/bornofthegods/EpiphanyStorm.java index 3711a922b6e..687e6d431e7 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/EpiphanyStorm.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/EpiphanyStorm.java @@ -61,7 +61,7 @@ public class EpiphanyStorm extends CardImpl { this.color.setRed(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/EvanescentIntellect.java b/Mage.Sets/src/mage/sets/bornofthegods/EvanescentIntellect.java index 325f219d269..6b1037c8adb 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/EvanescentIntellect.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/EvanescentIntellect.java @@ -62,7 +62,7 @@ public class EvanescentIntellect extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); @@ -70,7 +70,7 @@ public class EvanescentIntellect extends CardImpl { // Enchanted creature has "{1}{U}, {T}: Target player puts the top three cards of his or her library into his or her graveyard." ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutTopCardOfLibraryIntoGraveTargetEffect(3), new ManaCostsImpl("{1}{U}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.AURA, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/sets/bornofthegods/Excoriate.java b/Mage.Sets/src/mage/sets/bornofthegods/Excoriate.java index 866288bd339..e7808ad9a9e 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/Excoriate.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/Excoriate.java @@ -56,7 +56,7 @@ public class Excoriate extends CardImpl { // Exile target tapped creature. this.getSpellAbility().addEffect(new ExileTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); } public Excoriate(final Excoriate card) { diff --git a/Mage.Sets/src/mage/sets/bornofthegods/EyeGouge.java b/Mage.Sets/src/mage/sets/bornofthegods/EyeGouge.java index 13bee9d0ab4..001db635e65 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/EyeGouge.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/EyeGouge.java @@ -53,7 +53,7 @@ public class EyeGouge extends CardImpl { // Target creature gets -1/-1 until end of turn. If it's a Cyclops, destroy it. this.getSpellAbility().addEffect(new BoostTargetEffect(-1,-1, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); Effect effect = new ConditionalOneShotEffect(new DestroyTargetEffect(), new TargetHasSubtypeCondition("Cyclops"), "If it's a Cyclops, destroy it"); this.getSpellAbility().addEffect(effect); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/FallOfTheHammer.java b/Mage.Sets/src/mage/sets/bornofthegods/FallOfTheHammer.java index 4c48b7f276c..afc0596e95c 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/FallOfTheHammer.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/FallOfTheHammer.java @@ -69,8 +69,8 @@ public class FallOfTheHammer extends CardImpl { // Target creature you control deals damage equal to its power to another target creature. this.getSpellAbility().addEffect(new FallOfTheHammerDamageEffect()); - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); - this.getSpellAbility().addTarget(new FallOfTheHammerTargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); + this.getSpellAbility().addTarget(new FallOfTheHammerTargetCreaturePermanent(filter)); } public FallOfTheHammer(final FallOfTheHammer card) { @@ -117,8 +117,8 @@ class FallOfTheHammerDamageEffect extends OneShotEffect { class FallOfTheHammerTargetCreaturePermanent extends TargetCreaturePermanent { - public FallOfTheHammerTargetCreaturePermanent(FilterCreaturePermanent filter, boolean required) { - super(filter, required); + public FallOfTheHammerTargetCreaturePermanent(FilterCreaturePermanent filter) { + super(filter); } @Override diff --git a/Mage.Sets/src/mage/sets/bornofthegods/FatedInfatuation.java b/Mage.Sets/src/mage/sets/bornofthegods/FatedInfatuation.java index d66047b622b..222168a50ad 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/FatedInfatuation.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/FatedInfatuation.java @@ -58,7 +58,7 @@ public class FatedInfatuation extends CardImpl { // Put a token onto the battlefield that's a copy of target creature you control. If it's your turn, scry 2. this.getSpellAbility().addEffect(new FatedInfatuationCopyEffect()); - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new ScryEffect(2), MyTurnCondition.getInstance(), "If it's your turn, scry 2")); } diff --git a/Mage.Sets/src/mage/sets/bornofthegods/FearsomeTemper.java b/Mage.Sets/src/mage/sets/bornofthegods/FearsomeTemper.java index c4bea58108a..9672c71e4fc 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/FearsomeTemper.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/FearsomeTemper.java @@ -63,7 +63,7 @@ public class FearsomeTemper extends CardImpl { this.color.setRed(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); @@ -74,7 +74,7 @@ public class FearsomeTemper extends CardImpl { effect.setText("Enchanted creature gets +2/+2"); ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); Ability grantedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedByTargetSourceEffect(Duration.EndOfTurn), new ManaCostsImpl("{2}{R}")); - grantedAbility.addTarget(new TargetCreaturePermanent(true)); + grantedAbility.addTarget(new TargetCreaturePermanent()); effect = new GainAbilityAttachedEffect(grantedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("and has \"{2}{R}: Target creature can't block this creature this turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/FelhideSpiritbinder.java b/Mage.Sets/src/mage/sets/bornofthegods/FelhideSpiritbinder.java index be35b64ca45..e11b41b0d20 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/FelhideSpiritbinder.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/FelhideSpiritbinder.java @@ -76,7 +76,7 @@ public class FelhideSpiritbinder extends CardImpl { // Inspired - Whenever Felhide Spiritbinder becomes untapped, you may pay {1}{R}. If you do, put a token onto the battlefield that's a copy of another target creature except it's an enchantment in addition to its other types. It gains haste. Exile it at the beginning of the next end step. Ability ability = new InspiredAbility(new DoIfCostPaid(new FelhideSpiritbinderEffect(), new ManaCostsImpl("{1}{R}"),"Use effect of {source}?")); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/bornofthegods/ForgestokerDragon.java b/Mage.Sets/src/mage/sets/bornofthegods/ForgestokerDragon.java index 30dafd79531..e69f78a814a 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/ForgestokerDragon.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/ForgestokerDragon.java @@ -63,7 +63,7 @@ public class ForgestokerDragon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {1}{R}: Forgestoker Dragon deals 1 damage to target creature. That creature can't block this combat. Activate this ability only if Forgestoker Dragon is attacking. Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}{R}"), new SourceAttackingCondition()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); Effect effect = new CantBlockTargetEffect(Duration.EndOfCombat); effect.setText("That creature can't block this combat"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/Gild.java b/Mage.Sets/src/mage/sets/bornofthegods/Gild.java index 45de3d8fbcc..3406a33fc26 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/Gild.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/Gild.java @@ -51,7 +51,7 @@ public class Gild extends CardImpl { // Exile target creature. this.getSpellAbility().addEffect(new ExileTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Put a colorless artifact token named Gold onto the battlefield. It has "Sacrifice this artifact: Add one mana of any color to your mana pool." Effect effect = new CreateTokenEffect(new GoldToken()); effect.setText("Put a colorless artifact token named Gold onto the battlefield. It has \"Sacrifice this artifact: Add one mana of any color to your mana pool.\""); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/GrislyTransformation.java b/Mage.Sets/src/mage/sets/bornofthegods/GrislyTransformation.java index f39fc0db519..fa8ecf7e300 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/GrislyTransformation.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/GrislyTransformation.java @@ -60,7 +60,7 @@ public class GrislyTransformation extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/HoldAtBay.java b/Mage.Sets/src/mage/sets/bornofthegods/HoldAtBay.java index fe1aa1fda01..c418d33178f 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/HoldAtBay.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/HoldAtBay.java @@ -50,7 +50,7 @@ public class HoldAtBay extends CardImpl { // Prevent the next 7 damage that would be dealt to target creature or player this turn. this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, 7)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); } public HoldAtBay(final HoldAtBay card) { diff --git a/Mage.Sets/src/mage/sets/bornofthegods/HuntersProwess.java b/Mage.Sets/src/mage/sets/bornofthegods/HuntersProwess.java index 47a60cc9347..9b87e40724f 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/HuntersProwess.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/HuntersProwess.java @@ -66,7 +66,7 @@ public class HuntersProwess extends CardImpl { Ability grantedAbility = new DealsCombatDamageToAPlayerTriggeredAbility(new HuntersProwessDrawEffect(), false, true); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(grantedAbility, Duration.EndOfTurn, "and \"Whenever this creature deals combat damage to a player, draw that many cards.\"")); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public HuntersProwess(final HuntersProwess card) { diff --git a/Mage.Sets/src/mage/sets/bornofthegods/KarametrasFavor.java b/Mage.Sets/src/mage/sets/bornofthegods/KarametrasFavor.java index d18657dbb49..0739690aad4 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/KarametrasFavor.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/KarametrasFavor.java @@ -61,7 +61,7 @@ public class KarametrasFavor extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/KioraTheCrashingWave.java b/Mage.Sets/src/mage/sets/bornofthegods/KioraTheCrashingWave.java index 832ed1be166..311f0bf1e5a 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/KioraTheCrashingWave.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/KioraTheCrashingWave.java @@ -82,7 +82,7 @@ public class KioraTheCrashingWave extends CardImpl { // +1: Until your next turn, prevent all damage that would be dealt to and dealt by target permanent an opponent controls. LoyaltyAbility ability = new LoyaltyAbility(new KioraPreventionEffect(), 1); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); // -1: Draw a card. You may play an additional land this turn. diff --git a/Mage.Sets/src/mage/sets/bornofthegods/KiorasFollower.java b/Mage.Sets/src/mage/sets/bornofthegods/KiorasFollower.java index e677886f7b0..d1b301be2e6 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/KiorasFollower.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/KiorasFollower.java @@ -64,7 +64,7 @@ public class KiorasFollower extends CardImpl { // {T}: Untap another target permanent. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/bornofthegods/LightningVolley.java b/Mage.Sets/src/mage/sets/bornofthegods/LightningVolley.java index 032acd42ad0..94b5e5a209c 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/LightningVolley.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/LightningVolley.java @@ -56,7 +56,7 @@ public class LightningVolley extends CardImpl { // Until end of turn, creatures you control gain "{T}: This creature deals 1 damage to target creature or player." Ability grantedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - grantedAbility.addTarget(new TargetCreatureOrPlayer(true)); + grantedAbility.addTarget(new TargetCreatureOrPlayer()); Effect effect = new GainAbilityControlledEffect(grantedAbility, Duration.EndOfTurn, new FilterCreaturePermanent("Creatures")); effect.setText("Until end of turn, creatures you control gain \"{T}: This creature deals 1 damage to target creature or player.\""); this.getSpellAbility().addEffect(effect); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/Mindreaver.java b/Mage.Sets/src/mage/sets/bornofthegods/Mindreaver.java index f430d2f3072..04c99bb38ec 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/Mindreaver.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/Mindreaver.java @@ -76,7 +76,7 @@ public class Mindreaver extends CardImpl { // Heroic - Whenever you cast a spell that targets Mindreaver, exile the top three cards of target player's library. Ability ability = new HeroicAbility(new MindreaverExileEffect(), false); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); // {U}{U}, Sacrifice Mindreaver: Counter target spell with the same name as a card exiled with mindreaver. diff --git a/Mage.Sets/src/mage/sets/bornofthegods/MogisGodOfSlaughter.java b/Mage.Sets/src/mage/sets/bornofthegods/MogisGodOfSlaughter.java index 8e2ec1fe018..52d6a8c8524 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/MogisGodOfSlaughter.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/MogisGodOfSlaughter.java @@ -79,7 +79,7 @@ public class MogisGodOfSlaughter extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); // At the beginning of each opponent's upkeep, Mogis deals 2 damage to that player unless he or she sacrifices a creature. - effect = new DoUnlessTargetPaysCost(new DamageTargetEffect(2, false, "that player"), new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)), + effect = new DoUnlessTargetPaysCost(new DamageTargetEffect(2, false, "that player"), new SacrificeTargetCost(new TargetControlledCreaturePermanent()), "Sacrifice a creature? (otherwise you get 2 damage)"); effect.setText("Mogis deals 2 damage to that player unless he or she sacrifices a creature"); Ability ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, effect, TargetController.OPPONENT, false, true); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/MortalsArdor.java b/Mage.Sets/src/mage/sets/bornofthegods/MortalsArdor.java index e3bb6d37943..c52e34ebfa3 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/MortalsArdor.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/MortalsArdor.java @@ -57,7 +57,7 @@ public class MortalsArdor extends CardImpl { effect = new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains lifelink until end of turn"); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/bornofthegods/MortalsResolve.java b/Mage.Sets/src/mage/sets/bornofthegods/MortalsResolve.java index 61253da0474..db4053d060d 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/MortalsResolve.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/MortalsResolve.java @@ -57,7 +57,7 @@ public class MortalsResolve extends CardImpl { effect = new GainAbilityTargetEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains indestructible until end of turn"); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public MortalsResolve(final MortalsResolve card) { diff --git a/Mage.Sets/src/mage/sets/bornofthegods/NessianDemolok.java b/Mage.Sets/src/mage/sets/bornofthegods/NessianDemolok.java index c526e9d7871..1edf83ab403 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/NessianDemolok.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/NessianDemolok.java @@ -68,7 +68,7 @@ public class NessianDemolok extends CardImpl { this.addAbility(new TributeAbility(3)); // When Nessian Demolok enters the battlefield, if tribute wasn't paid, destroy target noncreature permanent. TriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(new ConditionalTriggeredAbility(ability, TributeNotPaidCondition.getInstance(), "When {this} enters the battlefield, if its tribute wasn't paid, destroy target noncreature permanent.")); } diff --git a/Mage.Sets/src/mage/sets/bornofthegods/NessianWildsRavager.java b/Mage.Sets/src/mage/sets/bornofthegods/NessianWildsRavager.java index 881d22862e2..3a1d9bb9711 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/NessianWildsRavager.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/NessianWildsRavager.java @@ -66,7 +66,7 @@ public class NessianWildsRavager extends CardImpl { this.addAbility(new TributeAbility(6)); // When Nessian Wilds Ravager enters the battlefield, if tribute wasn't paid, you may have Nessian Wilds Ravager fight another target creature. TriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new FightTargetSourceEffect(), true); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(new ConditionalTriggeredAbility(ability, TributeNotPaidCondition.getInstance(), "When {this} enters the battlefield, if its tribute wasn't paid, you may have {this} fight another target creature.")); } diff --git a/Mage.Sets/src/mage/sets/bornofthegods/OdunosRiverTrawler.java b/Mage.Sets/src/mage/sets/bornofthegods/OdunosRiverTrawler.java index 57c2f1db8cc..ca119eb1b09 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/OdunosRiverTrawler.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/OdunosRiverTrawler.java @@ -66,11 +66,11 @@ public class OdunosRiverTrawler extends CardImpl { // When Odunos River Trawler enters the battlefield, return target enchantment creature card from your graveyard to your hand. Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnFromGraveyardToHandTargetEffect()); - ability.addTarget(new TargetCardInYourGraveyard(filter, true)); + ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); // {W}, Sacrifice Odunos River Trawler: Return target enchantment creature card from your graveyard to your hand. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl("{W}")); - ability.addTarget(new TargetCardInYourGraveyard(filter, true)); + ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/bornofthegods/OraclesInsight.java b/Mage.Sets/src/mage/sets/bornofthegods/OraclesInsight.java index bf30394e832..ab8ddc87231 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/OraclesInsight.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/OraclesInsight.java @@ -62,7 +62,7 @@ public class OraclesInsight extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/PhenaxGodOfDeception.java b/Mage.Sets/src/mage/sets/bornofthegods/PhenaxGodOfDeception.java index 636b77e60ae..676d4a7acb5 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/PhenaxGodOfDeception.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/PhenaxGodOfDeception.java @@ -76,7 +76,7 @@ public class PhenaxGodOfDeception extends CardImpl { effect = new PutTopCardOfLibraryIntoGraveTargetEffect(SourcePermanentToughnessValue.getInstance()); effect.setText("Target player puts the top X cards of his or her library into his or her graveyard, where X is this creature's toughness"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); effect = new GainAbilityControlledEffect(ability, Duration.WhileOnBattlefield, new FilterCreaturePermanent("Creatures"),false); effect.setText("Creatures you control have \"{T}: Target player puts the top X cards of his or her library into his or her graveyard, where X is this creature's toughness.\""); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/RaisedByWolves.java b/Mage.Sets/src/mage/sets/bornofthegods/RaisedByWolves.java index 0bc2953c5a6..5c6b3969552 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/RaisedByWolves.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/RaisedByWolves.java @@ -71,7 +71,7 @@ public class RaisedByWolves extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/RecklessReveler.java b/Mage.Sets/src/mage/sets/bornofthegods/RecklessReveler.java index f1cc9f585b4..1c1cc42304b 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/RecklessReveler.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/RecklessReveler.java @@ -58,7 +58,7 @@ public class RecklessReveler extends CardImpl { // {R}, Sacrifice Reckless Reveler: Destroy target artifact. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{R}")); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetArtifactPermanent(true)); + ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/bornofthegods/RetractionHelix.java b/Mage.Sets/src/mage/sets/bornofthegods/RetractionHelix.java index 536fc56a3b0..4ec25d7408d 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/RetractionHelix.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/RetractionHelix.java @@ -63,7 +63,7 @@ public class RetractionHelix extends CardImpl { Effect effect = new GainAbilityTargetEffect(gainedAbility, Duration.EndOfTurn); effect.setText("Until end of turn, target creature gains \"{T}: Return target nonland permanent to its owner's hand.\""); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public RetractionHelix(final RetractionHelix card) { diff --git a/Mage.Sets/src/mage/sets/bornofthegods/RiseToTheChallenge.java b/Mage.Sets/src/mage/sets/bornofthegods/RiseToTheChallenge.java index a2407f7e148..c12d9f36216 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/RiseToTheChallenge.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/RiseToTheChallenge.java @@ -57,7 +57,7 @@ public class RiseToTheChallenge extends CardImpl { effect = new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains first strike until end of turn"); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public RiseToTheChallenge(final RiseToTheChallenge card) { diff --git a/Mage.Sets/src/mage/sets/bornofthegods/SatyrFiredancer.java b/Mage.Sets/src/mage/sets/bornofthegods/SatyrFiredancer.java index 29b9c63a095..5d6d4c046ce 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/SatyrFiredancer.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/SatyrFiredancer.java @@ -82,7 +82,7 @@ public class SatyrFiredancer extends CardImpl { if (opponent != null) { FilterCreaturePermanent filter = new FilterCreaturePermanent(new StringBuilder("creature controlled by ").append(opponent.getName()).toString()); filter.add(new ControllerIdPredicate(opponent.getId())); - ability.getTargets().add(new TargetCreaturePermanent(filter, true)); + ability.getTargets().add(new TargetCreaturePermanent(filter)); } } } diff --git a/Mage.Sets/src/mage/sets/bornofthegods/SearingBlood.java b/Mage.Sets/src/mage/sets/bornofthegods/SearingBlood.java index ff0584f3445..e21c5aef2a0 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/SearingBlood.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/SearingBlood.java @@ -60,7 +60,7 @@ public class SearingBlood extends CardImpl { // Searing Blood deals 2 damage to target creature. When that creature dies this turn, Searing Blood deals 3 damage to that creature's controller. this.getSpellAbility().addEffect(new SearingBloodEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public SearingBlood(final SearingBlood card) { diff --git a/Mage.Sets/src/mage/sets/bornofthegods/SetessanStarbreaker.java b/Mage.Sets/src/mage/sets/bornofthegods/SetessanStarbreaker.java index 8a9238df19f..5f9f9ce92fb 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/SetessanStarbreaker.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/SetessanStarbreaker.java @@ -63,7 +63,7 @@ public class SetessanStarbreaker extends CardImpl { // When Setessa Starbreaker enters the battlefield, you may destroy target Aura. Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), true); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/bornofthegods/ShrikeHarpy.java b/Mage.Sets/src/mage/sets/bornofthegods/ShrikeHarpy.java index 0106fbc6723..b66c4271c3c 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/ShrikeHarpy.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/ShrikeHarpy.java @@ -65,7 +65,7 @@ public class ShrikeHarpy extends CardImpl { this.addAbility(new TributeAbility(2)); // When Shrike Harpy enters the battlefield, if tribute wasn't paid, target opponent sacrifices a creature. TriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new SacrificeEffect(new FilterCreaturePermanent("a creature"), 1, "target opponent"), false); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(new ConditionalTriggeredAbility(ability, TributeNotPaidCondition.getInstance(), "When {this} enters the battlefield, if its tribute wasn't paid, target opponent sacrifices a creature.")); } diff --git a/Mage.Sets/src/mage/sets/bornofthegods/SirenOfTheFangedCoast.java b/Mage.Sets/src/mage/sets/bornofthegods/SirenOfTheFangedCoast.java index 231c9b5b29f..793db85f7d3 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/SirenOfTheFangedCoast.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/SirenOfTheFangedCoast.java @@ -64,7 +64,7 @@ public class SirenOfTheFangedCoast extends CardImpl { this.addAbility(new TributeAbility(3)); // When Siren of the Fanged Coast enters the battlefield, if tribute wasn't paid, gain control of target creature. TriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new GainControlTargetEffect(Duration.EndOfGame, true), false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(new ConditionalTriggeredAbility(ability, TributeNotPaidCondition.getInstance(), "When {this} enters the battlefield, if its tribute wasn't paid, gain control of target creature.")); } diff --git a/Mage.Sets/src/mage/sets/bornofthegods/SirenSongLyre.java b/Mage.Sets/src/mage/sets/bornofthegods/SirenSongLyre.java index a35f8edf991..4f52967bc6d 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/SirenSongLyre.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/SirenSongLyre.java @@ -60,7 +60,7 @@ public class SirenSongLyre extends CardImpl { // Equipped creature has "{2}, {T}: Tap target creature." Ability grantedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(2)); grantedAbility.addCost(new TapSourceCost()); - grantedAbility.addTarget(new TargetCreaturePermanent(true)); + grantedAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(grantedAbility, AttachmentType.EQUIPMENT))); // Equip {2} this.addAbility(new EquipAbility(Outcome.AddAbility, new ManaCostsImpl("{2}"))); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/StratusWalk.java b/Mage.Sets/src/mage/sets/bornofthegods/StratusWalk.java index 612a361d301..ecd7203beb6 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/StratusWalk.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/StratusWalk.java @@ -61,7 +61,7 @@ public class StratusWalk extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/Sunbond.java b/Mage.Sets/src/mage/sets/bornofthegods/Sunbond.java index 0a43ca78e37..6b8e51d6a5e 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/Sunbond.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/Sunbond.java @@ -63,7 +63,7 @@ public class Sunbond extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/ThunderousMight.java b/Mage.Sets/src/mage/sets/bornofthegods/ThunderousMight.java index c25b0043374..9eb39f56ee0 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/ThunderousMight.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/ThunderousMight.java @@ -60,7 +60,7 @@ public class ThunderousMight extends CardImpl { this.color.setRed(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/VortexElemental.java b/Mage.Sets/src/mage/sets/bornofthegods/VortexElemental.java index 1804915739c..67a0add64ff 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/VortexElemental.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/VortexElemental.java @@ -68,7 +68,7 @@ public class VortexElemental extends CardImpl { // {3}{U}{U}: Target creature blocks Vortex Elemental this turn if able. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MustBeBlockedByTargetSourceEffect(), new ManaCostsImpl("{3}{U}{U}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/bornofthegods/WarchanterOfMogis.java b/Mage.Sets/src/mage/sets/bornofthegods/WarchanterOfMogis.java index adca9389aed..8f9564c0ad1 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/WarchanterOfMogis.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/WarchanterOfMogis.java @@ -57,7 +57,7 @@ public class WarchanterOfMogis extends CardImpl { // Inspired - Whenever Warchanter of Mogis becomes untapped, target creature you control gains intimidate until end of turn. Ability ability = new InspiredAbility(new GainAbilityTargetEffect(IntimidateAbility.getInstance(), Duration.EndOfTurn), false); - ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/bornofthegods/WeightOfTheUnderworld.java b/Mage.Sets/src/mage/sets/bornofthegods/WeightOfTheUnderworld.java index 8142f3f2365..cfb03a7ddd5 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/WeightOfTheUnderworld.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/WeightOfTheUnderworld.java @@ -56,7 +56,7 @@ public class WeightOfTheUnderworld extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/bornofthegods/XenagosGodOfRevels.java b/Mage.Sets/src/mage/sets/bornofthegods/XenagosGodOfRevels.java index b789b86b0a3..a975f217b52 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/XenagosGodOfRevels.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/XenagosGodOfRevels.java @@ -89,7 +89,7 @@ public class XenagosGodOfRevels extends CardImpl { effect.setText("another target creature you control gains haste"); Ability ability = new BeginningOfCombatTriggeredAbility(Zone.BATTLEFIELD, effect, TargetController.YOU, false, false); ability.addEffect(new XenagosGodOfRevelsEffect()); - ability.addTarget(new TargetControlledCreaturePermanent(1,1,filter, false, true)); + ability.addTarget(new TargetControlledCreaturePermanent(1,1,filter, false)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AshenSkinZubera.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AshenSkinZubera.java index 20d0d92c1f3..7e1a8cce88c 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AshenSkinZubera.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AshenSkinZubera.java @@ -53,7 +53,7 @@ public class AshenSkinZubera extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); Ability ability = new DiesTriggeredAbility(new DiscardTargetEffect(new ZuberasDiedDynamicValue())); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); this.addWatcher(new ZuberasDiedWatcher()); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AuraOfDominion.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AuraOfDominion.java index 8f9b2e82cf4..d2e5a5ff8df 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AuraOfDominion.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AuraOfDominion.java @@ -66,7 +66,7 @@ public class AuraOfDominion extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Aura"); this.color.setBlue(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Untap)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Befoul.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Befoul.java index 7b238cee7a9..cb2366c77e7 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Befoul.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Befoul.java @@ -63,7 +63,7 @@ public class Befoul extends CardImpl { this.color.setBlack(true); // Destroy target land or nonblack creature. It can't be regenerated. this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); } public Befoul (final Befoul card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BlessedBreath.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BlessedBreath.java index 49226c0ede6..9737b1b5e03 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/BlessedBreath.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BlessedBreath.java @@ -53,7 +53,7 @@ public class BlessedBreath extends CardImpl { // Target creature you control gains protection from the color of your choice until end of turn. this.getSpellAbility().addEffect(new GainProtectionFromColorTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addChoice(new ChoiceColor()); - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); // Splice onto Arcane {W} this.addAbility(new SpliceOntoArcaneAbility("{W}")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BlindWithAnger.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BlindWithAnger.java index cc61b4130e7..c18e2242b7b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/BlindWithAnger.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BlindWithAnger.java @@ -63,7 +63,7 @@ public class BlindWithAnger extends CardImpl { this.getSpellAbility().addEffect(new UntapTargetEffect()); this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); this.getSpellAbility().addTarget(target); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BloodRites.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BloodRites.java index b61350dec2d..a98fbe8a001 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/BloodRites.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BloodRites.java @@ -51,7 +51,7 @@ public class BloodRites extends CardImpl { this.expansionSetCode = "CHK"; this.color.setRed(true); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{1}{R}")); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BloodthirstyOgre.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BloodthirstyOgre.java index 476b8b71963..44df09de6f3 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/BloodthirstyOgre.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BloodthirstyOgre.java @@ -77,7 +77,7 @@ public class BloodthirstyOgre extends CardImpl { Ability ability; ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(devotionCounters,devotionCounters, Duration.EndOfTurn, true),new TapSourceCost()); ability.addCost(new ControlPermanentCost(filter)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BurrGrafter.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BurrGrafter.java index 1d42dfec6cf..0fb8b847edb 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/BurrGrafter.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BurrGrafter.java @@ -59,7 +59,7 @@ public class BurrGrafter extends CardImpl { // Sacrifice Burr Grafter: Target creature gets +2/+2 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); this.addAbility(new SoulshiftAbility(3)); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/CageOfHands.java b/Mage.Sets/src/mage/sets/championsofkamigawa/CageOfHands.java index a35f93533d1..f75bdf5f7cc 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/CageOfHands.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/CageOfHands.java @@ -56,7 +56,7 @@ public class CageOfHands extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Aura"); this.color.setWhite(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Neutral)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/CandlesGlow.java b/Mage.Sets/src/mage/sets/championsofkamigawa/CandlesGlow.java index b5df663cdb8..d6abeb2ec53 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/CandlesGlow.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/CandlesGlow.java @@ -55,7 +55,7 @@ public class CandlesGlow extends CardImpl { // Prevent the next 3 damage that would be dealt to target creature or player this turn. You gain life equal to the damage prevented this way. this.getSpellAbility().addEffect(new CandlesGlowPreventDamageTargetEffect(Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); // Splice onto Arcane {1}{W} this.addAbility(new SpliceOntoArcaneAbility("{1}{W}")); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ConsumingVortex.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ConsumingVortex.java index 46d6f1db241..e4165d1a94d 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ConsumingVortex.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ConsumingVortex.java @@ -50,7 +50,7 @@ public class ConsumingVortex extends CardImpl { // Return target creature to its owner's hand. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Splice onto Arcane {3}{U} this.addAbility(new SpliceOntoArcaneAbility("{3}{U}")); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/CranialExtraction.java b/Mage.Sets/src/mage/sets/championsofkamigawa/CranialExtraction.java index 4556c5b4e5b..cd0391ee93f 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/CranialExtraction.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/CranialExtraction.java @@ -58,7 +58,7 @@ public class CranialExtraction extends CardImpl { /* Name a nonland card. Search target player's graveyard, hand, and library for * all cards with that name and exile them. Then that player shuffles his or her library. */ - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new CranialExtractionEffect()); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/CrushingPain.java b/Mage.Sets/src/mage/sets/championsofkamigawa/CrushingPain.java index 63221839a41..3fba0664ee4 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/CrushingPain.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/CrushingPain.java @@ -58,7 +58,7 @@ public class CrushingPain extends CardImpl { // Crushing Pain deals 6 damage to target creature that was dealt damage this turn. this.getSpellAbility().addEffect(new DamageTargetEffect(6)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); } public CrushingPain (final CrushingPain card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/DevouringGreed.java b/Mage.Sets/src/mage/sets/championsofkamigawa/DevouringGreed.java index 22400905d58..257ea91b8d8 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/DevouringGreed.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/DevouringGreed.java @@ -62,11 +62,11 @@ public class DevouringGreed extends CardImpl { this.color.setBlack(true); // As an additional cost to cast Devouring Greed, you may sacrifice any number of Spirits. - this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(0, Integer.MAX_VALUE, filter, true, false))); + this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(0, Integer.MAX_VALUE, filter, true))); // Target player loses 2 life plus 2 life for each Spirit sacrificed this way. You gain that much life. this.getSpellAbility().addEffect(new DevouringGreedEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/DevouringRage.java b/Mage.Sets/src/mage/sets/championsofkamigawa/DevouringRage.java index 5917a91165f..7a685fc08e0 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/DevouringRage.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/DevouringRage.java @@ -67,11 +67,11 @@ public class DevouringRage extends CardImpl { this.color.setRed(true); // As an additional cost to cast Devouring Rage, you may sacrifice any number of Spirits. - this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(0, Integer.MAX_VALUE, filter, true, false))); + this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(0, Integer.MAX_VALUE, filter, true))); // Target creature gets +3/+0 until end of turn. For each Spirit sacrificed this way, that creature gets an additional +3/+0 until end of turn this.getSpellAbility().addEffect(new DevouringRageEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/EiganjoCastle.java b/Mage.Sets/src/mage/sets/championsofkamigawa/EiganjoCastle.java index 93677a858cd..ae10642a37c 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/EiganjoCastle.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/EiganjoCastle.java @@ -60,7 +60,7 @@ public class EiganjoCastle extends CardImpl { this.addAbility(new WhiteManaAbility()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/EightAndAHalfTails.java b/Mage.Sets/src/mage/sets/championsofkamigawa/EightAndAHalfTails.java index b4a7a630abb..f2089009e74 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/EightAndAHalfTails.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/EightAndAHalfTails.java @@ -72,7 +72,7 @@ public class EightAndAHalfTails extends CardImpl { // {1}{W}: Target permanent you control gains protection from white until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new ProtectionAbility(filter), Duration.EndOfTurn), new ManaCostsImpl("{1}{W}")); - Target target = new TargetControlledPermanent(true); + Target target = new TargetControlledPermanent(); ability.addTarget(target); this.addAbility(ability); // {1}: Target spell or permanent becomes white until end of turn. diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/EightAndAHalfTale.java b/Mage.Sets/src/mage/sets/championsofkamigawa/EightAndAHalfTale.java index 47ba99a9b85..ef4b64a2a7a 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/EightAndAHalfTale.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/EightAndAHalfTale.java @@ -71,7 +71,7 @@ public class EightAndAHalfTale extends CardImpl { // {1}{W}: Target permanent you control gains protection from white until end of turn. Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect( new ProtectionAbility(filter), Duration.EndOfTurn), new ManaCostsImpl("{1}{W}")); - ability1.addTarget(new TargetControlledPermanent(true)); + ability1.addTarget(new TargetControlledPermanent()); this.addAbility(ability1); // {1}: Target spell or permanent becomes white until end of turn. Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SetCardColorTargetEffect( diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/EyeOfNowhere.java b/Mage.Sets/src/mage/sets/championsofkamigawa/EyeOfNowhere.java index b72b480de9d..5d97d391717 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/EyeOfNowhere.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/EyeOfNowhere.java @@ -47,7 +47,7 @@ public class EyeOfNowhere extends CardImpl { this.subtype.add("Arcane"); this.color.setBlue(true); this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(true)); + this.getSpellAbility().addTarget(new TargetPermanent()); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/FieldOfReality.java b/Mage.Sets/src/mage/sets/championsofkamigawa/FieldOfReality.java index 209d68da1ee..59cd3cb046c 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/FieldOfReality.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/FieldOfReality.java @@ -64,7 +64,7 @@ public class FieldOfReality extends CardImpl { this.color.setBlue(true); // Enchanted creature can't be blocked by Spirits. - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ForbiddenOrchard.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ForbiddenOrchard.java index e13d95a97c5..c402e47c07d 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ForbiddenOrchard.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ForbiddenOrchard.java @@ -71,7 +71,7 @@ class ForbiddenOrchardTriggeredAbility extends TriggeredAbilityImpl { public ForbiddenOrchardTriggeredAbility() { super(Zone.BATTLEFIELD, new CreateTokenTargetEffect(new SpiritToken())); - this.addTarget(new TargetOpponent(true)); + this.addTarget(new TargetOpponent()); } public ForbiddenOrchardTriggeredAbility(final ForbiddenOrchardTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/GiftsUngiven.java b/Mage.Sets/src/mage/sets/championsofkamigawa/GiftsUngiven.java index ac63cc74296..eec940c3f31 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/GiftsUngiven.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/GiftsUngiven.java @@ -114,7 +114,7 @@ class GiftsUngivenEffect extends OneShotEffect { Player opponent; if (game.getOpponents(player.getId()).size() > 1) { - TargetOpponent targetOpponent = new TargetOpponent(true); + TargetOpponent targetOpponent = new TargetOpponent(); player.chooseTarget(outcome, targetOpponent, source, game); opponent = game.getPlayer(target.getFirstTarget()); } else { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/GuardianOfSolitude.java b/Mage.Sets/src/mage/sets/championsofkamigawa/GuardianOfSolitude.java index 1c651e0d3f4..00c3ed3452a 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/GuardianOfSolitude.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/GuardianOfSolitude.java @@ -57,7 +57,7 @@ public class GuardianOfSolitude extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); Ability ability = new SpellCastControllerTriggeredAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), filter, false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HairStrungKoto.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HairStrungKoto.java index ebd13ccb6e3..40438e229c9 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HairStrungKoto.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HairStrungKoto.java @@ -66,7 +66,7 @@ public class HairStrungKoto extends CardImpl { SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(1), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false))); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HeWhoHungers.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HeWhoHungers.java index 5bca9ff3f6c..5bf054c734d 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HeWhoHungers.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HeWhoHungers.java @@ -78,7 +78,7 @@ public class HeWhoHungers extends CardImpl { /* {1}, Sacrifice a Spirit: Target opponent reveals his or her hand. You choose a card from it. * That player discards that card. Activate this ability only any time you could cast a sorcery. */ Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardCardYouChooseTargetEffect(), new ManaCostsImpl("{1}")); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HearthKami.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HearthKami.java index bb929bdf0b0..82fb734aa05 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HearthKami.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HearthKami.java @@ -73,7 +73,7 @@ public class HearthKami extends CardImpl { ability.getTargets().clear(); FilterArtifactPermanent filter = new FilterArtifactPermanent(new StringBuilder("artifact with converted mana cost ").append(xValue).toString()); filter.add(new ConvertedManaCostPredicate(Filter.ComparisonType.Equal, xValue)); - Target target = new TargetPermanent(filter, true); + Target target = new TargetPermanent(filter); target.setRequired(true); ability.addTarget(target); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HisokasGuard.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HisokasGuard.java index fcb51223b54..5c69f4a5895 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HisokasGuard.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HisokasGuard.java @@ -75,7 +75,7 @@ public class HisokasGuard extends CardImpl { filter.add(new AnotherPredicate()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HisokasGuardGainAbilityTargetEffect(), new ManaCostsImpl("{1}{U}")); ability.addCost(new TapSourceCost()); - Target target = new TargetControlledCreaturePermanent(1, 1, filter, true, true); + Target target = new TargetControlledCreaturePermanent(1, 1, filter, true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfNightsReach.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfNightsReach.java index d95c034fc3f..77f2a0064b3 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfNightsReach.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfNightsReach.java @@ -62,7 +62,7 @@ public class HondenOfNightsReach extends CardImpl { // At the beginning of your upkeep, target opponent discards a card for each Shrine you control. Ability ability = new BeginningOfUpkeepTriggeredAbility(new DiscardTargetEffect(new PermanentsOnBattlefieldCount(filter)), TargetController.YOU, false); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HorizonSeed.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HorizonSeed.java index a476b70350d..fa6f89073de 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HorizonSeed.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HorizonSeed.java @@ -55,7 +55,7 @@ public class HorizonSeed extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); Ability ability = new SpellCastControllerTriggeredAbility(new RegenerateTargetEffect(), filter, false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/IndomitableWill.java b/Mage.Sets/src/mage/sets/championsofkamigawa/IndomitableWill.java index bb3f61723ab..4c13ed6215f 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/IndomitableWill.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/IndomitableWill.java @@ -54,7 +54,7 @@ public class IndomitableWill extends CardImpl { this.color.setWhite(true); this.addAbility(FlashAbility.getInstance()); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/InitiateOfBlood.java b/Mage.Sets/src/mage/sets/championsofkamigawa/InitiateOfBlood.java index 26cdab93fe2..18effc5a9d4 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/InitiateOfBlood.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/InitiateOfBlood.java @@ -71,7 +71,7 @@ public class InitiateOfBlood extends CardImpl { // {T}: Initiate of Blood deals 1 damage to target creature that was dealt damage this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); // When that creature is put into a graveyard this turn, flip Initiate of Blood. @@ -109,7 +109,7 @@ class GokaTheUnjust extends Token { // {T}: Goka the Unjust deals 4 damage to target creature that was dealt damage this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/InnocenceKami.java b/Mage.Sets/src/mage/sets/championsofkamigawa/InnocenceKami.java index 7e92b2ffc28..54f75a581db 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/InnocenceKami.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/InnocenceKami.java @@ -62,7 +62,7 @@ public class InnocenceKami extends CardImpl { this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); this.addAbility(new SpellCastControllerTriggeredAbility(new UntapSourceEffect(), filter, false)); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/JunkyoBell.java b/Mage.Sets/src/mage/sets/championsofkamigawa/JunkyoBell.java index ed44f02ad2c..c3c1018e881 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/JunkyoBell.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/JunkyoBell.java @@ -63,7 +63,7 @@ public class JunkyoBell extends CardImpl { // where X is the number of creatures you control. If you do, sacrifice that creature at the beginning of the next end step. PermanentsOnBattlefieldCount amount = new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent()); Ability ability = new BeginningOfUpkeepTriggeredAbility(new BoostTargetEffect(amount, amount, Duration.EndOfTurn), TargetController.YOU, true); - ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); ability.addEffect(new JunkyoBellSacrificeEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/JushiApprentice.java b/Mage.Sets/src/mage/sets/championsofkamigawa/JushiApprentice.java index 93e710a311d..f4c7fcfa246 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/JushiApprentice.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/JushiApprentice.java @@ -98,7 +98,7 @@ class TomoyaTheRevealer extends Token { // {3}{U}{U},{T} : Target player draws X cards, where X is the number of cards in your hand. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardTargetEffect(new CardsInControllerHandCount()), new ManaCostsImpl("{3}{U}{U}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KabutoMoth.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KabutoMoth.java index 5569e54b483..504ed367b38 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KabutoMoth.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KabutoMoth.java @@ -57,7 +57,7 @@ public class KabutoMoth extends CardImpl { this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 2, Duration.EndOfTurn), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfAncientLaw.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfAncientLaw.java index 8efe4e6718b..d05e8f994f4 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfAncientLaw.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfAncientLaw.java @@ -62,7 +62,7 @@ public class KamiOfAncientLaw extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfFiresRoar.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfFiresRoar.java index a8c1c43a85c..350063a86b4 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfFiresRoar.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfFiresRoar.java @@ -58,7 +58,7 @@ public class KamiOfFiresRoar extends CardImpl { // Whenever you cast a Spirit or Arcane spell, target creature can't block this turn. Ability ability = new SpellCastControllerTriggeredAbility(new CantBlockTargetEffect(Duration.EndOfTurn), filter, false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheWaningMoon.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheWaningMoon.java index 35b73926ea5..cb1baec6913 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheWaningMoon.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheWaningMoon.java @@ -59,7 +59,7 @@ public class KamiOfTheWaningMoon extends CardImpl { this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); Ability ability = new SpellCastControllerTriggeredAbility(new GainAbilityTargetEffect(FearAbility.getInstance(), Duration.EndOfTurn), filter, false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTwistedReflection.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTwistedReflection.java index b74b59a21ad..2589d10d3f7 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTwistedReflection.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTwistedReflection.java @@ -54,7 +54,7 @@ public class KamiOfTwistedReflection extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new SacrificeSourceCost()); - ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KeigaTheTideStar.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KeigaTheTideStar.java index 0fd8cc67ce1..3bd38c46c9b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KeigaTheTideStar.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KeigaTheTideStar.java @@ -57,7 +57,7 @@ public class KeigaTheTideStar extends CardImpl { this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); Ability ability = new DiesTriggeredAbility(new GainControlTargetEffect(Duration.Custom)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KikuNightsFlower.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KikuNightsFlower.java index d92ab7f7f14..697909ba312 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KikuNightsFlower.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KikuNightsFlower.java @@ -68,7 +68,7 @@ public class KikuNightsFlower extends CardImpl { new KikuNightsFlowerEffect(), new ManaCostsImpl("{2}{B}{B}") ); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneDiviner.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneDiviner.java index cc0e5ee2ed8..f7a78ca3428 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneDiviner.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneDiviner.java @@ -64,7 +64,7 @@ public class KitsuneDiviner extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneHealer.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneHealer.java index 4e6b98cb06a..b9210ba0098 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneHealer.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneHealer.java @@ -74,7 +74,7 @@ public class KitsuneHealer extends CardImpl { this.addAbility(firstAbility); // {T}: Prevent all damage that would be dealt to target legendary creature this turn. Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, Integer.MAX_VALUE), new TapSourceCost()); - secondAbility.addTarget(new TargetCreaturePermanent(filter, true)); + secondAbility.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneMystic.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneMystic.java index 0a33fb35929..3d3793a1940 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneMystic.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneMystic.java @@ -112,8 +112,8 @@ class AutumnTailKitsuneSage extends Token { // {1}: Attach target Aura attached to a creature to another creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AutumnTailEffect(), new GenericManaCost(1)); - ability.addTarget(new TargetPermanent(filter, true)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetPermanent(filter)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KodamasMight.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KodamasMight.java index 95376d7d09e..0209e24b9a0 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KodamasMight.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KodamasMight.java @@ -51,7 +51,7 @@ public class KodamasMight extends CardImpl { // Target creature gets +2/+2 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(2,2, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Splice onto Arcane {G} this.addAbility(new SpliceOntoArcaneAbility("{G}")); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KuroPitlord.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KuroPitlord.java index 3b8a0816d25..33d223a8c51 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KuroPitlord.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KuroPitlord.java @@ -60,7 +60,7 @@ public class KuroPitlord extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{B}{B}{B}{B}")), TargetController.YOU, false)); // Pay 1 life: Target creature gets -1/-1 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new PayLifeCost(1)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/LavaSpike.java b/Mage.Sets/src/mage/sets/championsofkamigawa/LavaSpike.java index b85c262d89c..bbcadb20d17 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/LavaSpike.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/LavaSpike.java @@ -46,7 +46,7 @@ public class LavaSpike extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); this.color.setRed(true); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new DamageTargetEffect(3)); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/LiftedByClouds.java b/Mage.Sets/src/mage/sets/championsofkamigawa/LiftedByClouds.java index 0b104c8f4e3..71629ea57ec 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/LiftedByClouds.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/LiftedByClouds.java @@ -52,7 +52,7 @@ public class LiftedByClouds extends CardImpl { // Target creature gains flying until end of turn. this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Splice onto Arcane {1}{U} this.addAbility(new SpliceOntoArcaneAbility("{1}{U}")); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Lure.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Lure.java index fe49fb8511e..99c4f8e4010 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Lure.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Lure.java @@ -56,7 +56,7 @@ public class Lure extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MatsuTribeDecoy.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MatsuTribeDecoy.java index d44e54b1f8d..f042b1aea75 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MatsuTribeDecoy.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MatsuTribeDecoy.java @@ -60,7 +60,7 @@ public class MatsuTribeDecoy extends CardImpl { // {2}{G}: Target creature blocks Matsu-Tribe Decoy this turn if able. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MustBeBlockedByTargetSourceEffect(), new ManaCostsImpl("{2}{G}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Whenever Kashi-Tribe Reaver deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step. Ability ability2; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MidnightCovenant.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MidnightCovenant.java index 8ca79348bdc..bc2ec01e754 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MidnightCovenant.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MidnightCovenant.java @@ -55,7 +55,7 @@ public class MidnightCovenant extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MinamoSchoolAtWatersEdge.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MinamoSchoolAtWatersEdge.java index 0425251bc67..c498b871108 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MinamoSchoolAtWatersEdge.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MinamoSchoolAtWatersEdge.java @@ -65,7 +65,7 @@ public class MinamoSchoolAtWatersEdge extends CardImpl { this.addAbility(new BlueManaAbility()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.U)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Mindblaze.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Mindblaze.java index 35c1791d381..49d58c0f058 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Mindblaze.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Mindblaze.java @@ -65,7 +65,7 @@ public class Mindblaze extends CardImpl { // Mindblaze deals 8 damage to that player. // Then that player shuffles his or her library. this.getSpellAbility().addEffect(new MindblazeEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public Mindblaze (final Mindblaze card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MysticRestraints.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MysticRestraints.java index 321f19c9d45..61b09739615 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MysticRestraints.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MysticRestraints.java @@ -62,7 +62,7 @@ public class MysticRestraints extends CardImpl { // Flash this.addAbility(FlashAbility.getInstance()); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiBoneReader.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiBoneReader.java index c97a6b4150f..761cd309666 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiBoneReader.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiBoneReader.java @@ -57,9 +57,9 @@ public class NezumiBoneReader extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); // {B}, Sacrifice a creature: Target player discards a card. Activate this ability only any time you could cast a sorcery. - Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1),new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1),new SacrificeTargetCost(new TargetControlledCreaturePermanent())); ability.addCost(new ManaCostsImpl("{B}")); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiShortfang.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiShortfang.java index 1e30eb39f85..4be727841c8 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiShortfang.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiShortfang.java @@ -71,7 +71,7 @@ public class NezumiShortfang extends CardImpl { // {1}{B}, {tap}: Target opponent discards a card. Then if that player has no cards in hand, flip Nezumi Shortfang. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl("{1}{B}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); ability.addEffect(new ConditionalOneShotEffect( new FlipSourceEffect(new StabwhiskerTheOdious()), new CardsInTargetOpponentHandCondition(CardsInTargetOpponentHandCondition.CountType.FEWER_THAN, 1), diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NineRingedBo.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NineRingedBo.java index c439b0ef597..febe46428c8 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/NineRingedBo.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/NineRingedBo.java @@ -67,7 +67,7 @@ public class NineRingedBo extends CardImpl { // {T}: Nine-Ringed Bo deals 1 damage to target Spirit creature. If that creature would die this turn, exile it instead. Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); ability.addEffect(new NineRingedBoEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OkinaTempleToTheGrandfathers.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OkinaTempleToTheGrandfathers.java index c6a14660de0..c86f136e99f 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/OkinaTempleToTheGrandfathers.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/OkinaTempleToTheGrandfathers.java @@ -60,7 +60,7 @@ public class OkinaTempleToTheGrandfathers extends CardImpl { this.addAbility(new GreenManaAbility()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OniPossession.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OniPossession.java index 6485fadf476..a3fca51b873 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/OniPossession.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/OniPossession.java @@ -67,14 +67,14 @@ public class OniPossession extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // At the beginning of your upkeep, sacrifice a creature. Ability ability2 = new BeginningOfUpkeepTriggeredAbility(new SacrificeTargetEffect("sacrifice a creature"), TargetController.YOU, false); - ability2.addTarget(new TargetControlledCreaturePermanent(1,1, new FilterControlledCreaturePermanent(),false, true)); + ability2.addTarget(new TargetControlledCreaturePermanent(1,1, new FilterControlledCreaturePermanent(),false)); this.addAbility(ability2); // Enchanted creature gets +3/+3 and has trample. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiEggwatcher.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiEggwatcher.java index ed303834b98..f9d5c7c40aa 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiEggwatcher.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiEggwatcher.java @@ -106,8 +106,8 @@ class ShidakoBroodmistress extends Token { Zone.BATTLEFIELD, new BoostTargetEffect(3,3, Duration.EndOfTurn), new ManaCostsImpl("{G}")); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OtherworldlyJourney.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OtherworldlyJourney.java index 61fadc4a97d..6638c19f3ee 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/OtherworldlyJourney.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/OtherworldlyJourney.java @@ -59,7 +59,7 @@ public class OtherworldlyJourney extends CardImpl { this.color.setWhite(true); // Exile target creature. At the beginning of the next end step, return that card to the battlefield under its owner's control with a +1/+1 counter on it. this.getSpellAbility().addEffect(new OtherworldlyJourneyEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public OtherworldlyJourney(final OtherworldlyJourney card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/PainKami.java b/Mage.Sets/src/mage/sets/championsofkamigawa/PainKami.java index b4683eb6cc8..d64593d77c9 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/PainKami.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/PainKami.java @@ -57,7 +57,7 @@ public class PainKami extends CardImpl { this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new ManacostVariableValue()), new ManaCostsImpl("{X}{R}")); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/PsychicPuppetry.java b/Mage.Sets/src/mage/sets/championsofkamigawa/PsychicPuppetry.java index 0b72c95f1be..cedeb36fb64 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/PsychicPuppetry.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/PsychicPuppetry.java @@ -50,7 +50,7 @@ public class PsychicPuppetry extends CardImpl { // You may tap or untap target permanent. this.getSpellAbility().addEffect(new MayTapOrUntapTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(true)); + this.getSpellAbility().addTarget(new TargetPermanent()); // Splice onto Arcane {U} this.addAbility(new SpliceOntoArcaneAbility("{U}")); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/PullUnder.java b/Mage.Sets/src/mage/sets/championsofkamigawa/PullUnder.java index 9e15e05cba2..a3dfbe57b84 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/PullUnder.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/PullUnder.java @@ -49,7 +49,7 @@ public class PullUnder extends CardImpl { this.subtype.add("Arcane"); this.color.setBlack(true); this.getSpellAbility().addEffect(new BoostTargetEffect(-5, -5, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public PullUnder (final PullUnder card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/QuietPurity.java b/Mage.Sets/src/mage/sets/championsofkamigawa/QuietPurity.java index fd183ecf142..3c4e48a4f30 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/QuietPurity.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/QuietPurity.java @@ -54,7 +54,7 @@ public class QuietPurity extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); this.color.setWhite(true); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/RaggedVeins.java b/Mage.Sets/src/mage/sets/championsofkamigawa/RaggedVeins.java index e0a8f9432b5..8a614931bc0 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/RaggedVeins.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/RaggedVeins.java @@ -65,7 +65,7 @@ public class RaggedVeins extends CardImpl { this.addAbility(FlashAbility.getInstance()); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/RendFlesh.java b/Mage.Sets/src/mage/sets/championsofkamigawa/RendFlesh.java index 46da2d1ecec..b9abf9240c3 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/RendFlesh.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/RendFlesh.java @@ -56,7 +56,7 @@ public class RendFlesh extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); this.color.setBlack(true); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); this.getSpellAbility().addTarget(target); this.getSpellAbility().addEffect(new DestroyTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/RendSpirit.java b/Mage.Sets/src/mage/sets/championsofkamigawa/RendSpirit.java index 9be1631dbc1..b85cdce4269 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/RendSpirit.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/RendSpirit.java @@ -53,7 +53,7 @@ public class RendSpirit extends CardImpl { super(ownerId, 141, "Rend Spirit", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{B}"); this.expansionSetCode = "CHK"; this.color.setBlack(true); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Reweave.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Reweave.java index 2b890b661bb..45703d2f652 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Reweave.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Reweave.java @@ -62,7 +62,7 @@ public class Reweave extends CardImpl { // Target permanent's controller sacrifices it. If he or she does, that player reveals cards from the top of his or her library until he or she reveals a permanent card that shares a card type with the sacrificed permanent, puts that card onto the battlefield, then shuffles his or her library. this.getSpellAbility().addEffect(new ReweaveEffect()); - Target target = new TargetPermanent(true); + Target target = new TargetPermanent(); target.setRequired(true); this.getSpellAbility().addTarget(target); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ScuttlingDeath.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ScuttlingDeath.java index 83dcda951d5..2db93d277ab 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ScuttlingDeath.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ScuttlingDeath.java @@ -56,7 +56,7 @@ public class ScuttlingDeath extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); this.addAbility(new SoulshiftAbility(4)); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SenseiGoldenTail.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SenseiGoldenTail.java index 4002b85341d..46150d638a9 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SenseiGoldenTail.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SenseiGoldenTail.java @@ -68,7 +68,7 @@ public class SenseiGoldenTail extends CardImpl { // {1}{W}, {T}: Put a training counter on target creature. Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(new Counter("Training")), new ManaCostsImpl("{1}{W}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); // That creature gains bushido 1 and becomes a Samurai in addition to its other creature types. Activate this ability only any time you could cast a sorcery. ability.addEffect(new GainAbilityTargetEffect(new BushidoAbility(1),Duration.Custom)); ability.addEffect(new AddCardSubTypeTargetEffect("Samurai",Duration.Custom)); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SerpentSkin.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SerpentSkin.java index 66b768cfd68..e0562198bdf 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SerpentSkin.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SerpentSkin.java @@ -57,7 +57,7 @@ public class SerpentSkin extends CardImpl { this.color.setGreen(true); this.addAbility(FlashAbility.getInstance()); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ShinkaTheBloodsoakedKeep.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ShinkaTheBloodsoakedKeep.java index 6615d59b95e..3d046b24a49 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ShinkaTheBloodsoakedKeep.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ShinkaTheBloodsoakedKeep.java @@ -61,7 +61,7 @@ public class ShinkaTheBloodsoakedKeep extends CardImpl { this.addAbility(new RedManaAbility()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ShizoDeathsStorehouse.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ShizoDeathsStorehouse.java index a86cbb6b84e..1cbcd4fa97a 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ShizoDeathsStorehouse.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ShizoDeathsStorehouse.java @@ -61,7 +61,7 @@ public class ShizoDeathsStorehouse extends CardImpl { this.addAbility(new BlackManaAbility()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FearAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiMirrorMage.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiMirrorMage.java index 721f6566825..35c7d6c79d8 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiMirrorMage.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiMirrorMage.java @@ -67,7 +67,7 @@ public class SoratamiMirrorMage extends CardImpl { // {3}, Return three lands you control to their owner's hand: Return target creature to its owner's hand. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new GenericManaCost(3)); ability.addCost(new ReturnToHandTargetCost(new TargetControlledPermanent(3, 3, filter, false))); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiRainshaper.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiRainshaper.java index c0f9205ca18..679fc172ff5 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiRainshaper.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiRainshaper.java @@ -70,7 +70,7 @@ public class SoratamiRainshaper extends CardImpl { // {3}, Return a land you control to its owner's hand: Target creature you control gains shroud until end of turn. (It can't be the target of spells or abilities.) Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(3)); ability.addCost(new ReturnToHandTargetCost(new TargetControlledPermanent(filter))); - ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SoulOfMagma.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SoulOfMagma.java index 6532cff23ae..440f8c99880 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SoulOfMagma.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SoulOfMagma.java @@ -55,7 +55,7 @@ public class SoulOfMagma extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SpellCastControllerTriggeredAbility(new DamageTargetEffect(1), filter, false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/StrangeInversion.java b/Mage.Sets/src/mage/sets/championsofkamigawa/StrangeInversion.java index f3f479711ad..26409eb1406 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/StrangeInversion.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/StrangeInversion.java @@ -51,7 +51,7 @@ public class StrangeInversion extends CardImpl { // Switch target creature's power and toughness until end of turn. this.getSpellAbility().addEffect(new SwitchPowerToughnessTargetEffect(Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Splice onto Arcane {1}{R} this.addAbility(new SpliceOntoArcaneAbility("{1}{R}")); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/StrengthOfCedars.java b/Mage.Sets/src/mage/sets/championsofkamigawa/StrengthOfCedars.java index 7a7701ad686..b19bf227ec4 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/StrengthOfCedars.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/StrengthOfCedars.java @@ -56,7 +56,7 @@ public class StrengthOfCedars extends CardImpl { // Target creature gets +X/+X until end of turn, where X is the number of lands you control. DynamicValue controlledLands = new PermanentsOnBattlefieldCount(filter, null); this.getSpellAbility().addEffect(new BoostTargetEffect(controlledLands, controlledLands, Duration.EndOfTurn, true)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public StrengthOfCedars (final StrengthOfCedars card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SwallowingPlague.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SwallowingPlague.java index 74b92654b7b..aaca337f442 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SwallowingPlague.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SwallowingPlague.java @@ -50,7 +50,7 @@ public class SwallowingPlague extends CardImpl { this.color.setBlack(true); this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); this.getSpellAbility().addEffect(new GainLifeEffect(new ManacostVariableValue())); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public SwallowingPlague (final SwallowingPlague card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/TellerOfTales.java b/Mage.Sets/src/mage/sets/championsofkamigawa/TellerOfTales.java index b73e6fbd2bb..00e1cf380af 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/TellerOfTales.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/TellerOfTales.java @@ -63,7 +63,7 @@ public class TellerOfTales extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Whenever you cast a Spirit or Arcane spell, you may tap or untap target creature. Ability ability = new SpellCastControllerTriggeredAbility(new MayTapOrUntapTargetEffect(),filter, true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/TenzaGodosMaul.java b/Mage.Sets/src/mage/sets/championsofkamigawa/TenzaGodosMaul.java index cdd2c10b9e3..1f9bf97686a 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/TenzaGodosMaul.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/TenzaGodosMaul.java @@ -86,7 +86,7 @@ public class TenzaGodosMaul extends CardImpl { new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT), new EquippedMatchesFilterCondition(redFilter), rule2))); // Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.) - this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1), new TargetControlledCreaturePermanent(true))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1), new TargetControlledCreaturePermanent())); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope.java index cc4f89717a7..77c217ea326 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope.java @@ -58,7 +58,7 @@ public class ThiefOfHope extends CardImpl { this.toughness = new MageInt(2); Ability ability = new SpellCastControllerTriggeredAbility(new LoseLifeTargetEffect(1), filter, false); ability.addEffect(new GainLifeEffect(1)); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); this.addAbility(new SoulshiftAbility(2)); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/UncontrollableAnger.java b/Mage.Sets/src/mage/sets/championsofkamigawa/UncontrollableAnger.java index 51e46241d65..c7e5e0b8eaf 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/UncontrollableAnger.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/UncontrollableAnger.java @@ -54,7 +54,7 @@ public class UncontrollableAnger extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Aura"); this.color.setRed(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/UnnaturalSpeed.java b/Mage.Sets/src/mage/sets/championsofkamigawa/UnnaturalSpeed.java index 41cbb5c89e7..83b31b1aa36 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/UnnaturalSpeed.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/UnnaturalSpeed.java @@ -50,7 +50,7 @@ public class UnnaturalSpeed extends CardImpl { this.subtype.add("Arcane"); this.color.setRed(true); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public UnnaturalSpeed (final UnnaturalSpeed card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/VassalsDuty.java b/Mage.Sets/src/mage/sets/championsofkamigawa/VassalsDuty.java index e6cb58eebd7..06f277cbc77 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/VassalsDuty.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/VassalsDuty.java @@ -65,7 +65,7 @@ public class VassalsDuty extends CardImpl { // {1}: The next 1 damage that would be dealt to target legendary creature you control this turn is dealt to you instead. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VassalsDutyPreventDamageTargetEffect(Duration.EndOfTurn, 1), new GenericManaCost(1)); - ability.addTarget(new TargetControlledCreaturePermanent(1,1,filter, false, true)); + ability.addTarget(new TargetControlledCreaturePermanent(1,1,filter, false)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Vigilance.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Vigilance.java index 9d04b7da095..e03a8346cbd 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/Vigilance.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Vigilance.java @@ -50,7 +50,7 @@ public class Vigilance extends CardImpl { this.expansionSetCode = "CHK"; this.subtype.add("Aura"); this.color.setWhite(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/WakingNightmare.java b/Mage.Sets/src/mage/sets/championsofkamigawa/WakingNightmare.java index 6ed2b4df8fb..d0945f24310 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/WakingNightmare.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/WakingNightmare.java @@ -47,7 +47,7 @@ public class WakingNightmare extends CardImpl { this.subtype.add("Arcane"); this.color.setBlack(true); this.getSpellAbility().addEffect(new DiscardTargetEffect(2)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public WakingNightmare (final WakingNightmare card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/WearAway.java b/Mage.Sets/src/mage/sets/championsofkamigawa/WearAway.java index b719e2e1da1..0c9160298f4 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/WearAway.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/WearAway.java @@ -59,7 +59,7 @@ public class WearAway extends CardImpl { // Destroy target artifact or enchantment. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - Target target = new TargetPermanent(filter, true); + Target target = new TargetPermanent(filter); target.setRequired(true); this.getSpellAbility().addTarget(target); // Splice onto Arcane {3}{G} diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/YoseiTheMorningStar.java b/Mage.Sets/src/mage/sets/championsofkamigawa/YoseiTheMorningStar.java index f700f3e3e1c..db2b2bac7fb 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/YoseiTheMorningStar.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/YoseiTheMorningStar.java @@ -69,7 +69,7 @@ public class YoseiTheMorningStar extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Yosei, the Morning Star dies, target player skips his or her next untap step. Tap up to five target permanents that player controls. Ability ability = new DiesTriggeredAbility(new SkipNextPlayerUntapStepEffect()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); ability.addTarget(new YoseiTheMorningStarTarget()); ability.addEffect(new YoseiTheMorningStarTapEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/coldsnap/AdarkarValkyrie.java b/Mage.Sets/src/mage/sets/coldsnap/AdarkarValkyrie.java index 01696a2a517..ac9f547e443 100644 --- a/Mage.Sets/src/mage/sets/coldsnap/AdarkarValkyrie.java +++ b/Mage.Sets/src/mage/sets/coldsnap/AdarkarValkyrie.java @@ -79,7 +79,7 @@ public class AdarkarValkyrie extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // {tap}: When target creature other than Adarkar Valkyrie dies this turn, return that card to the battlefield under your control. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AdarkarValkyrieEffect(), new TapSourceCost()); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); ability.addTarget(target); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/coldsnap/LightningStorm.java b/Mage.Sets/src/mage/sets/coldsnap/LightningStorm.java index d8e0b96466c..0b1081c0432 100644 --- a/Mage.Sets/src/mage/sets/coldsnap/LightningStorm.java +++ b/Mage.Sets/src/mage/sets/coldsnap/LightningStorm.java @@ -65,7 +65,7 @@ public class LightningStorm extends CardImpl { Effect effect = new DamageTargetEffect(new LightningStormCountCondition(CounterType.CHARGE)); effect.setText("{this} deals X damage to target creature or player, where X is 3 plus the number of charge counters on it"); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); // Discard a land card: Put two charge counters on Lightning Storm. You may choose a new target for it. Any player may activate this ability but only if Lightning Storm is on the stack. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.STACK, new LightningStormAddCounterEffect() , diff --git a/Mage.Sets/src/mage/sets/coldsnap/MouthOfRonom.java b/Mage.Sets/src/mage/sets/coldsnap/MouthOfRonom.java index d0a5b75f511..97e51075d93 100644 --- a/Mage.Sets/src/mage/sets/coldsnap/MouthOfRonom.java +++ b/Mage.Sets/src/mage/sets/coldsnap/MouthOfRonom.java @@ -56,7 +56,7 @@ public class MouthOfRonom extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {4}{snow}, {tap}, Sacrifice Mouth of Ronom: Mouth of Ronom deals 4 damage to target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4), new ManaCostsImpl("{4}{snow}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/commander/BasandraBattleSeraph.java b/Mage.Sets/src/mage/sets/commander/BasandraBattleSeraph.java index d73971ba665..e7b373b62a5 100644 --- a/Mage.Sets/src/mage/sets/commander/BasandraBattleSeraph.java +++ b/Mage.Sets/src/mage/sets/commander/BasandraBattleSeraph.java @@ -76,7 +76,7 @@ public class BasandraBattleSeraph extends CardImpl { // {R}: Target creature attacks this turn if able. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttacksIfAbleTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{R}")); ability.addEffect(new GainAbilityTargetEffect(AttacksThisTurnMarkerAbility.getInstance(), Duration.EndOfTurn, null)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/commander/BrionStoutarm.java b/Mage.Sets/src/mage/sets/commander/BrionStoutarm.java index ef62bb937da..7a8e091d960 100644 --- a/Mage.Sets/src/mage/sets/commander/BrionStoutarm.java +++ b/Mage.Sets/src/mage/sets/commander/BrionStoutarm.java @@ -79,7 +79,7 @@ public class BrionStoutarm extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BrionStoutarmEffect(), new ManaCostsImpl("{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1, filter, true))); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/commander/DeathByDragons.java b/Mage.Sets/src/mage/sets/commander/DeathByDragons.java index 566459d4407..798ec9c648e 100644 --- a/Mage.Sets/src/mage/sets/commander/DeathByDragons.java +++ b/Mage.Sets/src/mage/sets/commander/DeathByDragons.java @@ -56,7 +56,7 @@ public class DeathByDragons extends CardImpl { // Each player other than target player puts a 5/5 red Dragon creature token with flying onto the battlefield. this.getSpellAbility().addEffect(new DeathByDragonsEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public DeathByDragons(final DeathByDragons card) { diff --git a/Mage.Sets/src/mage/sets/commander/GhaveGuruOfSpores.java b/Mage.Sets/src/mage/sets/commander/GhaveGuruOfSpores.java index d7c2d235666..97629e8eb52 100644 --- a/Mage.Sets/src/mage/sets/commander/GhaveGuruOfSpores.java +++ b/Mage.Sets/src/mage/sets/commander/GhaveGuruOfSpores.java @@ -81,13 +81,13 @@ public class GhaveGuruOfSpores extends CardImpl { // {1}, Remove a +1/+1 counter from a creature you control: Put a 1/1 green Saproling creature token onto the battlefield. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new GenericManaCost(1)); - ability.addCost(new RemoveCounterCost(new TargetControlledCreaturePermanent(true), CounterType.P1P1)); + ability.addCost(new RemoveCounterCost(new TargetControlledCreaturePermanent(), CounterType.P1P1)); this.addAbility(ability); // {1}, Sacrifice a creature: Put a +1/+1 counter on target creature. Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(1)); ability2.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); - ability2.addTarget(new TargetCreaturePermanent(true)); + ability2.addTarget(new TargetCreaturePermanent()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/sets/commander/Invigorate.java b/Mage.Sets/src/mage/sets/commander/Invigorate.java index 05cf9f64e0a..a19f651258c 100644 --- a/Mage.Sets/src/mage/sets/commander/Invigorate.java +++ b/Mage.Sets/src/mage/sets/commander/Invigorate.java @@ -62,7 +62,7 @@ public class Invigorate extends CardImpl { this.addAbility(new AlternativeCostSourceAbility(new GainLifeOpponentCost(3), new ControlsPermanentCondition(filter))); // Target creature gets +4/+4 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(4,4,Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public Invigorate(final Invigorate card) { diff --git a/Mage.Sets/src/mage/sets/commander/MagmaticForce.java b/Mage.Sets/src/mage/sets/commander/MagmaticForce.java index f8d04e442b1..d77e8ea1e75 100644 --- a/Mage.Sets/src/mage/sets/commander/MagmaticForce.java +++ b/Mage.Sets/src/mage/sets/commander/MagmaticForce.java @@ -56,7 +56,7 @@ public class MagmaticForce extends CardImpl { // At the beginning of each upkeep, Magmatic Force deals 3 damage to target creature or player. Ability ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), TargetController.ANY, false); - ability.addTarget(new TargetCreatureOrPlayer(true)); + ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/commander/PerilousResearch.java b/Mage.Sets/src/mage/sets/commander/PerilousResearch.java index 17c535bacf7..56f7c118b48 100644 --- a/Mage.Sets/src/mage/sets/commander/PerilousResearch.java +++ b/Mage.Sets/src/mage/sets/commander/PerilousResearch.java @@ -88,7 +88,7 @@ class PerilousResearchEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); if (player != null) { - Target target = new TargetControlledPermanent(true); + Target target = new TargetControlledPermanent(); if (target.canChoose(player.getId(), game) && player.choose(Outcome.Sacrifice, target, source.getSourceId(), game)) { Permanent permanent = game.getPermanent(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/sets/commander/SewerNemesis.java b/Mage.Sets/src/mage/sets/commander/SewerNemesis.java index 740d8494a9c..601ef6360af 100644 --- a/Mage.Sets/src/mage/sets/commander/SewerNemesis.java +++ b/Mage.Sets/src/mage/sets/commander/SewerNemesis.java @@ -105,7 +105,7 @@ class SewerNemesisChoosePlayerEffect extends OneShotEffect { Player player = game.getPlayer(source.getControllerId()); Permanent permanent = game.getPermanent(source.getSourceId()); if (player != null && permanent != null) { - TargetPlayer target = new TargetPlayer(true); + TargetPlayer target = new TargetPlayer(); target.setRequired(true); if (player.choose(this.outcome, target, source.getSourceId(), game)) { Player chosenPlayer = game.getPlayer(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/sets/commander/Shriekmaw.java b/Mage.Sets/src/mage/sets/commander/Shriekmaw.java index 94c627ba219..d8b63b017b0 100644 --- a/Mage.Sets/src/mage/sets/commander/Shriekmaw.java +++ b/Mage.Sets/src/mage/sets/commander/Shriekmaw.java @@ -72,7 +72,7 @@ public class Shriekmaw extends CardImpl { // When Shriekmaw enters the battlefield, destroy target nonartifact, nonblack creature. Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(),false); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/commander/Spitebellows.java b/Mage.Sets/src/mage/sets/commander/Spitebellows.java index dcba6deb621..48d0d232205 100644 --- a/Mage.Sets/src/mage/sets/commander/Spitebellows.java +++ b/Mage.Sets/src/mage/sets/commander/Spitebellows.java @@ -55,7 +55,7 @@ public class Spitebellows extends CardImpl { // When Spitebellows leaves the battlefield, it deals 6 damage to target creature. Ability ability = new LeavesBattlefieldTriggeredAbility(new DamageTargetEffect(6), false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Evoke {1}{R}{R} this.addAbility(new EvokeAbility(this, "{1}{R}{R}")); diff --git a/Mage.Sets/src/mage/sets/commander/VishKalBloodArbiter.java b/Mage.Sets/src/mage/sets/commander/VishKalBloodArbiter.java index 0ca0a7915b1..415c11cc8e6 100644 --- a/Mage.Sets/src/mage/sets/commander/VishKalBloodArbiter.java +++ b/Mage.Sets/src/mage/sets/commander/VishKalBloodArbiter.java @@ -83,7 +83,7 @@ public class VishKalBloodArbiter extends CardImpl { // Remove all +1/+1 counters from Vish Kal: Target creature gets -1/-1 until end of turn for each +1/+1 counter removed this way. DynamicValue removedCounters = new SignInversionDynamicValue(new VishKalBloodArbiterDynamicValue()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(removedCounters, removedCounters, Duration.EndOfTurn), new VishKalBloodArbiterCost(CounterType.P1P1.createInstance())); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/commander/VowOfDuty.java b/Mage.Sets/src/mage/sets/commander/VowOfDuty.java index 69014cae08b..feada9e05de 100644 --- a/Mage.Sets/src/mage/sets/commander/VowOfDuty.java +++ b/Mage.Sets/src/mage/sets/commander/VowOfDuty.java @@ -61,7 +61,7 @@ public class VowOfDuty extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/commander/VowOfFlight.java b/Mage.Sets/src/mage/sets/commander/VowOfFlight.java index 15fe15d6ce7..6202125302f 100644 --- a/Mage.Sets/src/mage/sets/commander/VowOfFlight.java +++ b/Mage.Sets/src/mage/sets/commander/VowOfFlight.java @@ -61,7 +61,7 @@ public class VowOfFlight extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/commander/VowOfLightning.java b/Mage.Sets/src/mage/sets/commander/VowOfLightning.java index 916fc8e55ee..23cb6614b71 100644 --- a/Mage.Sets/src/mage/sets/commander/VowOfLightning.java +++ b/Mage.Sets/src/mage/sets/commander/VowOfLightning.java @@ -61,7 +61,7 @@ public class VowOfLightning extends CardImpl { this.color.setRed(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/commander/VowOfMalice.java b/Mage.Sets/src/mage/sets/commander/VowOfMalice.java index c396007ed62..dddfbb23f57 100644 --- a/Mage.Sets/src/mage/sets/commander/VowOfMalice.java +++ b/Mage.Sets/src/mage/sets/commander/VowOfMalice.java @@ -61,7 +61,7 @@ public class VowOfMalice extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/commander/VowOfWildness.java b/Mage.Sets/src/mage/sets/commander/VowOfWildness.java index 6ecfd860a17..2818d19cfe7 100644 --- a/Mage.Sets/src/mage/sets/commander/VowOfWildness.java +++ b/Mage.Sets/src/mage/sets/commander/VowOfWildness.java @@ -61,7 +61,7 @@ public class VowOfWildness extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/commander2013/ActOfAuthority.java b/Mage.Sets/src/mage/sets/commander2013/ActOfAuthority.java index 85c1aaef7b0..964f672413f 100644 --- a/Mage.Sets/src/mage/sets/commander2013/ActOfAuthority.java +++ b/Mage.Sets/src/mage/sets/commander2013/ActOfAuthority.java @@ -71,11 +71,11 @@ public class ActOfAuthority extends CardImpl { // When Act of Authority enters the battlefield, you may exile target artifact or enchantment. Ability ability = new EntersBattlefieldTriggeredAbility(new ExileTargetEffect(), true); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); // At the beginning of your upkeep, you may exile target artifact or enchantment. If you do, its controller gains control of Act of Authority. ability = new BeginningOfUpkeepTriggeredAbility(new ActOfAuthorityEffect(), TargetController.YOU, true); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/commander2013/AngelOfFinality.java b/Mage.Sets/src/mage/sets/commander2013/AngelOfFinality.java index 23b6e3ec359..8a8531e341d 100644 --- a/Mage.Sets/src/mage/sets/commander2013/AngelOfFinality.java +++ b/Mage.Sets/src/mage/sets/commander2013/AngelOfFinality.java @@ -57,7 +57,7 @@ public class AngelOfFinality extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Angel of Finality enters the battlefield, exile all cards from target player's graveyard. Ability ability = new EntersBattlefieldTriggeredAbility(new ExileGraveyardAllTargetPlayerEffect()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/commander2013/Borrowing100000Arrows.java b/Mage.Sets/src/mage/sets/commander2013/Borrowing100000Arrows.java index 0c0fc4bbf66..8f0345df155 100644 --- a/Mage.Sets/src/mage/sets/commander2013/Borrowing100000Arrows.java +++ b/Mage.Sets/src/mage/sets/commander2013/Borrowing100000Arrows.java @@ -56,7 +56,7 @@ public class Borrowing100000Arrows extends CardImpl { // Draw a card for each tapped creature target opponent controls. this.getSpellAbility().addEffect(new Borrowing100000ArrowsEffect()); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); } public Borrowing100000Arrows(final Borrowing100000Arrows card) { diff --git a/Mage.Sets/src/mage/sets/commander2013/CrosissCharm.java b/Mage.Sets/src/mage/sets/commander2013/CrosissCharm.java index 7586de0e02b..81fbc832244 100644 --- a/Mage.Sets/src/mage/sets/commander2013/CrosissCharm.java +++ b/Mage.Sets/src/mage/sets/commander2013/CrosissCharm.java @@ -64,11 +64,11 @@ public class CrosissCharm extends CardImpl { // Choose one - Return target permanent to its owner's hand; this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(true)); + this.getSpellAbility().addTarget(new TargetPermanent()); // or destroy target nonblack creature, and it can't be regenerated; Mode mode = new Mode(); mode.getEffects().add(new DestroyTargetEffect(true)); - mode.getTargets().add(new TargetCreaturePermanent(filter, true)); + mode.getTargets().add(new TargetCreaturePermanent(filter)); this.getSpellAbility().addMode(mode); // or destroy target artifact. mode = new Mode(); diff --git a/Mage.Sets/src/mage/sets/commander2013/CurseOfChaos.java b/Mage.Sets/src/mage/sets/commander2013/CurseOfChaos.java index fd6c4506c87..16f9688bc06 100644 --- a/Mage.Sets/src/mage/sets/commander2013/CurseOfChaos.java +++ b/Mage.Sets/src/mage/sets/commander2013/CurseOfChaos.java @@ -62,7 +62,7 @@ public class CurseOfChaos extends CardImpl { this.color.setRed(true); // Enchant player - TargetPlayer auraTarget = new TargetPlayer(true); + TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.DrawCard)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/commander2013/CurseOfInertia.java b/Mage.Sets/src/mage/sets/commander2013/CurseOfInertia.java index 05d7bc77a96..da6f61eaf5b 100644 --- a/Mage.Sets/src/mage/sets/commander2013/CurseOfInertia.java +++ b/Mage.Sets/src/mage/sets/commander2013/CurseOfInertia.java @@ -64,7 +64,7 @@ public class CurseOfInertia extends CardImpl { this.color.setBlue(true); // Enchant player - TargetPlayer auraTarget = new TargetPlayer(true); + TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); @@ -140,7 +140,7 @@ class CurseOfInertiaTapOrUntapTargetEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player player = game.getPlayer(this.getTargetPointer().getFirst(game, source)); if (player != null) { - Target target = new TargetPermanent(true); + Target target = new TargetPermanent(); if (target.canChoose(source.getSourceId(), player.getId(), game) && player.choose(outcome, target, source.getSourceId(), game)) { Permanent targetPermanent = game.getPermanent(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/sets/commander2013/CurseOfPredation.java b/Mage.Sets/src/mage/sets/commander2013/CurseOfPredation.java index b4e6c328a27..4b91960f4ad 100644 --- a/Mage.Sets/src/mage/sets/commander2013/CurseOfPredation.java +++ b/Mage.Sets/src/mage/sets/commander2013/CurseOfPredation.java @@ -62,7 +62,7 @@ public class CurseOfPredation extends CardImpl { this.color.setGreen(true); // Enchant player - TargetPlayer auraTarget = new TargetPlayer(true); + TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/commander2013/CurseOfShallowGraves.java b/Mage.Sets/src/mage/sets/commander2013/CurseOfShallowGraves.java index ee16d4d692b..56d07f1883c 100644 --- a/Mage.Sets/src/mage/sets/commander2013/CurseOfShallowGraves.java +++ b/Mage.Sets/src/mage/sets/commander2013/CurseOfShallowGraves.java @@ -63,7 +63,7 @@ public class CurseOfShallowGraves extends CardImpl { this.color.setBlack(true); // Enchant player - TargetPlayer auraTarget = new TargetPlayer(true); + TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/commander2013/CurseOfTheForsaken.java b/Mage.Sets/src/mage/sets/commander2013/CurseOfTheForsaken.java index 115e28d8eb5..abd59413a12 100644 --- a/Mage.Sets/src/mage/sets/commander2013/CurseOfTheForsaken.java +++ b/Mage.Sets/src/mage/sets/commander2013/CurseOfTheForsaken.java @@ -61,7 +61,7 @@ public class CurseOfTheForsaken extends CardImpl { this.color.setWhite(true); // Enchant player - TargetPlayer auraTarget = new TargetPlayer(true); + TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainLife)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/commander2013/DarksteelMutation.java b/Mage.Sets/src/mage/sets/commander2013/DarksteelMutation.java index aad34e768bf..8379e4ba922 100644 --- a/Mage.Sets/src/mage/sets/commander2013/DarksteelMutation.java +++ b/Mage.Sets/src/mage/sets/commander2013/DarksteelMutation.java @@ -59,7 +59,7 @@ public class DarksteelMutation extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/commander2013/DeepfireElemental.java b/Mage.Sets/src/mage/sets/commander2013/DeepfireElemental.java index 09db9863fb7..e834bb04a36 100644 --- a/Mage.Sets/src/mage/sets/commander2013/DeepfireElemental.java +++ b/Mage.Sets/src/mage/sets/commander2013/DeepfireElemental.java @@ -69,7 +69,7 @@ public class DeepfireElemental extends CardImpl { // {X}{X}{1}: Destroy target artifact or creature with converted mana cost X. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{X}{X}{1}")); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/commander2013/DereviEmpyrialTactician.java b/Mage.Sets/src/mage/sets/commander2013/DereviEmpyrialTactician.java index 74b3f1525e6..1e80821b35a 100644 --- a/Mage.Sets/src/mage/sets/commander2013/DereviEmpyrialTactician.java +++ b/Mage.Sets/src/mage/sets/commander2013/DereviEmpyrialTactician.java @@ -73,7 +73,7 @@ public class DereviEmpyrialTactician extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Whenever Derevi, Empyrial Tactician enters the battlefield or a creature you control deals combat damage to a player, you may tap or untap target permanent. Ability ability = new DereviEmpyrialTacticianTriggeredAbility(new MayTapOrUntapTargetEffect()); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); this.addAbility(ability); // {1}{G}{W}{U}: Put Derevi onto the battlefield from the command zone. diff --git a/Mage.Sets/src/mage/sets/commander2013/DromarsCharm.java b/Mage.Sets/src/mage/sets/commander2013/DromarsCharm.java index 0b05c50f266..1ddd8fdf69f 100644 --- a/Mage.Sets/src/mage/sets/commander2013/DromarsCharm.java +++ b/Mage.Sets/src/mage/sets/commander2013/DromarsCharm.java @@ -61,7 +61,7 @@ public class DromarsCharm extends CardImpl { this.getSpellAbility().addMode(mode); mode = new Mode(); mode.getEffects().add(new BoostTargetEffect(-2, -2, Duration.EndOfTurn)); - mode.getTargets().add(new TargetCreaturePermanent(true)); + mode.getTargets().add(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/sets/commander2013/FellShepherd.java b/Mage.Sets/src/mage/sets/commander2013/FellShepherd.java index ca61a130eeb..9dde2f1e310 100644 --- a/Mage.Sets/src/mage/sets/commander2013/FellShepherd.java +++ b/Mage.Sets/src/mage/sets/commander2013/FellShepherd.java @@ -84,7 +84,7 @@ public class FellShepherd extends CardImpl { // {B}, Sacrifice another creature: Target creature gets -2/-2 until end of turn. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2,-2, Duration.EndOfTurn), new ManaCostsImpl("{B}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false))); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/commander2013/Flickerform.java b/Mage.Sets/src/mage/sets/commander2013/Flickerform.java index e971432f934..5d3605e1c41 100644 --- a/Mage.Sets/src/mage/sets/commander2013/Flickerform.java +++ b/Mage.Sets/src/mage/sets/commander2013/Flickerform.java @@ -70,7 +70,7 @@ public class Flickerform extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/commander2013/IncendiaryCommand.java b/Mage.Sets/src/mage/sets/commander2013/IncendiaryCommand.java index ae37f640d62..e99ed65c11f 100644 --- a/Mage.Sets/src/mage/sets/commander2013/IncendiaryCommand.java +++ b/Mage.Sets/src/mage/sets/commander2013/IncendiaryCommand.java @@ -61,7 +61,7 @@ public class IncendiaryCommand extends CardImpl { this.getSpellAbility().getModes().setMaxModes(2); // Incendiary Command deals 4 damage to target player; this.getSpellAbility().addEffect(new DamageTargetEffect(4)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); // or Incendiary Command deals 2 damage to each creature; Mode mode = new Mode(); mode.getEffects().add(new DamageAllEffect(2, new FilterCreaturePermanent())); diff --git a/Mage.Sets/src/mage/sets/commander2013/MagusOfTheArena.java b/Mage.Sets/src/mage/sets/commander2013/MagusOfTheArena.java index 17bf58391fd..b4b3d466376 100644 --- a/Mage.Sets/src/mage/sets/commander2013/MagusOfTheArena.java +++ b/Mage.Sets/src/mage/sets/commander2013/MagusOfTheArena.java @@ -67,7 +67,7 @@ public class MagusOfTheArena extends CardImpl { // {3}, {tap}: Tap target creature you control and target creature of an opponent's choice he or she controls. Those creatures fight each other. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MagusOfTheArenaEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); ability.addTarget(new TargetOpponentsChoiceControlledCreaturePermanent()); this.addAbility(ability); } @@ -155,7 +155,7 @@ class TargetOpponentsChoiceControlledCreaturePermanent extends TargetPermanent { private UUID getOpponentId(UUID playerId, Ability source, Game game) { if (opponentId == null) { - TargetOpponent target = new TargetOpponent(true); + TargetOpponent target = new TargetOpponent(); Player player = game.getPlayer(playerId); if (player != null) { if (player.chooseTarget(Outcome.Detriment, target, source, game)) { diff --git a/Mage.Sets/src/mage/sets/commander2013/MarathWillOfTheWild.java b/Mage.Sets/src/mage/sets/commander2013/MarathWillOfTheWild.java index 420dba175ee..f4767a015ca 100644 --- a/Mage.Sets/src/mage/sets/commander2013/MarathWillOfTheWild.java +++ b/Mage.Sets/src/mage/sets/commander2013/MarathWillOfTheWild.java @@ -86,12 +86,12 @@ public class MarathWillOfTheWild extends CardImpl { effect.setText("Put X +1/+1 counters on target creature"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{X}")); ability.addCost(new MarathWillOfTheWildRemoveCountersCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); // or Marath deals X damage to target creature or player; Mode mode = new Mode(); mode.getEffects().add(new DamageTargetEffect(new ManacostVariableValue())); - mode.getTargets().add(new TargetCreatureOrPlayer(true)); + mode.getTargets().add(new TargetCreatureOrPlayer()); ability.addMode(mode); // or put an X/X green Elemental creature token onto the battlefield. diff --git a/Mage.Sets/src/mage/sets/commander2013/OrderOfSuccession.java b/Mage.Sets/src/mage/sets/commander2013/OrderOfSuccession.java index c8d5a643bb9..7ecd2b566fb 100644 --- a/Mage.Sets/src/mage/sets/commander2013/OrderOfSuccession.java +++ b/Mage.Sets/src/mage/sets/commander2013/OrderOfSuccession.java @@ -119,7 +119,7 @@ class OrderOfSuccessionEffect extends OneShotEffect { if (currentPlayer != null && controller.getInRange().contains(currentPlayer.getId())) { FilterCreaturePermanent filter = new FilterCreaturePermanent(new StringBuilder("creature controlled by ").append(nextPlayer.getName()).toString()); filter.add(new ControllerIdPredicate(nextPlayer.getId())); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setNotTarget(false); if (target.canChoose(source.getSourceId(), currentPlayer.getId(), game)) { if (currentPlayer.chooseTarget(outcome, target, source, game)) { diff --git a/Mage.Sets/src/mage/sets/commander2013/PresenceOfGond.java b/Mage.Sets/src/mage/sets/commander2013/PresenceOfGond.java index 32de01f244a..ab755b0a42a 100644 --- a/Mage.Sets/src/mage/sets/commander2013/PresenceOfGond.java +++ b/Mage.Sets/src/mage/sets/commander2013/PresenceOfGond.java @@ -61,7 +61,7 @@ public class PresenceOfGond extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutCreatureInPlay)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/commander2013/Reincarnation.java b/Mage.Sets/src/mage/sets/commander2013/Reincarnation.java index 14cfd3a4a49..0f490d41e16 100644 --- a/Mage.Sets/src/mage/sets/commander2013/Reincarnation.java +++ b/Mage.Sets/src/mage/sets/commander2013/Reincarnation.java @@ -64,7 +64,7 @@ public class Reincarnation extends CardImpl { // Choose target creature. When that creature dies this turn, return a creature card from its owner's graveyard to the battlefield under the control of that creature's owner. this.getSpellAbility().addEffect(new ReincarnationEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public Reincarnation(final Reincarnation card) { diff --git a/Mage.Sets/src/mage/sets/commander2013/RoonOfTheHiddenRealm.java b/Mage.Sets/src/mage/sets/commander2013/RoonOfTheHiddenRealm.java index ecb693146b3..1879f7174ec 100644 --- a/Mage.Sets/src/mage/sets/commander2013/RoonOfTheHiddenRealm.java +++ b/Mage.Sets/src/mage/sets/commander2013/RoonOfTheHiddenRealm.java @@ -80,7 +80,7 @@ public class RoonOfTheHiddenRealm extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // {2}, {tap}: Exile another target creature. Return that card to the battlefield under its owner's control at the beginning of the next end step. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RoonOfTheHiddenRealmEffect(), new GenericManaCost(2)); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/commander2013/RubiniaSoulsinger.java b/Mage.Sets/src/mage/sets/commander2013/RubiniaSoulsinger.java index 40512757398..3fd9ab317a1 100644 --- a/Mage.Sets/src/mage/sets/commander2013/RubiniaSoulsinger.java +++ b/Mage.Sets/src/mage/sets/commander2013/RubiniaSoulsinger.java @@ -71,7 +71,7 @@ public class RubiniaSoulsinger extends CardImpl { new RubiniaSoulsingerCondition(), "Gain control of target creature for as long as you control Rubinia and Rubinia remains tapped"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/commander2013/SereneMaster.java b/Mage.Sets/src/mage/sets/commander2013/SereneMaster.java index 88f9d8af545..1c8d27ef842 100644 --- a/Mage.Sets/src/mage/sets/commander2013/SereneMaster.java +++ b/Mage.Sets/src/mage/sets/commander2013/SereneMaster.java @@ -102,7 +102,7 @@ class SereneMasterEffect extends OneShotEffect { if (controller != null && sourceCreature != null) { FilterCreaturePermanent filter = new FilterCreaturePermanent("creature it's blocking"); filter.add(new BlockedByIdPredicate((source.getSourceId()))); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); if (target.canChoose(source.getSourceId(), controller.getId(), game)) { if (controller.chooseTarget(outcome, target, source, game)) { Permanent attackingCreature = game.getPermanent(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/sets/commander2013/ShattergangBrothers.java b/Mage.Sets/src/mage/sets/commander2013/ShattergangBrothers.java index 4f37e43e54d..d7e750463d5 100644 --- a/Mage.Sets/src/mage/sets/commander2013/ShattergangBrothers.java +++ b/Mage.Sets/src/mage/sets/commander2013/ShattergangBrothers.java @@ -74,7 +74,7 @@ public class ShattergangBrothers extends CardImpl { // {2}{B}, Sacrifice a creature: Each other player sacrifices a creature. FilterControlledCreaturePermanent filterCreature = new FilterControlledCreaturePermanent("a creature"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShattergangBrothersEffect(filterCreature), new ManaCostsImpl("{2}{B}")); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1, filterCreature, true, true))); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1, filterCreature, true))); this.addAbility(ability); // {2}{R}, Sacrifice an artifact: Each other player sacrifices an artifact. FilterControlledPermanent filter = new FilterControlledArtifactPermanent("an artifact"); diff --git a/Mage.Sets/src/mage/sets/commander2013/StalkingVengeance.java b/Mage.Sets/src/mage/sets/commander2013/StalkingVengeance.java index 11b7ffef30c..6e3d11c7ba9 100644 --- a/Mage.Sets/src/mage/sets/commander2013/StalkingVengeance.java +++ b/Mage.Sets/src/mage/sets/commander2013/StalkingVengeance.java @@ -72,7 +72,7 @@ public class StalkingVengeance extends CardImpl { this.addAbility(HasteAbility.getInstance()); // Whenever another creature you control dies, it deals damage equal to its power to target player. Ability ability = new DiesCreatureTriggeredAbility(new StalkingVengeanceDamageEffect(), false, filter, true); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/commander2013/Stonecloaker.java b/Mage.Sets/src/mage/sets/commander2013/Stonecloaker.java index 26e0b049716..2106c1a052a 100644 --- a/Mage.Sets/src/mage/sets/commander2013/Stonecloaker.java +++ b/Mage.Sets/src/mage/sets/commander2013/Stonecloaker.java @@ -62,11 +62,11 @@ public class Stonecloaker extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Stonecloaker enters the battlefield, return a creature you control to its owner's hand. Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect(), false); - ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); // When Stonecloaker enters the battlefield, exile target card from a graveyard. ability = new EntersBattlefieldTriggeredAbility(new ExileTargetEffect(), false); - ability.addTarget(new TargetCardInGraveyard(true)); + ability.addTarget(new TargetCardInGraveyard()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/commander2013/StormscapeBattlemage.java b/Mage.Sets/src/mage/sets/commander2013/StormscapeBattlemage.java index 26eaf256129..191612f7893 100644 --- a/Mage.Sets/src/mage/sets/commander2013/StormscapeBattlemage.java +++ b/Mage.Sets/src/mage/sets/commander2013/StormscapeBattlemage.java @@ -79,7 +79,7 @@ public class StormscapeBattlemage extends CardImpl { // When Stormscape Battlemage enters the battlefield, if it was kicked with its {2}{B} kicker, destroy target nonblack creature. That creature can't be regenerated. TriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(true),false); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(new ConditionalTriggeredAbility( ability, new KickedCostCondition("{2}{B}"), "When Stormscape Battlemage enters the battlefield, if it was kicked with its {2}{B} kicker, destroy target nonblack creature. That creature can't be regenerated.")); diff --git a/Mage.Sets/src/mage/sets/commander2013/SydriGalvanicGenius.java b/Mage.Sets/src/mage/sets/commander2013/SydriGalvanicGenius.java index 3ee78a38223..76f137da6b6 100644 --- a/Mage.Sets/src/mage/sets/commander2013/SydriGalvanicGenius.java +++ b/Mage.Sets/src/mage/sets/commander2013/SydriGalvanicGenius.java @@ -84,14 +84,14 @@ public class SydriGalvanicGenius extends CardImpl { // {U}: Target noncreature artifact becomes an artifact creature with power and toughness each equal to its converted mana cost until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SydriGalvanicGeniusEffect(), new ManaCostsImpl("{U")); - ability.addTarget(new TargetPermanent(filterNonCreature, true)); + ability.addTarget(new TargetPermanent(filterNonCreature)); this.addAbility(ability); // {W}{B}: Target artifact creature gains deathtouch and lifelink until end of turn. Effect effect = new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn, "Target artifact creature gains deathtouch"); ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{W}{B}")); ability.addEffect(new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn, "and lifelink until end of turn")); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/commander2013/TemptWithReflections.java b/Mage.Sets/src/mage/sets/commander2013/TemptWithReflections.java index c7c17fb8bc4..717eab9f9f9 100644 --- a/Mage.Sets/src/mage/sets/commander2013/TemptWithReflections.java +++ b/Mage.Sets/src/mage/sets/commander2013/TemptWithReflections.java @@ -59,7 +59,7 @@ public class TemptWithReflections extends CardImpl { // Tempting offer - Choose target creature you control. Put a token onto the battlefield that's a copy of that creature. Each opponent may put a token onto the battlefield that's a copy of that creature. For each opponent who does, put a token onto the battlefield that's a copy of that creature. this.getSpellAbility().addEffect(new TemptWithReflectionsEffect()); - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); } public TemptWithReflections(final TemptWithReflections card) { diff --git a/Mage.Sets/src/mage/sets/commander2013/ThousandYearElixir.java b/Mage.Sets/src/mage/sets/commander2013/ThousandYearElixir.java index c15a784aed9..21b5c79759e 100644 --- a/Mage.Sets/src/mage/sets/commander2013/ThousandYearElixir.java +++ b/Mage.Sets/src/mage/sets/commander2013/ThousandYearElixir.java @@ -62,7 +62,7 @@ public class ThousandYearElixir extends CardImpl { // {1}, {tap}: Untap target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/commander2013/TidalForce.java b/Mage.Sets/src/mage/sets/commander2013/TidalForce.java index 48069e097d9..dc6bb1f5963 100644 --- a/Mage.Sets/src/mage/sets/commander2013/TidalForce.java +++ b/Mage.Sets/src/mage/sets/commander2013/TidalForce.java @@ -55,7 +55,7 @@ public class TidalForce extends CardImpl { // At the beginning of each upkeep, you may tap or untap target permanent. Ability ability = new BeginningOfUpkeepTriggeredAbility(new MayTapOrUntapTargetEffect(), TargetController.ANY, false); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/commander2013/TrueNameNemesis.java b/Mage.Sets/src/mage/sets/commander2013/TrueNameNemesis.java index ca8842e1814..83c42ddf6c8 100644 --- a/Mage.Sets/src/mage/sets/commander2013/TrueNameNemesis.java +++ b/Mage.Sets/src/mage/sets/commander2013/TrueNameNemesis.java @@ -106,7 +106,7 @@ class TrueNameNemesisChoosePlayerEffect extends OneShotEffect { Player player = game.getPlayer(source.getControllerId()); Permanent permanent = game.getPermanent(source.getSourceId()); if (player != null && permanent != null) { - TargetPlayer target = new TargetPlayer(true); + TargetPlayer target = new TargetPlayer(); if (player.choose(this.outcome, target, source.getSourceId(), game)) { Player chosenPlayer = game.getPlayer(target.getFirstTarget()); if (chosenPlayer != null) { diff --git a/Mage.Sets/src/mage/sets/commander2013/UnexpectedlyAbsent.java b/Mage.Sets/src/mage/sets/commander2013/UnexpectedlyAbsent.java index 9ac257296d8..888921c95ed 100644 --- a/Mage.Sets/src/mage/sets/commander2013/UnexpectedlyAbsent.java +++ b/Mage.Sets/src/mage/sets/commander2013/UnexpectedlyAbsent.java @@ -70,7 +70,7 @@ public class UnexpectedlyAbsent extends CardImpl { // Put target nonland permanent into its owner's library just beneath the top X cards of that library. this.getSpellAbility().addEffect(new UnexpectedlyAbsentEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); } diff --git a/Mage.Sets/src/mage/sets/commander2013/WitchHunt.java b/Mage.Sets/src/mage/sets/commander2013/WitchHunt.java index ac29ae175b7..2e65103c50a 100644 --- a/Mage.Sets/src/mage/sets/commander2013/WitchHunt.java +++ b/Mage.Sets/src/mage/sets/commander2013/WitchHunt.java @@ -67,7 +67,7 @@ public class WitchHunt extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new DamageControllerEffect(4), TargetController.YOU, false)); // At the beginning of your end step, target opponent chosen at random gains control of Witch Hunt. Ability ability = new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new WitchHuntEffect(), TargetController.YOU, null, false); - Target target = new TargetOpponent(true); + Target target = new TargetOpponent(); target.setRandom(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/conflux/AbsorbVis.java b/Mage.Sets/src/mage/sets/conflux/AbsorbVis.java index 4a2022d5568..51c6dfb78a2 100644 --- a/Mage.Sets/src/mage/sets/conflux/AbsorbVis.java +++ b/Mage.Sets/src/mage/sets/conflux/AbsorbVis.java @@ -50,7 +50,7 @@ public class AbsorbVis extends CardImpl { this.color.setBlack(true); this.getSpellAbility().addEffect(new LoseLifeTargetEffect(4)); this.getSpellAbility().addEffect(new GainLifeEffect(4)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.addAbility(new BasicLandcyclingAbility(new ManaCostsImpl("{1}{B}"))); } diff --git a/Mage.Sets/src/mage/sets/conflux/AshasFavor.java b/Mage.Sets/src/mage/sets/conflux/AshasFavor.java index d01a0ce95be..57a78a46c66 100644 --- a/Mage.Sets/src/mage/sets/conflux/AshasFavor.java +++ b/Mage.Sets/src/mage/sets/conflux/AshasFavor.java @@ -55,7 +55,7 @@ public class AshasFavor extends CardImpl { this.subtype.add("Aura"); this.color.setWhite(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/conflux/BeaconBehemoth.java b/Mage.Sets/src/mage/sets/conflux/BeaconBehemoth.java index f9827886282..a919c2b1825 100644 --- a/Mage.Sets/src/mage/sets/conflux/BeaconBehemoth.java +++ b/Mage.Sets/src/mage/sets/conflux/BeaconBehemoth.java @@ -66,7 +66,7 @@ public class BeaconBehemoth extends CardImpl { this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}")); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/conflux/CelestialPurge.java b/Mage.Sets/src/mage/sets/conflux/CelestialPurge.java index 5da8b7fcb38..039bafee37e 100644 --- a/Mage.Sets/src/mage/sets/conflux/CelestialPurge.java +++ b/Mage.Sets/src/mage/sets/conflux/CelestialPurge.java @@ -57,7 +57,7 @@ public class CelestialPurge extends CardImpl { super(ownerId, 5, "Celestial Purge", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "CON"; this.color.setWhite(true); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new ExileTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/conflux/ConstrictingTendrils.java b/Mage.Sets/src/mage/sets/conflux/ConstrictingTendrils.java index 1d5322327cd..c75809741a5 100644 --- a/Mage.Sets/src/mage/sets/conflux/ConstrictingTendrils.java +++ b/Mage.Sets/src/mage/sets/conflux/ConstrictingTendrils.java @@ -48,7 +48,7 @@ public class ConstrictingTendrils extends CardImpl { super(ownerId, 22, "Constricting Tendrils", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "CON"; this.color.setBlue(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(-3, 0, Duration.EndOfTurn)); this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); } diff --git a/Mage.Sets/src/mage/sets/conflux/ControlledInstincts.java b/Mage.Sets/src/mage/sets/conflux/ControlledInstincts.java index 7e1f8cdb4eb..1c48a2fddc0 100644 --- a/Mage.Sets/src/mage/sets/conflux/ControlledInstincts.java +++ b/Mage.Sets/src/mage/sets/conflux/ControlledInstincts.java @@ -66,7 +66,7 @@ public class ControlledInstincts extends CardImpl { this.color.setBlue(true); // Enchant red or green creature - TargetPermanent auraTarget = new TargetCreaturePermanent(filter, true); + TargetPermanent auraTarget = new TargetCreaturePermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/conflux/DarkTemper.java b/Mage.Sets/src/mage/sets/conflux/DarkTemper.java index 99599ffd21a..10d2c3b8bb7 100644 --- a/Mage.Sets/src/mage/sets/conflux/DarkTemper.java +++ b/Mage.Sets/src/mage/sets/conflux/DarkTemper.java @@ -56,7 +56,7 @@ public class DarkTemper extends CardImpl { // Dark Temper deals 2 damage to target creature. If you control a black permanent, destroy the creature instead. this.getSpellAbility().addEffect(new DarkTemperEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public DarkTemper(final DarkTemper card) { diff --git a/Mage.Sets/src/mage/sets/conflux/DragDown.java b/Mage.Sets/src/mage/sets/conflux/DragDown.java index 0afb776ca8b..90189125568 100644 --- a/Mage.Sets/src/mage/sets/conflux/DragDown.java +++ b/Mage.Sets/src/mage/sets/conflux/DragDown.java @@ -50,7 +50,7 @@ public class DragDown extends CardImpl { // Domain - Target creature gets -1/-1 until end of turn for each basic land type among lands you control. this.getSpellAbility().addEffect(new BoostTargetEffect(new DomainValue(-1), new DomainValue(-1), Duration.EndOfTurn, true)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public DragDown(final DragDown card) { diff --git a/Mage.Sets/src/mage/sets/conflux/ElderMastery.java b/Mage.Sets/src/mage/sets/conflux/ElderMastery.java index cde9cefbf93..5293e1c020b 100644 --- a/Mage.Sets/src/mage/sets/conflux/ElderMastery.java +++ b/Mage.Sets/src/mage/sets/conflux/ElderMastery.java @@ -59,7 +59,7 @@ public class ElderMastery extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/conflux/EtherswornAdjudicator.java b/Mage.Sets/src/mage/sets/conflux/EtherswornAdjudicator.java index 0f334a8470b..1f490d4c0e2 100644 --- a/Mage.Sets/src/mage/sets/conflux/EtherswornAdjudicator.java +++ b/Mage.Sets/src/mage/sets/conflux/EtherswornAdjudicator.java @@ -75,7 +75,7 @@ public class EtherswornAdjudicator extends CardImpl { // {1}{W}{B}, {T}: Destroy target creature or enchantment. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{W}{B}")); ability.addCost(new TapSourceCost()); - Target target = new TargetPermanent(filter, true); + Target target = new TargetPermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/conflux/ExplodingBorders.java b/Mage.Sets/src/mage/sets/conflux/ExplodingBorders.java index 28b49869f80..2cc9e455857 100644 --- a/Mage.Sets/src/mage/sets/conflux/ExplodingBorders.java +++ b/Mage.Sets/src/mage/sets/conflux/ExplodingBorders.java @@ -54,7 +54,7 @@ public class ExplodingBorders extends CardImpl { // Domain - Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle your library. Exploding Borders deals X damage to target player, where X is the number of basic land types among lands you control. this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterBasicLandCard()), true)); this.getSpellAbility().addEffect(new DamageTargetEffect(new DomainValue())); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public ExplodingBorders(final ExplodingBorders card) { diff --git a/Mage.Sets/src/mage/sets/conflux/ExtractorDemon.java b/Mage.Sets/src/mage/sets/conflux/ExtractorDemon.java index 998a2b29445..04b40080bd7 100644 --- a/Mage.Sets/src/mage/sets/conflux/ExtractorDemon.java +++ b/Mage.Sets/src/mage/sets/conflux/ExtractorDemon.java @@ -61,7 +61,7 @@ public class ExtractorDemon extends CardImpl { // Whenever another creature leaves the battlefield, you may have target player put the top two cards of his or her library into his or her graveyard. Ability ability = new DiesCreatureTriggeredAbility(new PutLibraryIntoGraveTargetEffect(2), true, true, false); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); // Unearth {2}{B} diff --git a/Mage.Sets/src/mage/sets/conflux/FieryFall.java b/Mage.Sets/src/mage/sets/conflux/FieryFall.java index c7e73a081e7..ef30a2c88fd 100644 --- a/Mage.Sets/src/mage/sets/conflux/FieryFall.java +++ b/Mage.Sets/src/mage/sets/conflux/FieryFall.java @@ -50,7 +50,7 @@ public class FieryFall extends CardImpl { // Fiery Fall deals 5 damage to target creature. this.getSpellAbility().addEffect(new DamageTargetEffect(5)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Basic landcycling {1}{R} ({1}{R}, Discard this card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.) this.addAbility(new BasicLandcyclingAbility(new ManaCostsImpl("{1}{R}"))); diff --git a/Mage.Sets/src/mage/sets/conflux/FiligreeFracture.java b/Mage.Sets/src/mage/sets/conflux/FiligreeFracture.java index ccc58ba6f95..a7dd009fb14 100644 --- a/Mage.Sets/src/mage/sets/conflux/FiligreeFracture.java +++ b/Mage.Sets/src/mage/sets/conflux/FiligreeFracture.java @@ -65,7 +65,7 @@ public class FiligreeFracture extends CardImpl { this.color.setGreen(true); // Destroy target artifact or enchantment. If that permanent was blue or black, draw a card. - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new FiligreeFractureEffect()); } diff --git a/Mage.Sets/src/mage/sets/conflux/Fleshformer.java b/Mage.Sets/src/mage/sets/conflux/Fleshformer.java index 7b7b71654ce..320a0dd0339 100644 --- a/Mage.Sets/src/mage/sets/conflux/Fleshformer.java +++ b/Mage.Sets/src/mage/sets/conflux/Fleshformer.java @@ -61,7 +61,7 @@ public class Fleshformer extends CardImpl { // {W}{U}{B}{R}{G}: Fleshformer gets +2/+2 and gains fear until end of turn. Target creature gets -2/-2 until end of turn. Activate this ability only during your turn. Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("{W}{U}{B}{R}{G}"), MyTurnCondition.getInstance()); ability.addEffect(new BoostTargetEffect(-2, -2, Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/conflux/FontOfMythos.java b/Mage.Sets/src/mage/sets/conflux/FontOfMythos.java index 60f88c07ac0..05b2b5d0219 100644 --- a/Mage.Sets/src/mage/sets/conflux/FontOfMythos.java +++ b/Mage.Sets/src/mage/sets/conflux/FontOfMythos.java @@ -83,7 +83,7 @@ class FontOfMythosAbility extends TriggeredAbilityImpl { public boolean checkTrigger(GameEvent event, Game game) { if (event.getType() == EventType.DRAW_STEP_PRE) { this.getTargets().clear(); - this.addTarget(new TargetPlayer(true)); + this.addTarget(new TargetPlayer()); getTargets().get(0).add(event.getPlayerId(),game); return true; } diff --git a/Mage.Sets/src/mage/sets/conflux/GoblinRazerunners.java b/Mage.Sets/src/mage/sets/conflux/GoblinRazerunners.java index a8048fe023a..354862ac0ca 100644 --- a/Mage.Sets/src/mage/sets/conflux/GoblinRazerunners.java +++ b/Mage.Sets/src/mage/sets/conflux/GoblinRazerunners.java @@ -72,7 +72,7 @@ public class GoblinRazerunners extends CardImpl { // At the beginning of your end step, you may have Goblin Razerunners deal damage equal to the number of +1/+1 counters on it to target player. ability = new BeginningOfYourEndStepTriggeredAbility(new DamageTargetEffect(new CountersCount(CounterType.P1P1)), true); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/conflux/GwafaHazidProfiteer.java b/Mage.Sets/src/mage/sets/conflux/GwafaHazidProfiteer.java index da83ebf9550..f4103b13202 100644 --- a/Mage.Sets/src/mage/sets/conflux/GwafaHazidProfiteer.java +++ b/Mage.Sets/src/mage/sets/conflux/GwafaHazidProfiteer.java @@ -78,7 +78,7 @@ public class GwafaHazidProfiteer extends CardImpl { // {W}{U}, {tap}: Put a bribery counter on target creature you don't control. Its controller draws a card. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GwafaHazidProfiteerEffect1(), new ManaCostsImpl("{W}{U}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); // Creatures with bribery counters on them can't attack or block. diff --git a/Mage.Sets/src/mage/sets/conflux/JhessianBalmgiver.java b/Mage.Sets/src/mage/sets/conflux/JhessianBalmgiver.java index 822c8883fa0..b54954aac5e 100644 --- a/Mage.Sets/src/mage/sets/conflux/JhessianBalmgiver.java +++ b/Mage.Sets/src/mage/sets/conflux/JhessianBalmgiver.java @@ -66,7 +66,7 @@ public class JhessianBalmgiver extends CardImpl { this.addAbility(ability); // {tap}: Target creature is unblockable this turn. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UnblockableTargetEffect(), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/conflux/MagisterSphinx.java b/Mage.Sets/src/mage/sets/conflux/MagisterSphinx.java index eeb413b04c7..76e11ffa1de 100644 --- a/Mage.Sets/src/mage/sets/conflux/MagisterSphinx.java +++ b/Mage.Sets/src/mage/sets/conflux/MagisterSphinx.java @@ -63,7 +63,7 @@ public class MagisterSphinx extends CardImpl { // When Magister Sphinx enters the battlefield, target player's life total becomes 10. Ability ability = new EntersBattlefieldTriggeredAbility(new MagisterSphinxEffect(), false); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/conflux/ManiacalRage.java b/Mage.Sets/src/mage/sets/conflux/ManiacalRage.java index e0cc5b5b436..23998292078 100644 --- a/Mage.Sets/src/mage/sets/conflux/ManiacalRage.java +++ b/Mage.Sets/src/mage/sets/conflux/ManiacalRage.java @@ -54,7 +54,7 @@ public class ManiacalRage extends CardImpl { this.color.setRed(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/conflux/MightOfAlara.java b/Mage.Sets/src/mage/sets/conflux/MightOfAlara.java index 24425ae6fe4..572ed3cdc78 100644 --- a/Mage.Sets/src/mage/sets/conflux/MightOfAlara.java +++ b/Mage.Sets/src/mage/sets/conflux/MightOfAlara.java @@ -51,7 +51,7 @@ public class MightOfAlara extends CardImpl { // Domain - Target creature gets +1/+1 until end of turn for each basic land type among lands you control. this.getSpellAbility().addEffect(new BoostTargetEffect(new DomainValue(), new DomainValue(), Duration.EndOfTurn, true)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public MightOfAlara(final MightOfAlara card) { diff --git a/Mage.Sets/src/mage/sets/conflux/MoltenFrame.java b/Mage.Sets/src/mage/sets/conflux/MoltenFrame.java index 0c92093f238..064eab53e37 100644 --- a/Mage.Sets/src/mage/sets/conflux/MoltenFrame.java +++ b/Mage.Sets/src/mage/sets/conflux/MoltenFrame.java @@ -56,7 +56,7 @@ public class MoltenFrame extends CardImpl { this.expansionSetCode = "CON"; this.color.setRed(true); this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); } diff --git a/Mage.Sets/src/mage/sets/conflux/NacatlHuntPride.java b/Mage.Sets/src/mage/sets/conflux/NacatlHuntPride.java index 2dcb76e8084..098484ba4d9 100644 --- a/Mage.Sets/src/mage/sets/conflux/NacatlHuntPride.java +++ b/Mage.Sets/src/mage/sets/conflux/NacatlHuntPride.java @@ -65,13 +65,13 @@ public class NacatlHuntPride extends CardImpl { // {R}, {tap}: Target creature can't block this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{R}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {G}, {tap}: Target creature blocks this turn if able. Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BlocksIfAbleTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{G}")); ability2.addCost(new TapSourceCost()); - ability2.addTarget(new TargetCreaturePermanent(true)); + ability2.addTarget(new TargetCreaturePermanent()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/sets/conflux/NicolBolasPlaneswalker.java b/Mage.Sets/src/mage/sets/conflux/NicolBolasPlaneswalker.java index 05fe5e69302..e0fff5717fd 100644 --- a/Mage.Sets/src/mage/sets/conflux/NicolBolasPlaneswalker.java +++ b/Mage.Sets/src/mage/sets/conflux/NicolBolasPlaneswalker.java @@ -73,15 +73,15 @@ public class NicolBolasPlaneswalker extends CardImpl { // +3: Destroy target noncreature permanent. LoyaltyAbility ability = new LoyaltyAbility(new DestroyTargetEffect(), 3); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); // -2: Gain control of target creature. ability = new LoyaltyAbility(new GainControlTargetEffect(Duration.Custom), -2); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // -9: Nicol Bolas, Planeswalker deals 7 damage to target player. That player discards seven cards, then sacrifices seven permanents. ability = new LoyaltyAbility(new DamageTargetEffect(7), -9); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); ability.addEffect(new DiscardTargetEffect(7)); ability.addEffect(new SacrificeEffect(new FilterPermanent(), 7, "then")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/conflux/Nyxathid.java b/Mage.Sets/src/mage/sets/conflux/Nyxathid.java index 0487cac7e00..b455666dd0c 100644 --- a/Mage.Sets/src/mage/sets/conflux/Nyxathid.java +++ b/Mage.Sets/src/mage/sets/conflux/Nyxathid.java @@ -102,7 +102,7 @@ class ChooseOpponent extends OneShotEffect { Player player = game.getPlayer(source.getControllerId()); Permanent permanent = game.getPermanent(source.getSourceId()); if (player != null && permanent != null) { - TargetOpponent target = new TargetOpponent(true); + TargetOpponent target = new TargetOpponent(); target.setRequired(true); target.setNotTarget(true); if (player.choose(this.outcome, target, source.getSourceId(), game)) { diff --git a/Mage.Sets/src/mage/sets/conflux/ObeliskOfAlara.java b/Mage.Sets/src/mage/sets/conflux/ObeliskOfAlara.java index befecfa8c43..406e9ff75c0 100644 --- a/Mage.Sets/src/mage/sets/conflux/ObeliskOfAlara.java +++ b/Mage.Sets/src/mage/sets/conflux/ObeliskOfAlara.java @@ -65,17 +65,17 @@ public class ObeliskOfAlara extends CardImpl { // {1}{B}, {tap}: Target creature gets -2/-2 until end of turn. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl("{1}{B}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {1}{R}, {tap}: Obelisk of Alara deals 3 damage to target player. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new ManaCostsImpl("{1}{R}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); // {1}{G}, {tap}: Target creature gets +4/+4 until end of turn. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(4, 4, Duration.EndOfTurn), new ManaCostsImpl("{1}{G}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/conflux/ParasiticStrix.java b/Mage.Sets/src/mage/sets/conflux/ParasiticStrix.java index f8831d8f1f2..880fbcbc528 100644 --- a/Mage.Sets/src/mage/sets/conflux/ParasiticStrix.java +++ b/Mage.Sets/src/mage/sets/conflux/ParasiticStrix.java @@ -81,7 +81,7 @@ class ParasiticStrixTriggeredAbility extends TriggeredAbilityImpl { public ParasiticStrixTriggeredAbility() { super(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2)); this.addEffect(new GainLifeEffect(2)); - this.addTarget(new TargetPlayer(true)); + this.addTarget(new TargetPlayer()); } public ParasiticStrixTriggeredAbility(final ParasiticStrixTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/conflux/PathToExile.java b/Mage.Sets/src/mage/sets/conflux/PathToExile.java index 2377b89ba04..de9b270d836 100644 --- a/Mage.Sets/src/mage/sets/conflux/PathToExile.java +++ b/Mage.Sets/src/mage/sets/conflux/PathToExile.java @@ -54,7 +54,7 @@ public class PathToExile extends CardImpl { super(ownerId, 15, "Path to Exile", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "CON"; this.color.setWhite(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new PathToExileEffect()); } diff --git a/Mage.Sets/src/mage/sets/conflux/QuenchableFire.java b/Mage.Sets/src/mage/sets/conflux/QuenchableFire.java index bed53459f57..8c29692be48 100644 --- a/Mage.Sets/src/mage/sets/conflux/QuenchableFire.java +++ b/Mage.Sets/src/mage/sets/conflux/QuenchableFire.java @@ -57,7 +57,7 @@ public class QuenchableFire extends CardImpl { super(ownerId, 70, "Quenchable Fire", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{R}"); this.expansionSetCode = "CON"; this.color.setRed(true); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addEffect(new QuenchableFireEffect()); } diff --git a/Mage.Sets/src/mage/sets/conflux/ScarlandThrinax.java b/Mage.Sets/src/mage/sets/conflux/ScarlandThrinax.java index 9ba15fa13bc..a105b58888f 100644 --- a/Mage.Sets/src/mage/sets/conflux/ScarlandThrinax.java +++ b/Mage.Sets/src/mage/sets/conflux/ScarlandThrinax.java @@ -61,7 +61,7 @@ public class ScarlandThrinax extends CardImpl { // Sacrifice a creature: Put a +1/+1 counter on Scarland Thrinax. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl()); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/conflux/ScepterOfDominance.java b/Mage.Sets/src/mage/sets/conflux/ScepterOfDominance.java index ac017a974d1..8a69bcfb655 100644 --- a/Mage.Sets/src/mage/sets/conflux/ScepterOfDominance.java +++ b/Mage.Sets/src/mage/sets/conflux/ScepterOfDominance.java @@ -52,7 +52,7 @@ public class ScepterOfDominance extends CardImpl { SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{W}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/conflux/ScepterOfFugue.java b/Mage.Sets/src/mage/sets/conflux/ScepterOfFugue.java index c28288e11fc..c4f9e12dd07 100644 --- a/Mage.Sets/src/mage/sets/conflux/ScepterOfFugue.java +++ b/Mage.Sets/src/mage/sets/conflux/ScepterOfFugue.java @@ -56,7 +56,7 @@ public class ScepterOfFugue extends CardImpl { // {1}{B}, {tap}: Target player discards a card. Activate this ability only during your turn. Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl("{1}{B}"), MyTurnCondition.getInstance()); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/conflux/SludgeStrider.java b/Mage.Sets/src/mage/sets/conflux/SludgeStrider.java index ef1dde26ebe..aa841e8e27e 100644 --- a/Mage.Sets/src/mage/sets/conflux/SludgeStrider.java +++ b/Mage.Sets/src/mage/sets/conflux/SludgeStrider.java @@ -69,7 +69,7 @@ public class SludgeStrider extends CardImpl { // Whenever another artifact enters the battlefield under your control or another artifact you control leaves the battlefield, you may pay {1}. If you do, target player loses 1 life and you gain 1 life. Ability ability = new SludgeStriderTriggeredAbility(); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/conflux/SoulsMajesty.java b/Mage.Sets/src/mage/sets/conflux/SoulsMajesty.java index 1902f08229e..c4b249b0489 100644 --- a/Mage.Sets/src/mage/sets/conflux/SoulsMajesty.java +++ b/Mage.Sets/src/mage/sets/conflux/SoulsMajesty.java @@ -50,7 +50,7 @@ public class SoulsMajesty extends CardImpl { super(ownerId, 92, "Soul's Majesty", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{G}"); this.expansionSetCode = "CON"; this.color.setGreen(true); - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); this.getSpellAbility().addEffect(new SoulsMajestyEffect()); } diff --git a/Mage.Sets/src/mage/sets/conflux/SylvanBounty.java b/Mage.Sets/src/mage/sets/conflux/SylvanBounty.java index d86e54a7719..536d19b8758 100644 --- a/Mage.Sets/src/mage/sets/conflux/SylvanBounty.java +++ b/Mage.Sets/src/mage/sets/conflux/SylvanBounty.java @@ -50,7 +50,7 @@ public class SylvanBounty extends CardImpl { // Target player gains 8 life. this.getSpellAbility().addEffect(new GainLifeTargetEffect(8)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.addAbility(new BasicLandcyclingAbility(new ManaCostsImpl("{1}{G}"))); } diff --git a/Mage.Sets/src/mage/sets/conflux/TeleminPerformance.java b/Mage.Sets/src/mage/sets/conflux/TeleminPerformance.java index 67952057690..aa2343db313 100644 --- a/Mage.Sets/src/mage/sets/conflux/TeleminPerformance.java +++ b/Mage.Sets/src/mage/sets/conflux/TeleminPerformance.java @@ -55,7 +55,7 @@ public class TeleminPerformance extends CardImpl { // Target opponent reveals cards from the top of his or her library until he or she reveals a creature card. That player puts all noncreature cards revealed this way into his or her graveyard, then you put the creature card onto the battlefield under your control. this.getSpellAbility().addEffect(new TeleminPerformanceEffect()); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); } diff --git a/Mage.Sets/src/mage/sets/conflux/VagrantPlowbeasts.java b/Mage.Sets/src/mage/sets/conflux/VagrantPlowbeasts.java index c736362afc4..87b33b016b9 100644 --- a/Mage.Sets/src/mage/sets/conflux/VagrantPlowbeasts.java +++ b/Mage.Sets/src/mage/sets/conflux/VagrantPlowbeasts.java @@ -66,7 +66,7 @@ public class VagrantPlowbeasts extends CardImpl { SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{1}")); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/conflux/ViewFromAbove.java b/Mage.Sets/src/mage/sets/conflux/ViewFromAbove.java index 1eb528e892f..bad8fc702b3 100644 --- a/Mage.Sets/src/mage/sets/conflux/ViewFromAbove.java +++ b/Mage.Sets/src/mage/sets/conflux/ViewFromAbove.java @@ -59,7 +59,7 @@ public class ViewFromAbove extends CardImpl { // Target creature gains flying until end of turn. this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // If you control a white permanent, return View from Above to its owner's hand. this.getSpellAbility().addEffect(new ViewFromAboveEffect()); } diff --git a/Mage.Sets/src/mage/sets/conflux/VoicesFromTheVoid.java b/Mage.Sets/src/mage/sets/conflux/VoicesFromTheVoid.java index 3e2354e5b01..8e0157d19be 100644 --- a/Mage.Sets/src/mage/sets/conflux/VoicesFromTheVoid.java +++ b/Mage.Sets/src/mage/sets/conflux/VoicesFromTheVoid.java @@ -49,7 +49,7 @@ public class VoicesFromTheVoid extends CardImpl { // Domain - Target player discards a card for each basic land type among lands you control. this.getSpellAbility().addEffect(new DiscardTargetEffect(new DomainValue())); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public VoicesFromTheVoid(final VoicesFromTheVoid card) { diff --git a/Mage.Sets/src/mage/sets/conflux/WallOfReverence.java b/Mage.Sets/src/mage/sets/conflux/WallOfReverence.java index f3f147d3c73..e90109bccc9 100644 --- a/Mage.Sets/src/mage/sets/conflux/WallOfReverence.java +++ b/Mage.Sets/src/mage/sets/conflux/WallOfReverence.java @@ -62,7 +62,7 @@ public class WallOfReverence extends CardImpl { this.addAbility(DefenderAbility.getInstance()); this.addAbility(FlyingAbility.getInstance()); Ability ability = new BeginningOfYourEndStepTriggeredAbility(new WallOfReverenceTriggeredEffect(), true); - ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/conflux/WretchedBanquet.java b/Mage.Sets/src/mage/sets/conflux/WretchedBanquet.java index 678777d8824..93fa4a2d58b 100644 --- a/Mage.Sets/src/mage/sets/conflux/WretchedBanquet.java +++ b/Mage.Sets/src/mage/sets/conflux/WretchedBanquet.java @@ -54,7 +54,7 @@ public class WretchedBanquet extends CardImpl { // Destroy target creature if it has the least power or is tied for least power among creatures on the battlefield. this.getSpellAbility().addEffect(new WretchedBanquetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public WretchedBanquet(final WretchedBanquet card) { diff --git a/Mage.Sets/src/mage/sets/conflux/YokeOfTheDamned.java b/Mage.Sets/src/mage/sets/conflux/YokeOfTheDamned.java index ab5dd4e41ed..4d419b87419 100644 --- a/Mage.Sets/src/mage/sets/conflux/YokeOfTheDamned.java +++ b/Mage.Sets/src/mage/sets/conflux/YokeOfTheDamned.java @@ -59,7 +59,7 @@ public class YokeOfTheDamned extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/darkascension/AlphaBrawl.java b/Mage.Sets/src/mage/sets/darkascension/AlphaBrawl.java index 41b023b632d..76b25122138 100644 --- a/Mage.Sets/src/mage/sets/darkascension/AlphaBrawl.java +++ b/Mage.Sets/src/mage/sets/darkascension/AlphaBrawl.java @@ -63,7 +63,7 @@ public class AlphaBrawl extends CardImpl { // Target creature an opponent controls deals damage equal to its power to each other creature that player controls, then each of those creatures deals damage equal to its power to that creature. this.getSpellAbility().addEffect(new AlphaBrawlEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); } diff --git a/Mage.Sets/src/mage/sets/darkascension/ArtfulDodge.java b/Mage.Sets/src/mage/sets/darkascension/ArtfulDodge.java index 57adf7deec7..af9dcc56f3f 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ArtfulDodge.java +++ b/Mage.Sets/src/mage/sets/darkascension/ArtfulDodge.java @@ -51,7 +51,7 @@ public class ArtfulDodge extends CardImpl { // Target creature is unblockable this turn. this.getSpellAbility().addEffect(new UnblockableTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Flashback {U} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{U}"), TimingRule.SORCERY)); } diff --git a/Mage.Sets/src/mage/sets/darkascension/BlackCat.java b/Mage.Sets/src/mage/sets/darkascension/BlackCat.java index 3e447a1ec9b..694c51bf55b 100644 --- a/Mage.Sets/src/mage/sets/darkascension/BlackCat.java +++ b/Mage.Sets/src/mage/sets/darkascension/BlackCat.java @@ -58,7 +58,7 @@ public class BlackCat extends CardImpl { // When Black Cat dies, target opponent discards a card at random. Ability ability = new DiesTriggeredAbility(new DiscardTargetEffect(1, true),false); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/BloodFeud.java b/Mage.Sets/src/mage/sets/darkascension/BloodFeud.java index 3f19984dd78..80b60ff8306 100644 --- a/Mage.Sets/src/mage/sets/darkascension/BloodFeud.java +++ b/Mage.Sets/src/mage/sets/darkascension/BloodFeud.java @@ -50,7 +50,7 @@ public class BloodFeud extends CardImpl { // Target creature fights another target creature. this.getSpellAbility().addEffect(new FightTargetsEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addTarget(new TargetOtherCreaturePermanent()); } @@ -67,7 +67,7 @@ public class BloodFeud extends CardImpl { class TargetOtherCreaturePermanent extends TargetCreaturePermanent { public TargetOtherCreaturePermanent() { - super(true); + super(); } public TargetOtherCreaturePermanent(final TargetOtherCreaturePermanent target) { diff --git a/Mage.Sets/src/mage/sets/darkascension/BriarpackAlpha.java b/Mage.Sets/src/mage/sets/darkascension/BriarpackAlpha.java index 7d26921f568..05987bb5586 100644 --- a/Mage.Sets/src/mage/sets/darkascension/BriarpackAlpha.java +++ b/Mage.Sets/src/mage/sets/darkascension/BriarpackAlpha.java @@ -58,7 +58,7 @@ public class BriarpackAlpha extends CardImpl { this.addAbility(FlashAbility.getInstance()); // When Briarpack Alpha enters the battlefield, target creature gets +2/+2 until end of turn. Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/BurdenOfGuilt.java b/Mage.Sets/src/mage/sets/darkascension/BurdenOfGuilt.java index 31bfea25736..ec1cb422830 100644 --- a/Mage.Sets/src/mage/sets/darkascension/BurdenOfGuilt.java +++ b/Mage.Sets/src/mage/sets/darkascension/BurdenOfGuilt.java @@ -57,7 +57,7 @@ public class BurdenOfGuilt extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/darkascension/CallToTheKindred.java b/Mage.Sets/src/mage/sets/darkascension/CallToTheKindred.java index 7127e4c9e4e..a48b7a89ad2 100644 --- a/Mage.Sets/src/mage/sets/darkascension/CallToTheKindred.java +++ b/Mage.Sets/src/mage/sets/darkascension/CallToTheKindred.java @@ -70,7 +70,7 @@ public class CallToTheKindred extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/darkascension/ChaliceOfDeath.java b/Mage.Sets/src/mage/sets/darkascension/ChaliceOfDeath.java index 4eed492a11b..f08d66b03c1 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ChaliceOfDeath.java +++ b/Mage.Sets/src/mage/sets/darkascension/ChaliceOfDeath.java @@ -55,7 +55,7 @@ public class ChaliceOfDeath extends CardImpl { // {tap}: Target player loses 5 life. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(5), new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/ChantOfTheSkifsang.java b/Mage.Sets/src/mage/sets/darkascension/ChantOfTheSkifsang.java index 7f8694019e6..13d39725b81 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ChantOfTheSkifsang.java +++ b/Mage.Sets/src/mage/sets/darkascension/ChantOfTheSkifsang.java @@ -52,7 +52,7 @@ public class ChantOfTheSkifsang extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/darkascension/CrushingVines.java b/Mage.Sets/src/mage/sets/darkascension/CrushingVines.java index 23dc90c6e03..d071fd982f6 100644 --- a/Mage.Sets/src/mage/sets/darkascension/CrushingVines.java +++ b/Mage.Sets/src/mage/sets/darkascension/CrushingVines.java @@ -58,7 +58,7 @@ public class CrushingVines extends CardImpl { this.color.setGreen(true); // Choose one - Destroy target creature with flying; or destroy target artifact. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); Mode mode = new Mode(); mode.getTargets().add(new TargetArtifactPermanent()); diff --git a/Mage.Sets/src/mage/sets/darkascension/CurseOfBloodletting.java b/Mage.Sets/src/mage/sets/darkascension/CurseOfBloodletting.java index 4c7f4fb577a..214f7e981c7 100644 --- a/Mage.Sets/src/mage/sets/darkascension/CurseOfBloodletting.java +++ b/Mage.Sets/src/mage/sets/darkascension/CurseOfBloodletting.java @@ -58,7 +58,7 @@ public class CurseOfBloodletting extends CardImpl { this.color.setRed(true); // Enchant player - TargetPlayer auraTarget = new TargetPlayer(true); + TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Damage)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/darkascension/CurseOfEchoes.java b/Mage.Sets/src/mage/sets/darkascension/CurseOfEchoes.java index ff99d083a89..c4cc1510b5f 100644 --- a/Mage.Sets/src/mage/sets/darkascension/CurseOfEchoes.java +++ b/Mage.Sets/src/mage/sets/darkascension/CurseOfEchoes.java @@ -67,7 +67,7 @@ public class CurseOfEchoes extends CardImpl { this.color.setBlue(true); // Enchant player - TargetPlayer auraTarget = new TargetPlayer(true); + TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Damage)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/darkascension/CurseOfExhaustion.java b/Mage.Sets/src/mage/sets/darkascension/CurseOfExhaustion.java index 0b3b3023e1d..d399709be6a 100644 --- a/Mage.Sets/src/mage/sets/darkascension/CurseOfExhaustion.java +++ b/Mage.Sets/src/mage/sets/darkascension/CurseOfExhaustion.java @@ -59,7 +59,7 @@ public class CurseOfExhaustion extends CardImpl { this.addWatcher(new CurseOfExhaustionWatcher()); // Enchant player - TargetPlayer auraTarget = new TargetPlayer(true); + TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/darkascension/CurseOfMisfortunes.java b/Mage.Sets/src/mage/sets/darkascension/CurseOfMisfortunes.java index 912655965bb..ef41fa87ec9 100644 --- a/Mage.Sets/src/mage/sets/darkascension/CurseOfMisfortunes.java +++ b/Mage.Sets/src/mage/sets/darkascension/CurseOfMisfortunes.java @@ -67,7 +67,7 @@ public class CurseOfMisfortunes extends CardImpl { this.color.setBlack(true); // Enchant player - TargetPlayer auraTarget = new TargetPlayer(true); + TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/darkascension/CurseOfThirst.java b/Mage.Sets/src/mage/sets/darkascension/CurseOfThirst.java index 43c0bce6150..11b9d36b5cb 100644 --- a/Mage.Sets/src/mage/sets/darkascension/CurseOfThirst.java +++ b/Mage.Sets/src/mage/sets/darkascension/CurseOfThirst.java @@ -62,7 +62,7 @@ public class CurseOfThirst extends CardImpl { this.color.setBlack(true); // Enchant player - TargetPlayer auraTarget = new TargetPlayer(true); + TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/darkascension/DeadlyAllure.java b/Mage.Sets/src/mage/sets/darkascension/DeadlyAllure.java index c57d1498cb3..f9001f2e19e 100644 --- a/Mage.Sets/src/mage/sets/darkascension/DeadlyAllure.java +++ b/Mage.Sets/src/mage/sets/darkascension/DeadlyAllure.java @@ -53,7 +53,7 @@ public class DeadlyAllure extends CardImpl { // Target creature gains deathtouch until end of turn and must be blocked this turn if able. this.getSpellAbility().addEffect(new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addEffect(new MustBeBlockedByAtLeastOneTargetEffect(Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Flashback {G} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{G}"), TimingRule.SORCERY)); diff --git a/Mage.Sets/src/mage/sets/darkascension/DeathsCaress.java b/Mage.Sets/src/mage/sets/darkascension/DeathsCaress.java index d5aa03febb3..ac74ef7feea 100644 --- a/Mage.Sets/src/mage/sets/darkascension/DeathsCaress.java +++ b/Mage.Sets/src/mage/sets/darkascension/DeathsCaress.java @@ -55,7 +55,7 @@ public class DeathsCaress extends CardImpl { // Destroy target creature. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // If that creature was a Human, you gain life equal to its toughness. this.getSpellAbility().addEffect(new DeathsCaressEffect()); } diff --git a/Mage.Sets/src/mage/sets/darkascension/DerangedOutcast.java b/Mage.Sets/src/mage/sets/darkascension/DerangedOutcast.java index eed1e8519f0..d4cded6b1e1 100644 --- a/Mage.Sets/src/mage/sets/darkascension/DerangedOutcast.java +++ b/Mage.Sets/src/mage/sets/darkascension/DerangedOutcast.java @@ -69,7 +69,7 @@ public class DerangedOutcast extends CardImpl { // {1}{G}, Sacrifice a Human: Put two +1/+1 counters on target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance(2)), new ManaCostsImpl("{1}{G}")); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/DiregrafCaptain.java b/Mage.Sets/src/mage/sets/darkascension/DiregrafCaptain.java index 78b7f7d05b6..5aa71e22907 100644 --- a/Mage.Sets/src/mage/sets/darkascension/DiregrafCaptain.java +++ b/Mage.Sets/src/mage/sets/darkascension/DiregrafCaptain.java @@ -98,7 +98,7 @@ class DiregrafCaptainTriggeredAbility extends TriggeredAbilityImpl { public DiregrafCaptainTriggeredAbility() { super(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), false); - this.addTarget(new TargetOpponent(true)); + this.addTarget(new TargetOpponent()); } public DiregrafCaptainTriggeredAbility(final DiregrafCaptainTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/darkascension/DungeonGeists.java b/Mage.Sets/src/mage/sets/darkascension/DungeonGeists.java index b5a4c1af5e8..a384d027dca 100644 --- a/Mage.Sets/src/mage/sets/darkascension/DungeonGeists.java +++ b/Mage.Sets/src/mage/sets/darkascension/DungeonGeists.java @@ -76,7 +76,7 @@ public class DungeonGeists extends CardImpl { // When Dungeon Geists enters the battlefield, tap target creature an opponent controls. That creature doesn't untap during its controller's untap step for as long as you control Dungeon Geists. Ability ability = new EntersBattlefieldTriggeredAbility(new TapTargetEffect(), false); ability.addEffect(new DungeonGeistsEffect()); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/darkascension/FaithsShield.java b/Mage.Sets/src/mage/sets/darkascension/FaithsShield.java index 0b347033ec9..7a532e197f5 100644 --- a/Mage.Sets/src/mage/sets/darkascension/FaithsShield.java +++ b/Mage.Sets/src/mage/sets/darkascension/FaithsShield.java @@ -63,7 +63,7 @@ public class FaithsShield extends CardImpl { // Fateful hour - If you have 5 or less life, instead you and each permanent you control gain protection from the color of your choice until end of turn. this.getSpellAbility().addEffect(new FaithsShieldEffect()); - this.getSpellAbility().addTarget(new TargetControlledPermanent(true)); + this.getSpellAbility().addTarget(new TargetControlledPermanent()); this.getSpellAbility().addChoice(new ChoiceColor()); } diff --git a/Mage.Sets/src/mage/sets/darkascension/FalkenrathAristocrat.java b/Mage.Sets/src/mage/sets/darkascension/FalkenrathAristocrat.java index ed922586a42..392e692a7b0 100644 --- a/Mage.Sets/src/mage/sets/darkascension/FalkenrathAristocrat.java +++ b/Mage.Sets/src/mage/sets/darkascension/FalkenrathAristocrat.java @@ -71,7 +71,7 @@ public class FalkenrathAristocrat extends CardImpl { // If the sacrificed creature was a Human, put a +1/+1 counter on Falkenrath Aristocrat. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), - new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + new SacrificeTargetCost(new TargetControlledCreaturePermanent())); ability.addEffect(new FalkenrathAristocratEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/FalkenrathTorturer.java b/Mage.Sets/src/mage/sets/darkascension/FalkenrathTorturer.java index dcb061f1fd9..4ff4129804d 100644 --- a/Mage.Sets/src/mage/sets/darkascension/FalkenrathTorturer.java +++ b/Mage.Sets/src/mage/sets/darkascension/FalkenrathTorturer.java @@ -66,7 +66,7 @@ public class FalkenrathTorturer extends CardImpl { // If the sacrificed creature was a Human, put a +1/+1 counter on Falkenrath Torturer. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), - new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + new SacrificeTargetCost(new TargetControlledCreaturePermanent())); ability.addEffect(new FalkenrathAristocratEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/FarbogBoneflinger.java b/Mage.Sets/src/mage/sets/darkascension/FarbogBoneflinger.java index 983341dccb1..7035d70a628 100644 --- a/Mage.Sets/src/mage/sets/darkascension/FarbogBoneflinger.java +++ b/Mage.Sets/src/mage/sets/darkascension/FarbogBoneflinger.java @@ -56,7 +56,7 @@ public class FarbogBoneflinger extends CardImpl { // When Farbog Boneflinger enters the battlefield, target creature gets -2/-2 until end of turn. Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(-2, -2, Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/FavorOfTheWoods.java b/Mage.Sets/src/mage/sets/darkascension/FavorOfTheWoods.java index 7f7a899c2f8..59523eab480 100644 --- a/Mage.Sets/src/mage/sets/darkascension/FavorOfTheWoods.java +++ b/Mage.Sets/src/mage/sets/darkascension/FavorOfTheWoods.java @@ -55,7 +55,7 @@ public class FavorOfTheWoods extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Neutral)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/darkascension/FeedThePack.java b/Mage.Sets/src/mage/sets/darkascension/FeedThePack.java index 4eb102ade87..68297e1846c 100644 --- a/Mage.Sets/src/mage/sets/darkascension/FeedThePack.java +++ b/Mage.Sets/src/mage/sets/darkascension/FeedThePack.java @@ -96,7 +96,7 @@ class FeedThePackEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Target target = new TargetPermanent(filter, true); + Target target = new TargetPermanent(filter); Player player = game.getPlayer(source.getControllerId()); if (player.choose(Outcome.PutCreatureInPlay, target, source.getSourceId(), game)) { Permanent permanent = game.getPermanent(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/sets/darkascension/FlayerOfTheHatebound.java b/Mage.Sets/src/mage/sets/darkascension/FlayerOfTheHatebound.java index c64db1575c1..20c6d450fd8 100644 --- a/Mage.Sets/src/mage/sets/darkascension/FlayerOfTheHatebound.java +++ b/Mage.Sets/src/mage/sets/darkascension/FlayerOfTheHatebound.java @@ -66,7 +66,7 @@ public class FlayerOfTheHatebound extends CardImpl { // Whenever Flayer of the Hatebound or another creature enters the battlefield from your graveyard, that creature deals damage equal to its power to target creature or player. Ability ability = new FlayerTriggeredAbility(); - ability.addTarget(new TargetCreatureOrPlayer(true)); + ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/ForgeDevil.java b/Mage.Sets/src/mage/sets/darkascension/ForgeDevil.java index 2b2129240ae..d556c15e4f6 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ForgeDevil.java +++ b/Mage.Sets/src/mage/sets/darkascension/ForgeDevil.java @@ -56,7 +56,7 @@ public class ForgeDevil extends CardImpl { // When Forge Devil enters the battlefield, it deals 1 damage to target creature and 1 damage to you. Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(1)); ability.addEffect(new DamageControllerEffect(1)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/GeralfsMessenger.java b/Mage.Sets/src/mage/sets/darkascension/GeralfsMessenger.java index 0480b4aa22b..0e60c2611d0 100644 --- a/Mage.Sets/src/mage/sets/darkascension/GeralfsMessenger.java +++ b/Mage.Sets/src/mage/sets/darkascension/GeralfsMessenger.java @@ -59,7 +59,7 @@ public class GeralfsMessenger extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); // When Geralf's Messenger enters the battlefield, target opponent loses 2 life. Ability ability = new EntersBattlefieldTriggeredAbility(new LoseLifeTargetEffect(2)); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); // Undying this.addAbility(new UndyingAbility()); diff --git a/Mage.Sets/src/mage/sets/darkascension/GeralfsMindcrusher.java b/Mage.Sets/src/mage/sets/darkascension/GeralfsMindcrusher.java index 22340821be7..1c6bded4dc2 100644 --- a/Mage.Sets/src/mage/sets/darkascension/GeralfsMindcrusher.java +++ b/Mage.Sets/src/mage/sets/darkascension/GeralfsMindcrusher.java @@ -56,7 +56,7 @@ public class GeralfsMindcrusher extends CardImpl { // When Geralf's Mindcrusher enters the battlefield, target player puts the top five cards of his or her library into his or her graveyard. Ability ability = new EntersBattlefieldTriggeredAbility(new PutLibraryIntoGraveTargetEffect(5)); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); // Undying this.addAbility(new UndyingAbility()); diff --git a/Mage.Sets/src/mage/sets/darkascension/GhastlyHaunting.java b/Mage.Sets/src/mage/sets/darkascension/GhastlyHaunting.java index 7ddb83b5afe..ef1624c311c 100644 --- a/Mage.Sets/src/mage/sets/darkascension/GhastlyHaunting.java +++ b/Mage.Sets/src/mage/sets/darkascension/GhastlyHaunting.java @@ -54,7 +54,7 @@ public class GhastlyHaunting extends CardImpl { this.canTransform = true; // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); // You control enchanted creature. diff --git a/Mage.Sets/src/mage/sets/darkascension/GrimBackwoods.java b/Mage.Sets/src/mage/sets/darkascension/GrimBackwoods.java index f52c3d7bc8c..5376e95f348 100644 --- a/Mage.Sets/src/mage/sets/darkascension/GrimBackwoods.java +++ b/Mage.Sets/src/mage/sets/darkascension/GrimBackwoods.java @@ -56,7 +56,7 @@ public class GrimBackwoods extends CardImpl { // {2}{B}{G}, {tap}, Sacrifice a creature: Draw a card. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{2}{B}{G}")); ability.addCost(new TapSourceCost()); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/Griptide.java b/Mage.Sets/src/mage/sets/darkascension/Griptide.java index 0b024da00ab..0cbf213a912 100644 --- a/Mage.Sets/src/mage/sets/darkascension/Griptide.java +++ b/Mage.Sets/src/mage/sets/darkascension/Griptide.java @@ -47,7 +47,7 @@ public class Griptide extends CardImpl { this.color.setBlue(true); // Put target creature on top of its owner's library. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true)); } diff --git a/Mage.Sets/src/mage/sets/darkascension/GruesomeDiscovery.java b/Mage.Sets/src/mage/sets/darkascension/GruesomeDiscovery.java index 605f29d30e4..7a7720c1c31 100644 --- a/Mage.Sets/src/mage/sets/darkascension/GruesomeDiscovery.java +++ b/Mage.Sets/src/mage/sets/darkascension/GruesomeDiscovery.java @@ -65,7 +65,7 @@ public class GruesomeDiscovery extends CardImpl { new DiscardTargetEffect(2), MorbidCondition.getInstance(), "Target player discards two cards. Morbid - If a creature died this turn, instead that player reveals his or her hand, you choose two cards from it, then that player discards those cards")); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public GruesomeDiscovery(final GruesomeDiscovery card) { diff --git a/Mage.Sets/src/mage/sets/darkascension/HarrowingJourney.java b/Mage.Sets/src/mage/sets/darkascension/HarrowingJourney.java index 70f5dc385ef..cfab70fe7e7 100644 --- a/Mage.Sets/src/mage/sets/darkascension/HarrowingJourney.java +++ b/Mage.Sets/src/mage/sets/darkascension/HarrowingJourney.java @@ -50,7 +50,7 @@ public class HarrowingJourney extends CardImpl { // Target player draws three cards and loses 3 life. this.getSpellAbility().addEffect(new DrawCardTargetEffect(3)); this.getSpellAbility().addEffect(new LoseLifeTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public HarrowingJourney(final HarrowingJourney card) { diff --git a/Mage.Sets/src/mage/sets/darkascension/HecklingFiends.java b/Mage.Sets/src/mage/sets/darkascension/HecklingFiends.java index c7ac2090991..64177489b18 100644 --- a/Mage.Sets/src/mage/sets/darkascension/HecklingFiends.java +++ b/Mage.Sets/src/mage/sets/darkascension/HecklingFiends.java @@ -59,7 +59,7 @@ public class HecklingFiends extends CardImpl { SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttacksIfAbleTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{2}{R}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/Helvault.java b/Mage.Sets/src/mage/sets/darkascension/Helvault.java index 256bff29266..727bb68a5b4 100644 --- a/Mage.Sets/src/mage/sets/darkascension/Helvault.java +++ b/Mage.Sets/src/mage/sets/darkascension/Helvault.java @@ -64,12 +64,12 @@ public class Helvault extends CardImpl { // {1}, {tap}: Exile target creature you control. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetForSourceEffect("Helvault exile"), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); // {7}, {tap}: Exile target creature you don't control. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetForSourceEffect("Helvault exile"), new GenericManaCost(7)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); // When Helvault is put into a graveyard from the battlefield, return all cards exiled with it to the battlefield under their owners' control. this.addAbility(new DiesTriggeredAbility(new ReturnFromExileForSourceEffect(Zone.BATTLEFIELD))); diff --git a/Mage.Sets/src/mage/sets/darkascension/HungerOfTheHowlpack.java b/Mage.Sets/src/mage/sets/darkascension/HungerOfTheHowlpack.java index 783da1b733d..3d4af745c03 100644 --- a/Mage.Sets/src/mage/sets/darkascension/HungerOfTheHowlpack.java +++ b/Mage.Sets/src/mage/sets/darkascension/HungerOfTheHowlpack.java @@ -57,7 +57,7 @@ public class HungerOfTheHowlpack extends CardImpl { new AddCountersTargetEffect(CounterType.P1P1.createInstance()), MorbidCondition.getInstance(), "Put a +1/+1 counter on target creature. Morbid - Put three +1/+1 counters on that creature instead if a creature died this turn")); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public HungerOfTheHowlpack(final HungerOfTheHowlpack card) { diff --git a/Mage.Sets/src/mage/sets/darkascension/HuntmasterOfTheFells.java b/Mage.Sets/src/mage/sets/darkascension/HuntmasterOfTheFells.java index 9e5dbb4419a..3efdbcedbfa 100644 --- a/Mage.Sets/src/mage/sets/darkascension/HuntmasterOfTheFells.java +++ b/Mage.Sets/src/mage/sets/darkascension/HuntmasterOfTheFells.java @@ -141,7 +141,7 @@ class RavagerOfTheFellsAbility extends TriggeredAbilityImpl { public RavagerOfTheFellsAbility() { super(Zone.BATTLEFIELD, new RavagerOfTheFellsEffect(), false); - Target target1 = new TargetOpponent(true); + Target target1 = new TargetOpponent(); target1.setRequired(true); this.addTarget(target1); this.addTarget(new RavagerOfTheFellsTarget()); diff --git a/Mage.Sets/src/mage/sets/darkascension/IncreasingConfusion.java b/Mage.Sets/src/mage/sets/darkascension/IncreasingConfusion.java index 5d689f8f315..9c398dad4e4 100644 --- a/Mage.Sets/src/mage/sets/darkascension/IncreasingConfusion.java +++ b/Mage.Sets/src/mage/sets/darkascension/IncreasingConfusion.java @@ -55,7 +55,7 @@ public class IncreasingConfusion extends CardImpl { // Target player puts the top X cards of his or her library into his or her graveyard. If Increasing Confusion was cast from a graveyard, that player puts twice that many cards into his or her graveyard instead. this.getSpellAbility().addEffect(new IncreasingConfusionEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); // Flashback {X}{U} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{X}{U}"), TimingRule.SORCERY)); diff --git a/Mage.Sets/src/mage/sets/darkascension/IncreasingSavagery.java b/Mage.Sets/src/mage/sets/darkascension/IncreasingSavagery.java index 9af6c08b6ec..e039fe02669 100644 --- a/Mage.Sets/src/mage/sets/darkascension/IncreasingSavagery.java +++ b/Mage.Sets/src/mage/sets/darkascension/IncreasingSavagery.java @@ -55,7 +55,7 @@ public class IncreasingSavagery extends CardImpl { // Put five +1/+1 counters on target creature. If Increasing Savagery was cast from a graveyard, put ten +1/+1 counters on that creature instead. this.getSpellAbility().addEffect(new IncreasingSavageryEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Flashback {5}{G}{G} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{5}{G}{G}"), TimingRule.SORCERY)); diff --git a/Mage.Sets/src/mage/sets/darkascension/NiblisOfTheBreath.java b/Mage.Sets/src/mage/sets/darkascension/NiblisOfTheBreath.java index 648510d4149..cee29a27d7b 100644 --- a/Mage.Sets/src/mage/sets/darkascension/NiblisOfTheBreath.java +++ b/Mage.Sets/src/mage/sets/darkascension/NiblisOfTheBreath.java @@ -62,7 +62,7 @@ public class NiblisOfTheBreath extends CardImpl { // {U}, {tap}: You may tap or untap target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.U)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/NiblisOfTheMist.java b/Mage.Sets/src/mage/sets/darkascension/NiblisOfTheMist.java index 3d0c36bd55e..df556137711 100644 --- a/Mage.Sets/src/mage/sets/darkascension/NiblisOfTheMist.java +++ b/Mage.Sets/src/mage/sets/darkascension/NiblisOfTheMist.java @@ -56,7 +56,7 @@ public class NiblisOfTheMist extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Niblis of the Mist enters the battlefield, you may tap target creature. Ability ability = new EntersBattlefieldTriggeredAbility(new TapTargetEffect(), true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/NiblisOfTheUrn.java b/Mage.Sets/src/mage/sets/darkascension/NiblisOfTheUrn.java index 349544de987..8e83c5ff142 100644 --- a/Mage.Sets/src/mage/sets/darkascension/NiblisOfTheUrn.java +++ b/Mage.Sets/src/mage/sets/darkascension/NiblisOfTheUrn.java @@ -56,7 +56,7 @@ public class NiblisOfTheUrn extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Whenever Niblis of the Urn attacks, you may tap target creature. Ability ability = new AttacksTriggeredAbility(new TapTargetEffect(), true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/RayOfRevelation.java b/Mage.Sets/src/mage/sets/darkascension/RayOfRevelation.java index 8509ddeb83c..28de9740c40 100644 --- a/Mage.Sets/src/mage/sets/darkascension/RayOfRevelation.java +++ b/Mage.Sets/src/mage/sets/darkascension/RayOfRevelation.java @@ -58,7 +58,7 @@ public class RayOfRevelation extends CardImpl { this.color.setWhite(true); // Destroy target enchantment. - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); // Flashback {G} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{G}"), TimingRule.INSTANT)); diff --git a/Mage.Sets/src/mage/sets/darkascension/SavingGrasp.java b/Mage.Sets/src/mage/sets/darkascension/SavingGrasp.java index 5b637bb26fc..0bcdaa4c04f 100644 --- a/Mage.Sets/src/mage/sets/darkascension/SavingGrasp.java +++ b/Mage.Sets/src/mage/sets/darkascension/SavingGrasp.java @@ -60,7 +60,7 @@ public class SavingGrasp extends CardImpl { this.color.setBlue(true); // Return target creature you own to your hand. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); // Flashback {W} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{W}"), TimingRule.INSTANT)); diff --git a/Mage.Sets/src/mage/sets/darkascension/SkillfulLunge.java b/Mage.Sets/src/mage/sets/darkascension/SkillfulLunge.java index a8692216a39..d919c13d58d 100644 --- a/Mage.Sets/src/mage/sets/darkascension/SkillfulLunge.java +++ b/Mage.Sets/src/mage/sets/darkascension/SkillfulLunge.java @@ -50,7 +50,7 @@ public class SkillfulLunge extends CardImpl { this.color.setWhite(true); // Target creature gets +2/+0 and gains first strike until end of turn. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(2, 0, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/darkascension/SkirsdagFlayer.java b/Mage.Sets/src/mage/sets/darkascension/SkirsdagFlayer.java index a3bccac2eef..24ce0c2610f 100644 --- a/Mage.Sets/src/mage/sets/darkascension/SkirsdagFlayer.java +++ b/Mage.Sets/src/mage/sets/darkascension/SkirsdagFlayer.java @@ -70,7 +70,7 @@ public class SkirsdagFlayer extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{3}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/SoulSeizer.java b/Mage.Sets/src/mage/sets/darkascension/SoulSeizer.java index 3e0a78c2854..042ff239834 100644 --- a/Mage.Sets/src/mage/sets/darkascension/SoulSeizer.java +++ b/Mage.Sets/src/mage/sets/darkascension/SoulSeizer.java @@ -110,7 +110,7 @@ class SoulSeizerTriggeredAbility extends TriggeredAbilityImpl { filter.add(new ControllerIdPredicate(opponent.getId())); this.getTargets().clear(); - this.addTarget(new TargetCreaturePermanent(filter, true)); + this.addTarget(new TargetCreaturePermanent(filter)); return true; } } diff --git a/Mage.Sets/src/mage/sets/darkascension/SpitefulShadows.java b/Mage.Sets/src/mage/sets/darkascension/SpitefulShadows.java index 8c6ee905f6a..8edec1db5dc 100644 --- a/Mage.Sets/src/mage/sets/darkascension/SpitefulShadows.java +++ b/Mage.Sets/src/mage/sets/darkascension/SpitefulShadows.java @@ -60,7 +60,7 @@ public class SpitefulShadows extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/darkascension/SuddenDisappearance.java b/Mage.Sets/src/mage/sets/darkascension/SuddenDisappearance.java index a0970b6d421..24adcc833d9 100644 --- a/Mage.Sets/src/mage/sets/darkascension/SuddenDisappearance.java +++ b/Mage.Sets/src/mage/sets/darkascension/SuddenDisappearance.java @@ -58,7 +58,7 @@ public class SuddenDisappearance extends CardImpl { // Exile all nonland permanents target player controls. Return the exiled cards to the battlefield under their owner's control at the beginning of the next end step. this.getSpellAbility().addEffect(new SuddenDisappearanceEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } diff --git a/Mage.Sets/src/mage/sets/darkascension/TalonsOfFalkenrath.java b/Mage.Sets/src/mage/sets/darkascension/TalonsOfFalkenrath.java index 4cb93c98cc9..76361303026 100644 --- a/Mage.Sets/src/mage/sets/darkascension/TalonsOfFalkenrath.java +++ b/Mage.Sets/src/mage/sets/darkascension/TalonsOfFalkenrath.java @@ -61,7 +61,7 @@ public class TalonsOfFalkenrath extends CardImpl { this.addAbility(FlashAbility.getInstance()); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/darkascension/ThoughtScour.java b/Mage.Sets/src/mage/sets/darkascension/ThoughtScour.java index f5731ad65b4..9af3fc06d91 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ThoughtScour.java +++ b/Mage.Sets/src/mage/sets/darkascension/ThoughtScour.java @@ -48,7 +48,7 @@ public class ThoughtScour extends CardImpl { this.color.setBlue(true); // Target player puts the top two cards of his or her library into his or her graveyard. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(2)); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/darkascension/TragicSlip.java b/Mage.Sets/src/mage/sets/darkascension/TragicSlip.java index c6173cec68a..239ff892388 100644 --- a/Mage.Sets/src/mage/sets/darkascension/TragicSlip.java +++ b/Mage.Sets/src/mage/sets/darkascension/TragicSlip.java @@ -59,7 +59,7 @@ public class TragicSlip extends CardImpl { new LockedInCondition(MorbidCondition.getInstance()), "Target creature gets -1/-1 until end of turn. Morbid - That creature gets -13/-13 until end of turn instead if a creature died this turn", true)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public TragicSlip(final TragicSlip card) { diff --git a/Mage.Sets/src/mage/sets/darkascension/UlvenwaldBear.java b/Mage.Sets/src/mage/sets/darkascension/UlvenwaldBear.java index ccc750fe2f3..157ace84484 100644 --- a/Mage.Sets/src/mage/sets/darkascension/UlvenwaldBear.java +++ b/Mage.Sets/src/mage/sets/darkascension/UlvenwaldBear.java @@ -60,7 +60,7 @@ public class UlvenwaldBear extends CardImpl { // Morbid - When Ulvenwald Bear enters the battlefield, if a creature died this turn, put two +1/+1 counters on target creature. Ability ability = new ConditionalTriggeredAbility(new EntersBattlefieldTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance(2), Outcome.BoostCreature)), MorbidCondition.getInstance(), "When {this} enters the battlefield, if a creature died this turn, put two +1/+1 counters on target creature."); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/UndyingEvil.java b/Mage.Sets/src/mage/sets/darkascension/UndyingEvil.java index a36b5620e0c..d4aa4ddfaad 100644 --- a/Mage.Sets/src/mage/sets/darkascension/UndyingEvil.java +++ b/Mage.Sets/src/mage/sets/darkascension/UndyingEvil.java @@ -50,7 +50,7 @@ public class UndyingEvil extends CardImpl { // Target creature gains undying until end of turn. this.getSpellAbility().addEffect(new GainAbilityTargetEffect(new UndyingAbility(), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public UndyingEvil(final UndyingEvil card) { diff --git a/Mage.Sets/src/mage/sets/darkascension/WerewolfRansacker.java b/Mage.Sets/src/mage/sets/darkascension/WerewolfRansacker.java index 338c5a3cf8d..8e42aaa0d39 100644 --- a/Mage.Sets/src/mage/sets/darkascension/WerewolfRansacker.java +++ b/Mage.Sets/src/mage/sets/darkascension/WerewolfRansacker.java @@ -99,7 +99,7 @@ class WerewolfRansackerAbility extends TriggeredAbilityImpl { public WerewolfRansackerAbility() { super(Zone.BATTLEFIELD, new WerewolfRansackerEffect(), true); - Target target = new TargetPermanent(filter, true); + Target target = new TargetPermanent(filter); target.setRequired(true); this.addTarget(target); } diff --git a/Mage.Sets/src/mage/sets/darkascension/WildHunger.java b/Mage.Sets/src/mage/sets/darkascension/WildHunger.java index aeef3db047d..74f8334a8d5 100644 --- a/Mage.Sets/src/mage/sets/darkascension/WildHunger.java +++ b/Mage.Sets/src/mage/sets/darkascension/WildHunger.java @@ -53,7 +53,7 @@ public class WildHunger extends CardImpl { this.color.setGreen(true); // Target creature gets +3/+1 and gains trample until end of turn. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(3, 1, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); // Flashback {3}{R} diff --git a/Mage.Sets/src/mage/sets/darkascension/WolfhuntersQuiver.java b/Mage.Sets/src/mage/sets/darkascension/WolfhuntersQuiver.java index 0335ea3eac7..4d8d99d6f1a 100644 --- a/Mage.Sets/src/mage/sets/darkascension/WolfhuntersQuiver.java +++ b/Mage.Sets/src/mage/sets/darkascension/WolfhuntersQuiver.java @@ -68,7 +68,7 @@ public class WolfhuntersQuiver extends CardImpl { WolfhuntersQuiverAbility ability = new WolfhuntersQuiverAbility(1, new TargetCreatureOrPlayer()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.EQUIPMENT))); // and "{tap}: This creature deals 3 damage to target Werewolf creature." - ability = new WolfhuntersQuiverAbility(3, new TargetCreaturePermanent(filter, true)); + ability = new WolfhuntersQuiverAbility(3, new TargetCreaturePermanent(filter)); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.EQUIPMENT))); // Equip {5} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(5))); diff --git a/Mage.Sets/src/mage/sets/darkascension/WrackWithMadness.java b/Mage.Sets/src/mage/sets/darkascension/WrackWithMadness.java index 9b7709400a6..f9c92f10c83 100644 --- a/Mage.Sets/src/mage/sets/darkascension/WrackWithMadness.java +++ b/Mage.Sets/src/mage/sets/darkascension/WrackWithMadness.java @@ -52,7 +52,7 @@ public class WrackWithMadness extends CardImpl { // Target creature deals damage to itself equal to its power. this.getSpellAbility().addEffect(new WrackWithMadnessEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public WrackWithMadness(final WrackWithMadness card) { diff --git a/Mage.Sets/src/mage/sets/darksteel/BlinkmothNexus.java b/Mage.Sets/src/mage/sets/darksteel/BlinkmothNexus.java index ce1c22753c5..755c4546519 100644 --- a/Mage.Sets/src/mage/sets/darksteel/BlinkmothNexus.java +++ b/Mage.Sets/src/mage/sets/darksteel/BlinkmothNexus.java @@ -67,7 +67,7 @@ public class BlinkmothNexus extends CardImpl { this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new BlinkmothNexusToken(), "land", Duration.EndOfTurn), new GenericManaCost(1))); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darksteel/Coretapper.java b/Mage.Sets/src/mage/sets/darksteel/Coretapper.java index a33df70c444..98b74c3f3df 100644 --- a/Mage.Sets/src/mage/sets/darksteel/Coretapper.java +++ b/Mage.Sets/src/mage/sets/darksteel/Coretapper.java @@ -63,10 +63,10 @@ public class Coretapper extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); - firstAbility.addTarget(new TargetPermanent(filter, true)); + firstAbility.addTarget(new TargetPermanent(filter)); this.addAbility(firstAbility); Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.CHARGE.createInstance(2)), new SacrificeSourceCost()); - secondAbility.addTarget(new TargetPermanent(filter, true)); + secondAbility.addTarget(new TargetPermanent(filter)); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/sets/darksteel/EchoingCalm.java b/Mage.Sets/src/mage/sets/darksteel/EchoingCalm.java index 90dac8fd94a..c39e2977f57 100644 --- a/Mage.Sets/src/mage/sets/darksteel/EchoingCalm.java +++ b/Mage.Sets/src/mage/sets/darksteel/EchoingCalm.java @@ -57,7 +57,7 @@ public class EchoingCalm extends CardImpl { this.color.setWhite(true); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new EchoingCalmEffect()); } diff --git a/Mage.Sets/src/mage/sets/darksteel/LeoninBola.java b/Mage.Sets/src/mage/sets/darksteel/LeoninBola.java index be0a111b49e..ca4de4f1fab 100644 --- a/Mage.Sets/src/mage/sets/darksteel/LeoninBola.java +++ b/Mage.Sets/src/mage/sets/darksteel/LeoninBola.java @@ -58,7 +58,7 @@ public class LeoninBola extends CardImpl { // Equipped creature has "{tap}, Unattach Leonin Bola: Tap target creature." Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); gainAbility.addCost(new UnattachCost(this.getId())); - gainAbility.addTarget(new TargetCreaturePermanent(true)); + gainAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainAbility, AttachmentType.EQUIPMENT))); // Equip {1} diff --git a/Mage.Sets/src/mage/sets/darksteel/LoxodonMystic.java b/Mage.Sets/src/mage/sets/darksteel/LoxodonMystic.java index 00d1d8218dd..cdcc5270a5a 100644 --- a/Mage.Sets/src/mage/sets/darksteel/LoxodonMystic.java +++ b/Mage.Sets/src/mage/sets/darksteel/LoxodonMystic.java @@ -58,7 +58,7 @@ public class LoxodonMystic extends CardImpl { this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darksteel/Oxidize.java b/Mage.Sets/src/mage/sets/darksteel/Oxidize.java index b2e98c7cddf..b42c5842709 100644 --- a/Mage.Sets/src/mage/sets/darksteel/Oxidize.java +++ b/Mage.Sets/src/mage/sets/darksteel/Oxidize.java @@ -54,7 +54,7 @@ public class Oxidize extends CardImpl { this.expansionSetCode = "DST"; this.color.setGreen(true); this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); } public Oxidize(final Oxidize card) { diff --git a/Mage.Sets/src/mage/sets/darksteel/PteronGhost.java b/Mage.Sets/src/mage/sets/darksteel/PteronGhost.java index 0417998ef25..4e237278601 100644 --- a/Mage.Sets/src/mage/sets/darksteel/PteronGhost.java +++ b/Mage.Sets/src/mage/sets/darksteel/PteronGhost.java @@ -64,7 +64,7 @@ public class PteronGhost extends CardImpl { this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new SacrificeSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darksteel/SlobadGoblinTinkerer.java b/Mage.Sets/src/mage/sets/darksteel/SlobadGoblinTinkerer.java index dd552d7639b..3d61499468b 100644 --- a/Mage.Sets/src/mage/sets/darksteel/SlobadGoblinTinkerer.java +++ b/Mage.Sets/src/mage/sets/darksteel/SlobadGoblinTinkerer.java @@ -76,7 +76,7 @@ public class SlobadGoblinTinkerer extends CardImpl { effect.setText("Target artifact is indestructible this turn"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new SacrificeTargetCost(new TargetControlledPermanent(filterControlled))); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darksteel/SpawningPit.java b/Mage.Sets/src/mage/sets/darksteel/SpawningPit.java index c628562df37..b92005e5c09 100644 --- a/Mage.Sets/src/mage/sets/darksteel/SpawningPit.java +++ b/Mage.Sets/src/mage/sets/darksteel/SpawningPit.java @@ -55,7 +55,7 @@ public class SpawningPit extends CardImpl { public SpawningPit (UUID ownerId) { super(ownerId, 141, "Spawning Pit", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "DST"; - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SpawningPitToken()), new GenericManaCost(1)); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(2))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/darksteel/SwordOfFireAndIce.java b/Mage.Sets/src/mage/sets/darksteel/SwordOfFireAndIce.java index b18f2a2d35f..4e409c639b0 100644 --- a/Mage.Sets/src/mage/sets/darksteel/SwordOfFireAndIce.java +++ b/Mage.Sets/src/mage/sets/darksteel/SwordOfFireAndIce.java @@ -99,7 +99,7 @@ class SwordOfFireAndIceAbility extends TriggeredAbilityImpl { public SwordOfFireAndIceAbility() { super(Zone.BATTLEFIELD, new DamageTargetEffect(2)); this.addEffect(new DrawCardSourceControllerEffect(1)); - this.addTarget(new TargetCreatureOrPlayer(true)); + this.addTarget(new TargetCreatureOrPlayer()); } public SwordOfFireAndIceAbility(final SwordOfFireAndIceAbility ability) { diff --git a/Mage.Sets/src/mage/sets/darksteel/ViridianZealot.java b/Mage.Sets/src/mage/sets/darksteel/ViridianZealot.java index 0eb1c236d62..731850a4c8d 100644 --- a/Mage.Sets/src/mage/sets/darksteel/ViridianZealot.java +++ b/Mage.Sets/src/mage/sets/darksteel/ViridianZealot.java @@ -68,7 +68,7 @@ public class ViridianZealot extends CardImpl { this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{G}")); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darksteel/VoltaicConstruct.java b/Mage.Sets/src/mage/sets/darksteel/VoltaicConstruct.java index 50430ece062..58d35b45d45 100644 --- a/Mage.Sets/src/mage/sets/darksteel/VoltaicConstruct.java +++ b/Mage.Sets/src/mage/sets/darksteel/VoltaicConstruct.java @@ -62,7 +62,7 @@ public class VoltaicConstruct extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new GenericManaCost(2)); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/dissension/BeaconHawk.java b/Mage.Sets/src/mage/sets/dissension/BeaconHawk.java index f54afa12899..0713e492919 100644 --- a/Mage.Sets/src/mage/sets/dissension/BeaconHawk.java +++ b/Mage.Sets/src/mage/sets/dissension/BeaconHawk.java @@ -56,7 +56,7 @@ public class BeaconHawk extends CardImpl { this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new UntapTargetEffect(), true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.W))); } diff --git a/Mage.Sets/src/mage/sets/dissension/ExperimentKraj.java b/Mage.Sets/src/mage/sets/dissension/ExperimentKraj.java index 76157892eb5..6fefb01da8f 100644 --- a/Mage.Sets/src/mage/sets/dissension/ExperimentKraj.java +++ b/Mage.Sets/src/mage/sets/dissension/ExperimentKraj.java @@ -75,7 +75,7 @@ public class ExperimentKraj extends CardImpl { // {tap}: Put a +1/+1 counter on target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()),new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/dissension/HaazdaExonerator.java b/Mage.Sets/src/mage/sets/dissension/HaazdaExonerator.java index dfc8ea4ff48..0b3b806fab6 100644 --- a/Mage.Sets/src/mage/sets/dissension/HaazdaExonerator.java +++ b/Mage.Sets/src/mage/sets/dissension/HaazdaExonerator.java @@ -65,7 +65,7 @@ public class HaazdaExonerator extends CardImpl { this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/dissension/HideSeek.java b/Mage.Sets/src/mage/sets/dissension/HideSeek.java index a028528bfd0..26f8c3efe9e 100644 --- a/Mage.Sets/src/mage/sets/dissension/HideSeek.java +++ b/Mage.Sets/src/mage/sets/dissension/HideSeek.java @@ -75,14 +75,14 @@ public class HideSeek extends SplitCard { getLeftHalfCard().getColor().setRed(true); getLeftHalfCard().getColor().setWhite(true); getLeftHalfCard().getSpellAbility().addEffect(new PutOnLibraryTargetEffect(false)); - getLeftHalfCard().getSpellAbility().addTarget(new TargetPermanent(filter, true)); + getLeftHalfCard().getSpellAbility().addTarget(new TargetPermanent(filter)); // Seek // Search target opponent's library for a card and exile it. You gain life equal to its converted mana cost. Then that player shuffles his or her library.. getRightHalfCard().getColor().setWhite(true); getRightHalfCard().getColor().setBlack(true); getRightHalfCard().getSpellAbility().addEffect(new SeekEffect()); - getRightHalfCard().getSpellAbility().addTarget(new TargetOpponent(true)); + getRightHalfCard().getSpellAbility().addTarget(new TargetOpponent()); } diff --git a/Mage.Sets/src/mage/sets/dissension/IndrikStomphowler.java b/Mage.Sets/src/mage/sets/dissension/IndrikStomphowler.java index aaf0714de1b..43e963a19b8 100644 --- a/Mage.Sets/src/mage/sets/dissension/IndrikStomphowler.java +++ b/Mage.Sets/src/mage/sets/dissension/IndrikStomphowler.java @@ -62,7 +62,7 @@ public class IndrikStomphowler extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/dissension/LoamingShaman.java b/Mage.Sets/src/mage/sets/dissension/LoamingShaman.java index cd87d3e4257..38966f4454a 100644 --- a/Mage.Sets/src/mage/sets/dissension/LoamingShaman.java +++ b/Mage.Sets/src/mage/sets/dissension/LoamingShaman.java @@ -62,7 +62,7 @@ public class LoamingShaman extends CardImpl { // When Loaming Shaman enters the battlefield, target player shuffles any number of target cards from his or her graveyard into his or her library. Ability ability = new EntersBattlefieldTriggeredAbility(new LoamingShamanEffect(), false); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); ability.addTarget(new LoamingShamanTargetCardsInGraveyard(0, Integer.MAX_VALUE, new FilterCard("cards in target player's graveyard"))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/dissension/MinisterOfImpediments.java b/Mage.Sets/src/mage/sets/dissension/MinisterOfImpediments.java index 37be79669e5..2ec6770bf09 100644 --- a/Mage.Sets/src/mage/sets/dissension/MinisterOfImpediments.java +++ b/Mage.Sets/src/mage/sets/dissension/MinisterOfImpediments.java @@ -56,7 +56,7 @@ public class MinisterOfImpediments extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/dissension/OddsEnds.java b/Mage.Sets/src/mage/sets/dissension/OddsEnds.java index 08bb9fb49a8..761f8a793df 100644 --- a/Mage.Sets/src/mage/sets/dissension/OddsEnds.java +++ b/Mage.Sets/src/mage/sets/dissension/OddsEnds.java @@ -81,7 +81,7 @@ public class OddsEnds extends SplitCard { getRightHalfCard().getColor().setRed(true); getRightHalfCard().getColor().setWhite(true); getRightHalfCard().getSpellAbility().addEffect(new SacrificeEffect(new FilterAttackingCreature(), 2, "Target player")); - getRightHalfCard().getSpellAbility().addTarget(new TargetPlayer(true)); + getRightHalfCard().getSpellAbility().addTarget(new TargetPlayer()); } diff --git a/Mage.Sets/src/mage/sets/dissension/PsychoticFury.java b/Mage.Sets/src/mage/sets/dissension/PsychoticFury.java index 919f1832738..33511ad39dd 100644 --- a/Mage.Sets/src/mage/sets/dissension/PsychoticFury.java +++ b/Mage.Sets/src/mage/sets/dissension/PsychoticFury.java @@ -60,7 +60,7 @@ public class PsychoticFury extends CardImpl { this.color.setRed(true); // Target multicolored creature gains double strike until end of turn. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn)); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/dissension/RiotSpikes.java b/Mage.Sets/src/mage/sets/dissension/RiotSpikes.java index 537a58a6a57..ea642ee344f 100644 --- a/Mage.Sets/src/mage/sets/dissension/RiotSpikes.java +++ b/Mage.Sets/src/mage/sets/dissension/RiotSpikes.java @@ -51,7 +51,7 @@ public class RiotSpikes extends CardImpl { this.subtype.add("Aura"); this.color.setRed(true); this.color.setBlack(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/dissension/SealOfDoom.java b/Mage.Sets/src/mage/sets/dissension/SealOfDoom.java index 1f043abe593..ccc025dfe80 100644 --- a/Mage.Sets/src/mage/sets/dissension/SealOfDoom.java +++ b/Mage.Sets/src/mage/sets/dissension/SealOfDoom.java @@ -59,7 +59,7 @@ public class SealOfDoom extends CardImpl { this.expansionSetCode = "DIS"; this.color.setBlack(true); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(true), new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/dissension/SteelingStance.java b/Mage.Sets/src/mage/sets/dissension/SteelingStance.java index a041423aad9..a21f0acf8d1 100644 --- a/Mage.Sets/src/mage/sets/dissension/SteelingStance.java +++ b/Mage.Sets/src/mage/sets/dissension/SteelingStance.java @@ -55,7 +55,7 @@ public class SteelingStance extends CardImpl { this.getSpellAbility().addEffect(new BoostControlledEffect(1,1, Duration.EndOfTurn)); // Forecast - {W}, Reveal Steeling Stance from your hand: Target creature gets +1/+1 until end of turn. Ability ability = new ForecastAbility(new BoostTargetEffect(1,1, Duration.EndOfTurn), new ManaCostsImpl("{W}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/dissension/TidespoutTyrant.java b/Mage.Sets/src/mage/sets/dissension/TidespoutTyrant.java index 4de541968fa..23eadcf3f72 100644 --- a/Mage.Sets/src/mage/sets/dissension/TidespoutTyrant.java +++ b/Mage.Sets/src/mage/sets/dissension/TidespoutTyrant.java @@ -57,7 +57,7 @@ public class TidespoutTyrant extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Whenever you cast a spell, return target permanent to its owner's hand. Ability ability = new SpellCastControllerTriggeredAbility(new ReturnToHandTargetEffect(), false); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ArmedDangerous.java b/Mage.Sets/src/mage/sets/dragonsmaze/ArmedDangerous.java index 6b69d3ba913..6f02251658b 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/ArmedDangerous.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ArmedDangerous.java @@ -59,13 +59,13 @@ public class ArmedDangerous extends SplitCard { getLeftHalfCard().getColor().setRed(true); getLeftHalfCard().getSpellAbility().addEffect(new BoostTargetEffect(1,1, Duration.EndOfTurn)); getLeftHalfCard().getSpellAbility().addEffect(new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn)); - getLeftHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + getLeftHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent()); // Dangerous // All creatures able to block target creature this turn do so. getRightHalfCard().getColor().setGreen(true); getRightHalfCard().getSpellAbility().addEffect(new MustBeBlockedByAllTargetEffect(Duration.EndOfTurn)); - getRightHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + getRightHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/BreakingEntering.java b/Mage.Sets/src/mage/sets/dragonsmaze/BreakingEntering.java index 1d8370553f4..061a68c0f31 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/BreakingEntering.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/BreakingEntering.java @@ -72,7 +72,7 @@ public class BreakingEntering extends SplitCard { getLeftHalfCard().getColor().setBlue(true); getLeftHalfCard().getColor().setBlack(true); getLeftHalfCard().getSpellAbility().addEffect(new PutTopCardOfLibraryIntoGraveTargetEffect(8)); - getLeftHalfCard().getSpellAbility().addTarget(new TargetPlayer(true)); + getLeftHalfCard().getSpellAbility().addTarget(new TargetPlayer()); // Entering // Put a creature card from a graveyard onto the battlefield under your control. It gains haste until end of turn. diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ClearAPath.java b/Mage.Sets/src/mage/sets/dragonsmaze/ClearAPath.java index eb4261dbcee..b7d82fa50fe 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/ClearAPath.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ClearAPath.java @@ -59,7 +59,7 @@ public class ClearAPath extends CardImpl { // Destroy target creature with defender. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); this.getSpellAbility().addTarget(target); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/CryptIncursion.java b/Mage.Sets/src/mage/sets/dragonsmaze/CryptIncursion.java index 9ceb28300b9..2463c4d4f81 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/CryptIncursion.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/CryptIncursion.java @@ -55,7 +55,7 @@ public class CryptIncursion extends CardImpl { this.color.setBlack(true); // Exile all creature cards from target player's graveyard. You gain 3 life for each card exiled this way. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new CryptIncursionEffect()); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/DeputyOfAcquittals.java b/Mage.Sets/src/mage/sets/dragonsmaze/DeputyOfAcquittals.java index 8d0912a89b4..c05e1d47ca7 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/DeputyOfAcquittals.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/DeputyOfAcquittals.java @@ -70,7 +70,7 @@ public class DeputyOfAcquittals extends CardImpl { this.addAbility(FlashAbility.getInstance()); // When Deputy of Acquittals enters the battlefield, you may return another target creature you control to its owner's hand. Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect(), true); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/DownDirty.java b/Mage.Sets/src/mage/sets/dragonsmaze/DownDirty.java index a6df9ac2055..8f6e6827ec5 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/DownDirty.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/DownDirty.java @@ -56,7 +56,7 @@ public class DownDirty extends SplitCard { // Target player discards two cards. getLeftHalfCard().getColor().setBlack(true); getLeftHalfCard().getSpellAbility().addEffect(new DiscardTargetEffect(2)); - getLeftHalfCard().getSpellAbility().addTarget(new TargetPlayer(true)); + getLeftHalfCard().getSpellAbility().addTarget(new TargetPlayer()); // Dirty // Return target card from your graveyard to your hand. diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/Dragonshift.java b/Mage.Sets/src/mage/sets/dragonsmaze/Dragonshift.java index 3be7b616004..0178b364d0d 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/Dragonshift.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/Dragonshift.java @@ -70,7 +70,7 @@ public class Dragonshift extends CardImpl { // Until end of turn, target creature you control becomes a 4/4 blue and red Dragon, loses all abilities, and gains flying. this.getSpellAbility().addEffect(new LoseAllAbilitiesTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new BecomesCreatureTargetEffect(new DragonToken(), null, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); // Overload {3}{U}{U}{R}{R} Ability ability = new OverloadAbility(this, new LoseAllAbilitiesAllEffect(new FilterControlledCreaturePermanent(""), Duration.EndOfTurn), new ManaCostsImpl("{3}{U}{U}{R}{R}")); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/DrownInFilth.java b/Mage.Sets/src/mage/sets/dragonsmaze/DrownInFilth.java index 81e615ead6b..1398f5be047 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/DrownInFilth.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/DrownInFilth.java @@ -55,7 +55,7 @@ public class DrownInFilth extends CardImpl { this.color.setBlack(true); // Choose target creature. Put the top four cards of your library into your graveyard, then that creature gets -1/-1 until end of turn for each land card in your graveyard. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); Effect effect = new PutTopCardOfLibraryIntoGraveControllerEffect(4); effect.setText("Choose target creature. Put the top four cards of your library into your graveyard"); this.getSpellAbility().addEffect(effect); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/FarAway.java b/Mage.Sets/src/mage/sets/dragonsmaze/FarAway.java index 694ce00dc00..a35e569b005 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/FarAway.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/FarAway.java @@ -57,13 +57,13 @@ public class FarAway extends SplitCard { // Return target creature to its owner's hand. getLeftHalfCard().getColor().setBlue(true); getLeftHalfCard().getSpellAbility().addEffect(new ReturnToHandTargetEffect()); - getLeftHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + getLeftHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent()); // Away // Target player sacrifices a creature. getRightHalfCard().getColor().setBlack(true); getRightHalfCard().getSpellAbility().addEffect(new SacrificeEffect(new FilterCreaturePermanent(), 1, "Target player")); - getRightHalfCard().getSpellAbility().addTarget(new TargetPlayer(true)); + getRightHalfCard().getSpellAbility().addTarget(new TargetPlayer()); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/FatalFumes.java b/Mage.Sets/src/mage/sets/dragonsmaze/FatalFumes.java index 0fa39849e68..060cc814fe3 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/FatalFumes.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/FatalFumes.java @@ -50,7 +50,7 @@ public class FatalFumes extends CardImpl { this.color.setBlack(true); // Target creature gets -4/-2 until end of turn. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(-4,-2, Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/FleshBlood.java b/Mage.Sets/src/mage/sets/dragonsmaze/FleshBlood.java index 5384b5b7d2f..bf547ab3892 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/FleshBlood.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/FleshBlood.java @@ -71,15 +71,15 @@ public class FleshBlood extends SplitCard { Target target = new TargetCardInGraveyard(new FilterCreatureCard()); target.setRequired(true); getLeftHalfCard().getSpellAbility().addTarget(target); - getLeftHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + getLeftHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent()); getLeftHalfCard().getSpellAbility().addEffect(new FleshEffect()); // Blood // Target creature you control deals damage equal to its power to target creature or player. getRightHalfCard().getColor().setRed(true); getRightHalfCard().getColor().setGreen(true); - getRightHalfCard().getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); - getRightHalfCard().getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); + getRightHalfCard().getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); + getRightHalfCard().getSpellAbility().addTarget(new TargetCreatureOrPlayer()); getRightHalfCard().getSpellAbility().addEffect(new BloodEffect()); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/GiveTake.java b/Mage.Sets/src/mage/sets/dragonsmaze/GiveTake.java index 1661a9dd2f2..b273b8cac5d 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/GiveTake.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/GiveTake.java @@ -58,13 +58,13 @@ public class GiveTake extends SplitCard { // Give // Put three +1/+1 counters on target creature. getLeftHalfCard().getSpellAbility().addEffect(new AddCountersTargetEffect(CounterType.P1P1.createInstance(3))); - getLeftHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + getLeftHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent()); getLeftHalfCard().getColor().setGreen(true); // Take // Remove all +1/+1 counters from target creature you control. Draw that many cards. getRightHalfCard().getSpellAbility().addEffect(new TakeEffect()); - getRightHalfCard().getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); + getRightHalfCard().getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); getLeftHalfCard().getColor().setBlue(true); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/HaazdaSnareSquad.java b/Mage.Sets/src/mage/sets/dragonsmaze/HaazdaSnareSquad.java index 23bcd4340af..5dc2cede592 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/HaazdaSnareSquad.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/HaazdaSnareSquad.java @@ -70,7 +70,7 @@ public class HaazdaSnareSquad extends CardImpl { // Whenever Haazda Snare Squad attacks you may pay {W}. If you do, tap target creature an opponent controls. Ability ability = new AttacksTriggeredAbility(new DoIfCostPaid(new TapTargetEffect(""), new ManaCostsImpl("{W}")),false, "Whenever {this} attacks you may pay {W}. If you do, tap target creature an opponent controls."); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/HiredTorturer.java b/Mage.Sets/src/mage/sets/dragonsmaze/HiredTorturer.java index aca02636ad0..58682b3992e 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/HiredTorturer.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/HiredTorturer.java @@ -72,7 +72,7 @@ public class HiredTorturer extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2),new ManaCostsImpl("{3}{B}")); ability.addCost(new TapSourceCost()); ability.addEffect(new HiredTorturerEffect()); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/KorozdaGorgon.java b/Mage.Sets/src/mage/sets/dragonsmaze/KorozdaGorgon.java index 75d1a4bcd02..5ca47e4b42e 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/KorozdaGorgon.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/KorozdaGorgon.java @@ -64,8 +64,8 @@ public class KorozdaGorgon extends CardImpl { this.addAbility(DeathtouchAbility.getInstance()); // {2}, Remove a +1/+1 counter from a creature you control: Target creature gets -1/-1 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1,-1, Duration.EndOfTurn), new GenericManaCost(2)); - ability.addCost(new RemoveCounterCost(new TargetControlledCreaturePermanent(true), CounterType.P1P1)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addCost(new RemoveCounterCost(new TargetControlledCreaturePermanent(), CounterType.P1P1)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/KrasisIncubation.java b/Mage.Sets/src/mage/sets/dragonsmaze/KrasisIncubation.java index 0470b7f4c43..80709a734e7 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/KrasisIncubation.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/KrasisIncubation.java @@ -61,7 +61,7 @@ public class KrasisIncubation extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.LoseLife)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/MawOfTheObzedat.java b/Mage.Sets/src/mage/sets/dragonsmaze/MawOfTheObzedat.java index 88180328640..f460390faf4 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/MawOfTheObzedat.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/MawOfTheObzedat.java @@ -62,7 +62,7 @@ public class MawOfTheObzedat extends CardImpl { this.toughness = new MageInt(3); // Sacrifice a creature: Creatures you control get +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.EndOfTurn, filter, false), new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.EndOfTurn, filter, false), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/MendingTouch.java b/Mage.Sets/src/mage/sets/dragonsmaze/MendingTouch.java index 0a472466988..c66526bad73 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/MendingTouch.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/MendingTouch.java @@ -50,7 +50,7 @@ public class MendingTouch extends CardImpl { // Regenerate target creature. this.getSpellAbility().addEffect(new RegenerateTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public MendingTouch(final MendingTouch card) { diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/MorgueBurst.java b/Mage.Sets/src/mage/sets/dragonsmaze/MorgueBurst.java index 653a3adc55f..9619c2b03a6 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/MorgueBurst.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/MorgueBurst.java @@ -61,7 +61,7 @@ public class MorgueBurst extends CardImpl { // Return target creature card from your graveyard to your hand. Morgue Burst deals damage to target creature or player equal to the power of the card returned this way. this.getSpellAbility().addEffect(new MorgueBurstEffect()); this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard"))); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); } public MorgueBurst(final MorgueBurst card) { diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/Phytoburst.java b/Mage.Sets/src/mage/sets/dragonsmaze/Phytoburst.java index 70c407fb37d..c0bc098b353 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/Phytoburst.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/Phytoburst.java @@ -52,7 +52,7 @@ public class Phytoburst extends CardImpl { // Target creature gets +5/+5 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(5,5, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public Phytoburst(final Phytoburst card) { diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/PilferedPlans.java b/Mage.Sets/src/mage/sets/dragonsmaze/PilferedPlans.java index 3a042050f14..b9b74eb59cb 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/PilferedPlans.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/PilferedPlans.java @@ -51,7 +51,7 @@ public class PilferedPlans extends CardImpl { // Target player puts the top two cards of his or her library into his or her graveyard. Draw two cards. this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(2)); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(2)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ProtectServe.java b/Mage.Sets/src/mage/sets/dragonsmaze/ProtectServe.java index 981aa007a34..b78e983e8ba 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/ProtectServe.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ProtectServe.java @@ -55,13 +55,13 @@ public class ProtectServe extends SplitCard { // Target creature gets +2/+4 until end of turn. getLeftHalfCard().getColor().setWhite(true); getLeftHalfCard().getSpellAbility().addEffect(new BoostTargetEffect(2,4, Duration.EndOfTurn)); - getLeftHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + getLeftHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent()); // Serve // Target creature gets -6/-0 until end of turn. getRightHalfCard().getColor().setBlue(true); getRightHalfCard().getSpellAbility().addEffect(new BoostTargetEffect(-6,0, Duration.EndOfTurn)); - getRightHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + getRightHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/PunishTheEnemy.java b/Mage.Sets/src/mage/sets/dragonsmaze/PunishTheEnemy.java index f5c41a1634a..7062da89ef5 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/PunishTheEnemy.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/PunishTheEnemy.java @@ -52,10 +52,10 @@ public class PunishTheEnemy extends CardImpl { // Punish the Enemy deals 3 damage to target player and 3 damage to target creature. this.getSpellAbility().addEffect(new DamageTargetEffect(3, true, "target player and 3 damage to target creature")); - Target target = new TargetPlayer(true); + Target target = new TargetPlayer(); target.setRequired(true); this.getSpellAbility().addTarget(target); - target = new TargetCreaturePermanent(true); + target = new TargetCreaturePermanent(); target.setRequired(true); this.getSpellAbility().addTarget(target); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/RalZarek.java b/Mage.Sets/src/mage/sets/dragonsmaze/RalZarek.java index 69783d9d082..5372f96af1f 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/RalZarek.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/RalZarek.java @@ -70,7 +70,7 @@ public class RalZarek extends CardImpl { // -2: Ral Zarek deals 3 damage to target creature or player. LoyaltyAbility ability2 = new LoyaltyAbility(new DamageTargetEffect(3), -2); - ability2.addTarget(new TargetCreatureOrPlayer(true)); + ability2.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability2); // -7: Flip five coins. Take an extra turn after this one for each coin that comes up heads. diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ReapIntellect.java b/Mage.Sets/src/mage/sets/dragonsmaze/ReapIntellect.java index e441605be81..4cc488dc0cc 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/ReapIntellect.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ReapIntellect.java @@ -63,7 +63,7 @@ public class ReapIntellect extends CardImpl { // Target opponent reveals his or her hand. You choose up to X nonland cards from it and exile them. For each card exiled this way, search that player's graveyard, hand, and library for any number of cards with the same name as that card and exile them. Then that player shuffles his or her library. this.getSpellAbility().addEffect(new ReapIntellectEffect()); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/RunnersBane.java b/Mage.Sets/src/mage/sets/dragonsmaze/RunnersBane.java index 62e676a7acc..c175c911b5b 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/RunnersBane.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/RunnersBane.java @@ -68,7 +68,7 @@ public class RunnersBane extends CardImpl { this.color.setBlue(true); // Enchant creature with power 3 or less - TargetPermanent auraTarget = new TargetCreaturePermanent(filter, true); + TargetPermanent auraTarget = new TargetCreaturePermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ScabClanGiant.java b/Mage.Sets/src/mage/sets/dragonsmaze/ScabClanGiant.java index 2e29ca2874e..6ab662db80d 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/ScabClanGiant.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ScabClanGiant.java @@ -69,7 +69,7 @@ public class ScabClanGiant extends CardImpl { // When Scab-Clan Giant enters the battlefield, it fights target creature an opponent controls chosen at random. Ability ability = new EntersBattlefieldTriggeredAbility(new ScabClanGiantEffect()); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRandom(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/SinCollector.java b/Mage.Sets/src/mage/sets/dragonsmaze/SinCollector.java index 385eb93dea5..4353be4c50a 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/SinCollector.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/SinCollector.java @@ -60,7 +60,7 @@ public class SinCollector extends CardImpl { // When Sin Collector enters the battlefield, target opponent reveals his or her hand. You choose an instant or sorcery card from it and exile that card. Ability ability = new EntersBattlefieldTriggeredAbility(new ExileCardYouChooseTargetOpponentEffect(new FilterInstantOrSorceryCard("an instant or sorcery card"))); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/SinisterPossession.java b/Mage.Sets/src/mage/sets/dragonsmaze/SinisterPossession.java index 027b31ec65c..09b8fa599ff 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/SinisterPossession.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/SinisterPossession.java @@ -61,7 +61,7 @@ public class SinisterPossession extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.LoseLife)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ToilTrouble.java b/Mage.Sets/src/mage/sets/dragonsmaze/ToilTrouble.java index 608f1a0f116..d6cedd8b72b 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/ToilTrouble.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ToilTrouble.java @@ -60,7 +60,7 @@ public class ToilTrouble extends SplitCard { // Toil // Target player draws two cards and loses 2 life. getLeftHalfCard().getColor().setBlack(true); - getLeftHalfCard().getSpellAbility().addTarget(new TargetPlayer(true)); + getLeftHalfCard().getSpellAbility().addTarget(new TargetPlayer()); getLeftHalfCard().getSpellAbility().addEffect(new DrawCardTargetEffect(2)); getLeftHalfCard().getSpellAbility().addEffect(new LoseLifeTargetEffect(2)); @@ -70,7 +70,7 @@ public class ToilTrouble extends SplitCard { Effect effect = new DamageTargetEffect(new TargetPlayerCardsInHandCount()); effect.setText("Trouble deals damage to target player equal to the number of cards in that player's hand"); getRightHalfCard().getSpellAbility().addEffect(effect); - getRightHalfCard().getSpellAbility().addTarget(new TargetPlayer(true)); + getRightHalfCard().getSpellAbility().addTarget(new TargetPlayer()); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/TurnBurn.java b/Mage.Sets/src/mage/sets/dragonsmaze/TurnBurn.java index c7241a59c7f..130f3ebf6b2 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/TurnBurn.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/TurnBurn.java @@ -61,7 +61,7 @@ public class TurnBurn extends SplitCard { getLeftHalfCard().getColor().setBlue(true); getLeftHalfCard().getSpellAbility().addEffect(new LoseAllAbilitiesTargetEffect(Duration.EndOfTurn)); getLeftHalfCard().getSpellAbility().addEffect(new BecomesCreatureTargetEffect(new WeirdToken(),null, Duration.EndOfTurn)); - getLeftHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + getLeftHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent()); // Burn // Burn deals 2 damage to target creature or player. @@ -69,7 +69,7 @@ public class TurnBurn extends SplitCard { Effect effect = new DamageTargetEffect(2); effect.setText("Burn deals 2 damage to target creature or player"); getRightHalfCard().getSpellAbility().addEffect(effect); - getRightHalfCard().getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); + getRightHalfCard().getSpellAbility().addTarget(new TargetCreatureOrPlayer()); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/UnflinchingCourage.java b/Mage.Sets/src/mage/sets/dragonsmaze/UnflinchingCourage.java index 8620f5009c9..0cc08a65ae5 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/UnflinchingCourage.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/UnflinchingCourage.java @@ -62,7 +62,7 @@ public class UnflinchingCourage extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/VorelOfTheHullClade.java b/Mage.Sets/src/mage/sets/dragonsmaze/VorelOfTheHullClade.java index a1af198f327..3397099d889 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/VorelOfTheHullClade.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/VorelOfTheHullClade.java @@ -76,7 +76,7 @@ public class VorelOfTheHullClade extends CardImpl { // {G}{U}, {tap}: For each counter on target artifact, creature, or land, put another of those counters on that permanent. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VorelOfTheHullCladeEffect(), new ManaCostsImpl("{G}{U}")); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/WarpedPhysique.java b/Mage.Sets/src/mage/sets/dragonsmaze/WarpedPhysique.java index d42f926a703..8d56fe50fd1 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/WarpedPhysique.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/WarpedPhysique.java @@ -57,7 +57,7 @@ public class WarpedPhysique extends CardImpl { // Target creature gets +X/-X until end of turn, where X is the number of cards in your hand. DynamicValue xValue = new CardsInControllerHandCount(); this.getSpellAbility().addEffect(new BoostTargetEffect(xValue, new SignInversionDynamicValue(xValue), Duration.EndOfTurn, true)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public WarpedPhysique(final WarpedPhysique card) { diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/WeaponSurge.java b/Mage.Sets/src/mage/sets/dragonsmaze/WeaponSurge.java index 73a8653b4a0..7155fe5e866 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/WeaponSurge.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/WeaponSurge.java @@ -68,7 +68,7 @@ public class WeaponSurge extends CardImpl { // Target creature you control gets +1/+0 and gains first strike until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(1,0, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); // Overload {1}{R} Ability ability = new OverloadAbility(this, new BoostAllEffect(1,0, Duration.EndOfTurn, filter, false), new ManaCostsImpl("{1}{R}")); diff --git a/Mage.Sets/src/mage/sets/eighthedition/BalanceOfPower.java b/Mage.Sets/src/mage/sets/eighthedition/BalanceOfPower.java index 2758cc6d531..85748b64e2a 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/BalanceOfPower.java +++ b/Mage.Sets/src/mage/sets/eighthedition/BalanceOfPower.java @@ -52,7 +52,7 @@ public class BalanceOfPower extends CardImpl { // If target opponent has more cards in hand than you, draw cards equal to the difference. this.getSpellAbility().addEffect(new BalanceOfPowerEffect()); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); } public BalanceOfPower(final BalanceOfPower card) { diff --git a/Mage.Sets/src/mage/sets/eighthedition/DwarvenDemolitionTeam.java b/Mage.Sets/src/mage/sets/eighthedition/DwarvenDemolitionTeam.java index d37859087c2..5b430899282 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/DwarvenDemolitionTeam.java +++ b/Mage.Sets/src/mage/sets/eighthedition/DwarvenDemolitionTeam.java @@ -65,7 +65,7 @@ public class DwarvenDemolitionTeam extends CardImpl { // {tap}: Destroy target Wall. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/AEtherSpellbomb.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/AEtherSpellbomb.java index cd48c3f8c05..c6a77fa536e 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/AEtherSpellbomb.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/AEtherSpellbomb.java @@ -53,7 +53,7 @@ public class AEtherSpellbomb extends CardImpl { //{U}, Sacrifice Æther Spellbomb: Return target creature to its owner's hand. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{U}")); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); //{1}, Sacrifice Æther Spellbomb: Draw a card. diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/BlindingBeam.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/BlindingBeam.java index b669f2f1064..fc1eabb4a4b 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/BlindingBeam.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/BlindingBeam.java @@ -71,7 +71,7 @@ public class BlindingBeam extends CardImpl { // or creatures don't untap during target player's next untap step. Mode mode = new Mode(); mode.getEffects().add(new BlindingBeamEffect()); - mode.getTargets().add(new TargetPlayer(true)); + mode.getTargets().add(new TargetPlayer()); this.getSpellAbility().getModes().addMode(mode); // Entwine {1} diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/DaruEncampment.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/DaruEncampment.java index de0575c157a..c77967c98a8 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/DaruEncampment.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/DaruEncampment.java @@ -64,7 +64,7 @@ public class DaruEncampment extends CardImpl { new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{W}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/EnergyChamber.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/EnergyChamber.java index e8b75833a14..92730b8dc2a 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/EnergyChamber.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/EnergyChamber.java @@ -66,7 +66,7 @@ public class EnergyChamber extends CardImpl { // At the beginning of your upkeep, choose one - Put a +1/+1 counter on target artifact creature; Ability ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance(), Outcome.BoostCreature), TargetController.YOU, false); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); // or put a charge counter on target noncreature artifact. Mode mode = new Mode(); diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/GoldmeadowHarrier.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/GoldmeadowHarrier.java index d6febb5ba49..821a502d0b8 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/GoldmeadowHarrier.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/GoldmeadowHarrier.java @@ -58,7 +58,7 @@ public class GoldmeadowHarrier extends CardImpl { this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{W}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/MishrasFactory.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/MishrasFactory.java index d1fec56323b..783fecbc23c 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/MishrasFactory.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/MishrasFactory.java @@ -70,7 +70,7 @@ public class MishrasFactory extends CardImpl { SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/RazorBarrier.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/RazorBarrier.java index 26053de0671..952be511a6c 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/RazorBarrier.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/RazorBarrier.java @@ -59,7 +59,7 @@ public class RazorBarrier extends CardImpl { // Target permanent you control gains protection from artifacts or from the color of your choice until end of turn. this.getSpellAbility().addEffect(new RazorBarrierEffect(Duration.EndOfTurn)); - Target target = new TargetControlledPermanent(true); + Target target = new TargetControlledPermanent(); this.getSpellAbility().addTarget(target); } diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/SeasonedMarshal.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/SeasonedMarshal.java index c9bf00c3408..3ec9885e6f3 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/SeasonedMarshal.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/SeasonedMarshal.java @@ -54,7 +54,7 @@ public class SeasonedMarshal extends CardImpl { this.toughness = new MageInt(2); Ability ability = new AttacksTriggeredAbility(new TapTargetEffect(), true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/SerratedBiskelion.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/SerratedBiskelion.java index 76737d5ffce..5fbbafe09ef 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/SerratedBiskelion.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/SerratedBiskelion.java @@ -58,7 +58,7 @@ public class SerratedBiskelion extends CardImpl { // {tap}: Put a -1/-1 counter on Serrated Biskelion and a -1/-1 counter on target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.M1M1.createInstance(), true), new TapSourceCost()); ability.addEffect(new AddCountersTargetEffect(CounterType.M1M1.createInstance())); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/TripNoose.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/TripNoose.java index d2c099738d3..e59ed8510a2 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/TripNoose.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/TripNoose.java @@ -52,7 +52,7 @@ public class TripNoose extends CardImpl { // {2}, {tap}: Tap target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("2")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/AmbushCommander.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/AmbushCommander.java index c096eca6386..d1aad4712fa 100644 --- a/Mage.Sets/src/mage/sets/elvesvsgoblins/AmbushCommander.java +++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/AmbushCommander.java @@ -74,7 +74,7 @@ public class AmbushCommander extends CardImpl { // {1}{G}, Sacrifice an Elf: Target creature gets +3/+3 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(3,3, Duration.EndOfTurn), new ManaCostsImpl("{1}{G}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1, filter, true))); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/BoggartShenanigans.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/BoggartShenanigans.java index 6f07a1420e2..fb6c317015c 100644 --- a/Mage.Sets/src/mage/sets/elvesvsgoblins/BoggartShenanigans.java +++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/BoggartShenanigans.java @@ -62,7 +62,7 @@ public class BoggartShenanigans extends CardImpl { // Whenever another Goblin you control dies, you may have Boggart Shenanigans deal 1 damage to target player. Ability ability = new DiesCreatureTriggeredAbility(new DamageTargetEffect(1), true, filter, false); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/EmberwildeAugur.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/EmberwildeAugur.java index 66b22eb956f..9312af33ff3 100644 --- a/Mage.Sets/src/mage/sets/elvesvsgoblins/EmberwildeAugur.java +++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/EmberwildeAugur.java @@ -63,7 +63,7 @@ public class EmberwildeAugur extends CardImpl { new DamageTargetEffect(3), new SacrificeSourceCost(), new IsStepCondition(PhaseStep.UPKEEP)); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/TimberwatchElf.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/TimberwatchElf.java index 30ad447761d..5ea7997a3fc 100644 --- a/Mage.Sets/src/mage/sets/elvesvsgoblins/TimberwatchElf.java +++ b/Mage.Sets/src/mage/sets/elvesvsgoblins/TimberwatchElf.java @@ -71,7 +71,7 @@ public class TimberwatchElf extends CardImpl { effect.setText("Target creature gets +X/+X until end of turn, where X is the number of Elves on the battlefield"); SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/eventide/AerieOuphes.java b/Mage.Sets/src/mage/sets/eventide/AerieOuphes.java index 9baae05a7b7..afbbc30ebc4 100644 --- a/Mage.Sets/src/mage/sets/eventide/AerieOuphes.java +++ b/Mage.Sets/src/mage/sets/eventide/AerieOuphes.java @@ -67,7 +67,7 @@ public class AerieOuphes extends CardImpl { // Sacrifice Aerie Ouphes: Aerie Ouphes deals damage equal to its power to target creature with flying. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new SourcePermanentPowerCount()), new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); // Persist diff --git a/Mage.Sets/src/mage/sets/eventide/AntlerSkulkin.java b/Mage.Sets/src/mage/sets/eventide/AntlerSkulkin.java index 1cb2574956d..7d5d8f1898b 100644 --- a/Mage.Sets/src/mage/sets/eventide/AntlerSkulkin.java +++ b/Mage.Sets/src/mage/sets/eventide/AntlerSkulkin.java @@ -67,7 +67,7 @@ public class AntlerSkulkin extends CardImpl { // {2}: Target white creature gains persist until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new PersistAbility(), Duration.EndOfTurn), new ManaCostsImpl("{2}")); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/eventide/ArchonOfJustice.java b/Mage.Sets/src/mage/sets/eventide/ArchonOfJustice.java index f338e5079c0..5f1629cf9fb 100644 --- a/Mage.Sets/src/mage/sets/eventide/ArchonOfJustice.java +++ b/Mage.Sets/src/mage/sets/eventide/ArchonOfJustice.java @@ -55,7 +55,7 @@ public class ArchonOfJustice extends CardImpl { this.addAbility(FlyingAbility.getInstance()); Ability ability = new DiesTriggeredAbility(new ExileTargetEffect(), false); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher.java b/Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher.java index f136b074db5..92a16f89a26 100644 --- a/Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher.java +++ b/Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher.java @@ -77,7 +77,7 @@ public class AshlingTheExtinguisher extends CardImpl { class AshlingTheExtinguisherTriggeredAbility extends TriggeredAbilityImpl { public AshlingTheExtinguisherTriggeredAbility() { super(Zone.BATTLEFIELD, new SacrificeTargetEffect()); - this.addTarget(new TargetCreaturePermanent(true)); + this.addTarget(new TargetCreaturePermanent()); } public AshlingTheExtinguisherTriggeredAbility(final AshlingTheExtinguisherTriggeredAbility ability) { @@ -100,7 +100,7 @@ class AshlingTheExtinguisherTriggeredAbility extends TriggeredAbilityImpl { filter.add(new ControllerIdPredicate(opponent.getId())); this.getTargets().clear(); - this.addTarget(new TargetCreaturePermanent(filter, true)); + this.addTarget(new TargetCreaturePermanent(filter)); return true; } } diff --git a/Mage.Sets/src/mage/sets/eventide/BalefireLiege.java b/Mage.Sets/src/mage/sets/eventide/BalefireLiege.java index a8cdb98b0e1..d424621e58e 100644 --- a/Mage.Sets/src/mage/sets/eventide/BalefireLiege.java +++ b/Mage.Sets/src/mage/sets/eventide/BalefireLiege.java @@ -76,7 +76,7 @@ public class BalefireLiege extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterRedCreature, true))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterWhiteCreature, true))); Ability ability = new SpellCastControllerTriggeredAbility(new DamageTargetEffect(3), filterRedSpell, false); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); this.addAbility(new SpellCastControllerTriggeredAbility(new GainLifeEffect(3), filterWhiteSpell, false)); } diff --git a/Mage.Sets/src/mage/sets/eventide/BallynockTrapper.java b/Mage.Sets/src/mage/sets/eventide/BallynockTrapper.java index 4b65e9f8d73..ed8553b58ee 100644 --- a/Mage.Sets/src/mage/sets/eventide/BallynockTrapper.java +++ b/Mage.Sets/src/mage/sets/eventide/BallynockTrapper.java @@ -65,7 +65,7 @@ public class BallynockTrapper extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); this.addAbility(new SpellCastControllerTriggeredAbility(new UntapSourceEffect(), filterWhiteSpell, true)); } diff --git a/Mage.Sets/src/mage/sets/eventide/BanishingKnack.java b/Mage.Sets/src/mage/sets/eventide/BanishingKnack.java index bac5afb2340..64c0b6f56fa 100644 --- a/Mage.Sets/src/mage/sets/eventide/BanishingKnack.java +++ b/Mage.Sets/src/mage/sets/eventide/BanishingKnack.java @@ -57,9 +57,9 @@ public class BanishingKnack extends CardImpl { this.expansionSetCode = "EVE"; this.color.setBlue(true); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new TapSourceCost()); - gainedAbility.addTarget(new TargetPermanent(filter, true)); + gainedAbility.addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(gainedAbility, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public BanishingKnack(final BanishingKnack card) { diff --git a/Mage.Sets/src/mage/sets/eventide/CankerAbomination.java b/Mage.Sets/src/mage/sets/eventide/CankerAbomination.java index d642411d3fa..4087cc293fa 100644 --- a/Mage.Sets/src/mage/sets/eventide/CankerAbomination.java +++ b/Mage.Sets/src/mage/sets/eventide/CankerAbomination.java @@ -64,7 +64,7 @@ public class CankerAbomination extends CardImpl { // As Canker Abomination enters the battlefield, choose an opponent. Canker Abomination enters the battlefield with a -1/-1 counter on it for each creature that player controls. Ability ability = new AsEntersBattlefieldAbility(new CankerAbominationEffect()); - Target target = new TargetOpponent(true); + Target target = new TargetOpponent(); target.setNotTarget(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/eventide/CankerousThirst.java b/Mage.Sets/src/mage/sets/eventide/CankerousThirst.java index 9c90aa4e556..dc85de1f1a7 100644 --- a/Mage.Sets/src/mage/sets/eventide/CankerousThirst.java +++ b/Mage.Sets/src/mage/sets/eventide/CankerousThirst.java @@ -60,7 +60,7 @@ public class CankerousThirst extends CardImpl { this.getSpellAbility().addEffect(new ConditionalContinousEffect( new BoostTargetEffect(3, 3, Duration.EndOfTurn), new ManaWasSpentCondition(ColoredManaSymbol.G), "If {G} was spent to cast {this}, you may have target creature get +3/+3 until end of turn", true)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.addInfo("Info1", "(Do both if {B}{G} was spent.)"); } diff --git a/Mage.Sets/src/mage/sets/eventide/ChaoticBacklash.java b/Mage.Sets/src/mage/sets/eventide/ChaoticBacklash.java index 0ffc8f8a9a4..7abcc627303 100644 --- a/Mage.Sets/src/mage/sets/eventide/ChaoticBacklash.java +++ b/Mage.Sets/src/mage/sets/eventide/ChaoticBacklash.java @@ -56,7 +56,7 @@ public class ChaoticBacklash extends CardImpl { // Chaotic Backlash deals damage to target player equal to twice the number of white and/or blue permanents he or she controls. this.getSpellAbility().addEffect(new ChaoticBacklashEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } diff --git a/Mage.Sets/src/mage/sets/eventide/CinderPyromancer.java b/Mage.Sets/src/mage/sets/eventide/CinderPyromancer.java index 866127fcecb..34481b5a082 100644 --- a/Mage.Sets/src/mage/sets/eventide/CinderPyromancer.java +++ b/Mage.Sets/src/mage/sets/eventide/CinderPyromancer.java @@ -66,7 +66,7 @@ public class CinderPyromancer extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); this.addAbility(new SpellCastControllerTriggeredAbility(new UntapSourceEffect(), filter, true)); } diff --git a/Mage.Sets/src/mage/sets/eventide/CloutOfTheDominus.java b/Mage.Sets/src/mage/sets/eventide/CloutOfTheDominus.java index 0d2213abe0e..ccc66ea812e 100644 --- a/Mage.Sets/src/mage/sets/eventide/CloutOfTheDominus.java +++ b/Mage.Sets/src/mage/sets/eventide/CloutOfTheDominus.java @@ -64,7 +64,7 @@ public class CloutOfTheDominus extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/eventide/Crackleburr.java b/Mage.Sets/src/mage/sets/eventide/Crackleburr.java index 9ecd28031cf..4e5d7626178 100644 --- a/Mage.Sets/src/mage/sets/eventide/Crackleburr.java +++ b/Mage.Sets/src/mage/sets/eventide/Crackleburr.java @@ -83,14 +83,14 @@ public class Crackleburr extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new ManaCostsImpl("{U/R}{U/R}")); ability.addCost(new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, true))); - ability.addTarget(new TargetCreatureOrPlayer(true)); + ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); // {UR}{UR}, {untap}, Untap two tapped blue creatures you control: Return target creature to its owner's hand. Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{U/R}{U/R}")); ability2.addCost(new UntapSourceCost()); ability2.addCost(new UntapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter2, true))); - ability2.addTarget(new TargetCreaturePermanent(true)); + ability2.addTarget(new TargetCreaturePermanent()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/sets/eventide/CrumblingAshes.java b/Mage.Sets/src/mage/sets/eventide/CrumblingAshes.java index 6c72ed18bc4..bbee045b857 100644 --- a/Mage.Sets/src/mage/sets/eventide/CrumblingAshes.java +++ b/Mage.Sets/src/mage/sets/eventide/CrumblingAshes.java @@ -62,7 +62,7 @@ public class CrumblingAshes extends CardImpl { // At the beginning of your upkeep, destroy target creature with a -1/-1 counter on it. Ability ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), TargetController.YOU, false); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/eventide/DeathbringerLiege.java b/Mage.Sets/src/mage/sets/eventide/DeathbringerLiege.java index 2bf828823b2..01702265858 100644 --- a/Mage.Sets/src/mage/sets/eventide/DeathbringerLiege.java +++ b/Mage.Sets/src/mage/sets/eventide/DeathbringerLiege.java @@ -75,10 +75,10 @@ public class DeathbringerLiege extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterWhite, true))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBlack, true))); Ability ability = new SpellCastControllerTriggeredAbility(new TapTargetEffect(), filterWhiteSpellCard, true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); ability = new SpellCastControllerTriggeredAbility(new DeathbringerLiegeEffect(), filterBlackSpellCard, true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/eventide/DominusOfFealty.java b/Mage.Sets/src/mage/sets/eventide/DominusOfFealty.java index 6accf664633..bd53c06d53e 100644 --- a/Mage.Sets/src/mage/sets/eventide/DominusOfFealty.java +++ b/Mage.Sets/src/mage/sets/eventide/DominusOfFealty.java @@ -63,7 +63,7 @@ public class DominusOfFealty extends CardImpl { Ability ability = new BeginningOfUpkeepTriggeredAbility(new GainControlTargetEffect(Duration.EndOfTurn), TargetController.YOU, true); ability.addEffect(new UntapTargetEffect()); ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/eventide/Doomgape.java b/Mage.Sets/src/mage/sets/eventide/Doomgape.java index 1a6b3ef3782..fa37e627ade 100644 --- a/Mage.Sets/src/mage/sets/eventide/Doomgape.java +++ b/Mage.Sets/src/mage/sets/eventide/Doomgape.java @@ -100,7 +100,7 @@ class DoomgapeEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player you = game.getPlayer(source.getControllerId()); if (you != null) { - Target target = new TargetControlledCreaturePermanent(true); + Target target = new TargetControlledCreaturePermanent(); target.setNotTarget(true); target.setRequired(true); if (you.choose(Outcome.Sacrifice, target, source.getId(), game)) { diff --git a/Mage.Sets/src/mage/sets/eventide/DoubleCleave.java b/Mage.Sets/src/mage/sets/eventide/DoubleCleave.java index 171d0687071..683b4150492 100644 --- a/Mage.Sets/src/mage/sets/eventide/DoubleCleave.java +++ b/Mage.Sets/src/mage/sets/eventide/DoubleCleave.java @@ -49,7 +49,7 @@ public class DoubleCleave extends CardImpl { this.color.setRed(true); this.color.setWhite(true); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public DoubleCleave(final DoubleCleave card) { diff --git a/Mage.Sets/src/mage/sets/eventide/EdgeOfTheDivinity.java b/Mage.Sets/src/mage/sets/eventide/EdgeOfTheDivinity.java index 3be3004eaee..7e7277b62e3 100644 --- a/Mage.Sets/src/mage/sets/eventide/EdgeOfTheDivinity.java +++ b/Mage.Sets/src/mage/sets/eventide/EdgeOfTheDivinity.java @@ -62,7 +62,7 @@ public class EdgeOfTheDivinity extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/eventide/FavorOfTheOverbeing.java b/Mage.Sets/src/mage/sets/eventide/FavorOfTheOverbeing.java index 2d11356bb2f..4838df79a34 100644 --- a/Mage.Sets/src/mage/sets/eventide/FavorOfTheOverbeing.java +++ b/Mage.Sets/src/mage/sets/eventide/FavorOfTheOverbeing.java @@ -64,7 +64,7 @@ public class FavorOfTheOverbeing extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/eventide/FieryBombardment.java b/Mage.Sets/src/mage/sets/eventide/FieryBombardment.java index 6b22bb06a60..e59fb80065b 100644 --- a/Mage.Sets/src/mage/sets/eventide/FieryBombardment.java +++ b/Mage.Sets/src/mage/sets/eventide/FieryBombardment.java @@ -67,8 +67,8 @@ public class FieryBombardment extends CardImpl { Effect effect = new FieryBombardmentEffect(); effect.setText("Chroma - Fiery Bombardment deals damage to target creature or player equal to the number of red mana symbols in the sacrificed creature's mana cost."); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{2}")); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); - ability.addTarget(new TargetCreatureOrPlayer(true)); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); + ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/eventide/Flickerwisp.java b/Mage.Sets/src/mage/sets/eventide/Flickerwisp.java index c2c093bdd90..c194f4bcf5c 100644 --- a/Mage.Sets/src/mage/sets/eventide/Flickerwisp.java +++ b/Mage.Sets/src/mage/sets/eventide/Flickerwisp.java @@ -71,7 +71,7 @@ public class Flickerwisp extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Flickerwisp enters the battlefield, exile another target permanent. Return that card to the battlefield under its owner's control at the beginning of the next end step. Ability ability = new EntersBattlefieldTriggeredAbility(new FlickerwispEffect()); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/eventide/GiftOfTheDeity.java b/Mage.Sets/src/mage/sets/eventide/GiftOfTheDeity.java index ea98147ef01..fe5436f9c3a 100644 --- a/Mage.Sets/src/mage/sets/eventide/GiftOfTheDeity.java +++ b/Mage.Sets/src/mage/sets/eventide/GiftOfTheDeity.java @@ -66,7 +66,7 @@ public class GiftOfTheDeity extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/eventide/GilderBairn.java b/Mage.Sets/src/mage/sets/eventide/GilderBairn.java index 0079070c3a9..06792ef87bb 100644 --- a/Mage.Sets/src/mage/sets/eventide/GilderBairn.java +++ b/Mage.Sets/src/mage/sets/eventide/GilderBairn.java @@ -63,7 +63,7 @@ public class GilderBairn extends CardImpl { // {2}{GU}, {untap}: For each counter on target permanent, put another of those counters on that permanent. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GilderBairnEffect(), new ManaCostsImpl("{2}{G/U}")); ability.addCost(new UntapSourceCost()); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/eventide/HagHedgeMage.java b/Mage.Sets/src/mage/sets/eventide/HagHedgeMage.java index b05209c4a4c..cd3974496a3 100644 --- a/Mage.Sets/src/mage/sets/eventide/HagHedgeMage.java +++ b/Mage.Sets/src/mage/sets/eventide/HagHedgeMage.java @@ -75,7 +75,7 @@ public class HagHedgeMage extends CardImpl { // When Hag Hedge-Mage enters the battlefield, if you control two or more Swamps, you may have target player discard a card. Ability ability = new ConditionalTriggeredAbility(new EntersBattlefieldTriggeredAbility(new DiscardTargetEffect(1), true), new ControlsPermanentCondition(filter, CountType.MORE_THAN, 1), rule, true); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); // When Hag Hedge-Mage enters the battlefield, if you control two or more Forests, you may put target card from your graveyard on top of your library. diff --git a/Mage.Sets/src/mage/sets/eventide/HatchetBully.java b/Mage.Sets/src/mage/sets/eventide/HatchetBully.java index f5bf78c2c06..5f91cab9aab 100644 --- a/Mage.Sets/src/mage/sets/eventide/HatchetBully.java +++ b/Mage.Sets/src/mage/sets/eventide/HatchetBully.java @@ -68,8 +68,8 @@ public class HatchetBully extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HatchetBullyEffect(), new ManaCostsImpl("{2}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new HatchetBullyCost()); - ability.addTarget(new TargetCreatureOrPlayer(true)); - Target target = new TargetControlledCreaturePermanent(true); + ability.addTarget(new TargetCreatureOrPlayer()); + Target target = new TargetControlledCreaturePermanent(); target.setNotTarget(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/eventide/IndigoFaerie.java b/Mage.Sets/src/mage/sets/eventide/IndigoFaerie.java index 5a9916b24f0..360799985d6 100644 --- a/Mage.Sets/src/mage/sets/eventide/IndigoFaerie.java +++ b/Mage.Sets/src/mage/sets/eventide/IndigoFaerie.java @@ -67,7 +67,7 @@ public class IndigoFaerie extends CardImpl { // {U}: Target permanent becomes blue in addition to its other colors until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesBlueTargetEffect(), new ManaCostsImpl("{U}")); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/eventide/InsideOut.java b/Mage.Sets/src/mage/sets/eventide/InsideOut.java index 962734f97fd..968726e5856 100644 --- a/Mage.Sets/src/mage/sets/eventide/InsideOut.java +++ b/Mage.Sets/src/mage/sets/eventide/InsideOut.java @@ -52,7 +52,7 @@ public class InsideOut extends CardImpl { // Switch target creature's power and toughness until end of turn. this.getSpellAbility().addEffect(new SwitchPowerToughnessTargetEffect(Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/eventide/KithkinSpellduster.java b/Mage.Sets/src/mage/sets/eventide/KithkinSpellduster.java index 6023266f210..208056675c6 100644 --- a/Mage.Sets/src/mage/sets/eventide/KithkinSpellduster.java +++ b/Mage.Sets/src/mage/sets/eventide/KithkinSpellduster.java @@ -70,7 +70,7 @@ public class KithkinSpellduster extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {1}{W}, Sacrifice Kithkin Spellduster: Destroy target enchantment. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{W}")); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); // Persist diff --git a/Mage.Sets/src/mage/sets/eventide/KithkinZealot.java b/Mage.Sets/src/mage/sets/eventide/KithkinZealot.java index 5451e160a34..8c129921625 100644 --- a/Mage.Sets/src/mage/sets/eventide/KithkinZealot.java +++ b/Mage.Sets/src/mage/sets/eventide/KithkinZealot.java @@ -62,7 +62,7 @@ public class KithkinZealot extends CardImpl { // When Kithkin Zealot enters the battlefield, you gain 1 life for each black and/or red permanent target opponent controls. Ability ability = new EntersBattlefieldTriggeredAbility(new KithkinZealotEffect(), false); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/eventide/MerrowBonegnawer.java b/Mage.Sets/src/mage/sets/eventide/MerrowBonegnawer.java index 085f6b8c0dc..eb85ba41b96 100644 --- a/Mage.Sets/src/mage/sets/eventide/MerrowBonegnawer.java +++ b/Mage.Sets/src/mage/sets/eventide/MerrowBonegnawer.java @@ -71,7 +71,7 @@ public class MerrowBonegnawer extends CardImpl { // {tap}: Target player exiles a card from his or her graveyard. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileFromZoneTargetEffect(Zone.GRAVEYARD, exileId, "Merrow Bonegnawer", new FilterCard("a card")), new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); // Whenever you cast a black spell, you may untap Merrow Bonegnawer. diff --git a/Mage.Sets/src/mage/sets/eventide/MerrowLevitator.java b/Mage.Sets/src/mage/sets/eventide/MerrowLevitator.java index 3b2e52843ef..083a2b15d48 100644 --- a/Mage.Sets/src/mage/sets/eventide/MerrowLevitator.java +++ b/Mage.Sets/src/mage/sets/eventide/MerrowLevitator.java @@ -69,7 +69,7 @@ public class MerrowLevitator extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); this.addAbility(new SpellCastControllerTriggeredAbility(new UntapSourceEffect(), filterBlueSpell, true)); } diff --git a/Mage.Sets/src/mage/sets/eventide/Monstrify.java b/Mage.Sets/src/mage/sets/eventide/Monstrify.java index 7ee18834e93..ef36c30b54b 100644 --- a/Mage.Sets/src/mage/sets/eventide/Monstrify.java +++ b/Mage.Sets/src/mage/sets/eventide/Monstrify.java @@ -53,7 +53,7 @@ public class Monstrify extends CardImpl { // Target creature gets +4/+4 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(4, 4, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Retrace this.addAbility(new RetraceAbility(new ManaCostsImpl("{3}{G}"), TimingRule.SORCERY)); } diff --git a/Mage.Sets/src/mage/sets/eventide/Moonhold.java b/Mage.Sets/src/mage/sets/eventide/Moonhold.java index d9bb0b2767a..70765f5d494 100644 --- a/Mage.Sets/src/mage/sets/eventide/Moonhold.java +++ b/Mage.Sets/src/mage/sets/eventide/Moonhold.java @@ -69,7 +69,7 @@ public class Moonhold extends CardImpl { this.getSpellAbility().addEffect(new ConditionalReplacementEffect( effect2, new ManaWasSpentCondition(ColoredManaSymbol.W), false)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.addInfo("Info1", "(Do both if {R}{W} was spent.)"); } diff --git a/Mage.Sets/src/mage/sets/eventide/NightmareIncursion.java b/Mage.Sets/src/mage/sets/eventide/NightmareIncursion.java index 73cda78dd3e..87c54a18c2f 100644 --- a/Mage.Sets/src/mage/sets/eventide/NightmareIncursion.java +++ b/Mage.Sets/src/mage/sets/eventide/NightmareIncursion.java @@ -63,7 +63,7 @@ public class NightmareIncursion extends CardImpl { // Search target player's library for up to X cards, where X is the number of Swamps you control, and exile them. Then that player shuffles his or her library. Effect effect = new NightmareIncursionEffect(); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/sets/eventide/NoggleHedgeMage.java b/Mage.Sets/src/mage/sets/eventide/NoggleHedgeMage.java index 8adde3eba70..d480462a00c 100644 --- a/Mage.Sets/src/mage/sets/eventide/NoggleHedgeMage.java +++ b/Mage.Sets/src/mage/sets/eventide/NoggleHedgeMage.java @@ -81,7 +81,7 @@ public class NoggleHedgeMage extends CardImpl { // When Noggle Hedge-Mage enters the battlefield, if you control two or more Mountains, you may have Noggle Hedge-Mage deal 2 damage to target player. Ability ability2 = new ConditionalTriggeredAbility(new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(2), true), new ControlsPermanentCondition(filter2, CountType.MORE_THAN, 1), rule2, true); - ability2.addTarget(new TargetPlayer(true)); + ability2.addTarget(new TargetPlayer()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/sets/eventide/OonasGrace.java b/Mage.Sets/src/mage/sets/eventide/OonasGrace.java index 1a87c4eb677..4ea53ad7c3a 100644 --- a/Mage.Sets/src/mage/sets/eventide/OonasGrace.java +++ b/Mage.Sets/src/mage/sets/eventide/OonasGrace.java @@ -52,7 +52,7 @@ public class OonasGrace extends CardImpl { // Target player draws a card. this.getSpellAbility().addEffect(new DrawCardTargetEffect(1)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); // Retrace this.addAbility(new RetraceAbility(new ManaCostsImpl("{2}{U}"), TimingRule.INSTANT)); } diff --git a/Mage.Sets/src/mage/sets/eventide/OutrageShaman.java b/Mage.Sets/src/mage/sets/eventide/OutrageShaman.java index 9581f211bca..5e01a5f8722 100644 --- a/Mage.Sets/src/mage/sets/eventide/OutrageShaman.java +++ b/Mage.Sets/src/mage/sets/eventide/OutrageShaman.java @@ -63,7 +63,7 @@ public class OutrageShaman extends CardImpl { Effect effect = new DamageTargetEffect(new ChromaOutrageShamanCount()); effect.setText("Chroma - When Outrage Shaman enters the battlefield, it deals damage to target creature equal to the number of red mana symbols in the mana costs of permanents you control."); Ability ability = new EntersBattlefieldTriggeredAbility(effect, false, true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/eventide/RavensCrime.java b/Mage.Sets/src/mage/sets/eventide/RavensCrime.java index 48f59708ebd..44f5357bd9a 100644 --- a/Mage.Sets/src/mage/sets/eventide/RavensCrime.java +++ b/Mage.Sets/src/mage/sets/eventide/RavensCrime.java @@ -52,7 +52,7 @@ public class RavensCrime extends CardImpl { // Target player discards a card. this.getSpellAbility().getEffects().add(new DiscardTargetEffect(1)); - this.getSpellAbility().getTargets().add(new TargetPlayer(true)); + this.getSpellAbility().getTargets().add(new TargetPlayer()); // Retrace this.addAbility(new RetraceAbility(new ManaCostsImpl("{B}"), TimingRule.SORCERY)); } diff --git a/Mage.Sets/src/mage/sets/eventide/RazorfinAbolisher.java b/Mage.Sets/src/mage/sets/eventide/RazorfinAbolisher.java index 51205989abe..6dafac41e17 100644 --- a/Mage.Sets/src/mage/sets/eventide/RazorfinAbolisher.java +++ b/Mage.Sets/src/mage/sets/eventide/RazorfinAbolisher.java @@ -68,7 +68,7 @@ public class RazorfinAbolisher extends CardImpl { // {1}{U}, {tap}: Return target creature with a counter on it to its owner's hand. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{1}{U}")); ability.addCost(new TapSourceCost()); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/eventide/RecumbentBliss.java b/Mage.Sets/src/mage/sets/eventide/RecumbentBliss.java index 58bc529b397..d5a6dd2e2b4 100644 --- a/Mage.Sets/src/mage/sets/eventide/RecumbentBliss.java +++ b/Mage.Sets/src/mage/sets/eventide/RecumbentBliss.java @@ -54,7 +54,7 @@ public class RecumbentBliss extends CardImpl { this.expansionSetCode = "EVE"; this.subtype.add("Aura"); this.color.setWhite(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/eventide/RekindledFlame.java b/Mage.Sets/src/mage/sets/eventide/RekindledFlame.java index eeaba7ee812..ddbe85c0e11 100644 --- a/Mage.Sets/src/mage/sets/eventide/RekindledFlame.java +++ b/Mage.Sets/src/mage/sets/eventide/RekindledFlame.java @@ -59,7 +59,7 @@ public class RekindledFlame extends CardImpl { // Rekindled Flame deals 4 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); // At the beginning of your upkeep, if an opponent has no cards in hand, you may return Rekindled Flame from your graveyard to your hand. Ability ability = new BeginningOfUpkeepTriggeredAbility(Zone.GRAVEYARD, new ConditionalOneShotEffect(new ReturnSourceFromGraveyardToHandEffect(), new OpponentHasNoCardsInHandCondition(), rule), TargetController.YOU, true); diff --git a/Mage.Sets/src/mage/sets/eventide/SanityGrinding.java b/Mage.Sets/src/mage/sets/eventide/SanityGrinding.java index 8030fd8b739..0b0e9a3701b 100644 --- a/Mage.Sets/src/mage/sets/eventide/SanityGrinding.java +++ b/Mage.Sets/src/mage/sets/eventide/SanityGrinding.java @@ -58,7 +58,7 @@ public class SanityGrinding extends CardImpl { // Chroma - Reveal the top ten cards of your library. For each blue mana symbol in the mana costs of the revealed cards, target opponent puts the top card of his or her library into his or her graveyard. Then put the cards you revealed this way on the bottom of your library in any order. this.getSpellAbility().addEffect(new SanityGrindingEffect()); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); } diff --git a/Mage.Sets/src/mage/sets/eventide/Scarecrone.java b/Mage.Sets/src/mage/sets/eventide/Scarecrone.java index 14624a450ce..d9025525108 100644 --- a/Mage.Sets/src/mage/sets/eventide/Scarecrone.java +++ b/Mage.Sets/src/mage/sets/eventide/Scarecrone.java @@ -69,7 +69,7 @@ public class Scarecrone extends CardImpl { // {1}, Sacrifice a Scarecrow: Draw a card. Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); - firstAbility.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1, filterScarecrow, false, true))); + firstAbility.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1, filterScarecrow, false))); this.addAbility(firstAbility); // {4}, {T}: Return target artifact creature card from your graveyard to the battlefield. diff --git a/Mage.Sets/src/mage/sets/eventide/ScourgeOfTheNobilis.java b/Mage.Sets/src/mage/sets/eventide/ScourgeOfTheNobilis.java index 580fbe7eda3..79a675f5e57 100644 --- a/Mage.Sets/src/mage/sets/eventide/ScourgeOfTheNobilis.java +++ b/Mage.Sets/src/mage/sets/eventide/ScourgeOfTheNobilis.java @@ -66,7 +66,7 @@ public class ScourgeOfTheNobilis extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/eventide/ShellSkulkin.java b/Mage.Sets/src/mage/sets/eventide/ShellSkulkin.java index bac4daf59f9..2a0589d4c64 100644 --- a/Mage.Sets/src/mage/sets/eventide/ShellSkulkin.java +++ b/Mage.Sets/src/mage/sets/eventide/ShellSkulkin.java @@ -63,7 +63,7 @@ public class ShellSkulkin extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(3)); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/eventide/ShrewdHatchling.java b/Mage.Sets/src/mage/sets/eventide/ShrewdHatchling.java index 0eac499d9b6..45a196f95af 100644 --- a/Mage.Sets/src/mage/sets/eventide/ShrewdHatchling.java +++ b/Mage.Sets/src/mage/sets/eventide/ShrewdHatchling.java @@ -87,7 +87,7 @@ public class ShrewdHatchling extends CardImpl { // {UR}: Target creature can't block Shrewd Hatchling this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShrewdHatchlingEffect(), new ManaCostsImpl("{U/R}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Whenever you cast a blue spell, remove a -1/-1 counter from Shrewd Hatchling. diff --git a/Mage.Sets/src/mage/sets/eventide/Snakeform.java b/Mage.Sets/src/mage/sets/eventide/Snakeform.java index 1a245da5da0..b59d06fd404 100644 --- a/Mage.Sets/src/mage/sets/eventide/Snakeform.java +++ b/Mage.Sets/src/mage/sets/eventide/Snakeform.java @@ -56,7 +56,7 @@ public class Snakeform extends CardImpl { // Target creature loses all abilities and becomes a 1/1 green Snake until end of turn. this.getSpellAbility().addEffect(new LoseAllAbilitiesTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new BecomesCreatureTargetEffect(new SnakeToken(),null, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. Effect effect = new DrawCardSourceControllerEffect(1); diff --git a/Mage.Sets/src/mage/sets/eventide/SoulReap.java b/Mage.Sets/src/mage/sets/eventide/SoulReap.java index a38c7cc4ce8..a8ca79abf52 100644 --- a/Mage.Sets/src/mage/sets/eventide/SoulReap.java +++ b/Mage.Sets/src/mage/sets/eventide/SoulReap.java @@ -76,7 +76,7 @@ public class SoulReap extends CardImpl { // Destroy target nongreen creature. Its controller loses 3 life if you've cast another black spell this turn. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new SoulReapEffect(), new CastBlackSpellThisTurnCondition(), rule)); this.addWatcher(new SoulReapWatcher(this.getId())); diff --git a/Mage.Sets/src/mage/sets/eventide/Spitemare.java b/Mage.Sets/src/mage/sets/eventide/Spitemare.java index 66fe52ab750..b2ff00277e2 100644 --- a/Mage.Sets/src/mage/sets/eventide/Spitemare.java +++ b/Mage.Sets/src/mage/sets/eventide/Spitemare.java @@ -60,7 +60,7 @@ public class Spitemare extends CardImpl { // Whenever Spitemare is dealt damage, it deals that much damage to target creature or player. Ability ability = new SpitemareTriggeredAbility(); - ability.addTarget(new TargetCreatureOrPlayer(true)); + ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/eventide/SpittingImage.java b/Mage.Sets/src/mage/sets/eventide/SpittingImage.java index 01335866334..7f20ca70b65 100644 --- a/Mage.Sets/src/mage/sets/eventide/SpittingImage.java +++ b/Mage.Sets/src/mage/sets/eventide/SpittingImage.java @@ -62,7 +62,7 @@ public class SpittingImage extends CardImpl { // Put a token that's a copy of target creature onto the battlefield. this.getSpellAbility().addEffect(new SpittingImageEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Retrace this.addAbility(new RetraceAbility(new DiscardTargetCost(new TargetCardInHand(new FilterLandCard())), TimingRule.SORCERY)); diff --git a/Mage.Sets/src/mage/sets/eventide/SutureSpirit.java b/Mage.Sets/src/mage/sets/eventide/SutureSpirit.java index b2b64eb8fce..a214c2b2e45 100644 --- a/Mage.Sets/src/mage/sets/eventide/SutureSpirit.java +++ b/Mage.Sets/src/mage/sets/eventide/SutureSpirit.java @@ -56,7 +56,7 @@ public class SutureSpirit extends CardImpl { this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{W/B}{W/B}{W/B}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/eventide/SyphonLife.java b/Mage.Sets/src/mage/sets/eventide/SyphonLife.java index df70903c1b2..2f465218597 100644 --- a/Mage.Sets/src/mage/sets/eventide/SyphonLife.java +++ b/Mage.Sets/src/mage/sets/eventide/SyphonLife.java @@ -53,7 +53,7 @@ public class SyphonLife extends CardImpl { // Target player loses 2 life and you gain 2 life. this.getSpellAbility().addEffect(new LoseLifeTargetEffect(2)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new GainLifeEffect(2)); // Retrace this.addAbility(new RetraceAbility(new ManaCostsImpl("{1}{B}{B}"), TimingRule.SORCERY)); diff --git a/Mage.Sets/src/mage/sets/eventide/TalarasBane.java b/Mage.Sets/src/mage/sets/eventide/TalarasBane.java index 0ff59af542a..4cf36e1e828 100644 --- a/Mage.Sets/src/mage/sets/eventide/TalarasBane.java +++ b/Mage.Sets/src/mage/sets/eventide/TalarasBane.java @@ -60,7 +60,7 @@ public class TalarasBane extends CardImpl { // Target opponent reveals his or her hand. You choose a green or white creature card from it. You gain life equal that creature card's toughness, then that player discards that card. this.getSpellAbility().addEffect(new TalarasBaneEffect()); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); } diff --git a/Mage.Sets/src/mage/sets/eventide/Unmake.java b/Mage.Sets/src/mage/sets/eventide/Unmake.java index 463654f1d46..8405dd280b1 100644 --- a/Mage.Sets/src/mage/sets/eventide/Unmake.java +++ b/Mage.Sets/src/mage/sets/eventide/Unmake.java @@ -47,7 +47,7 @@ public class Unmake extends CardImpl { this.getColor().setBlack(true); this.getColor().setWhite(true); this.getSpellAbility().addEffect(new ExileTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public Unmake (final Unmake card) { diff --git a/Mage.Sets/src/mage/sets/eventide/UnwillingRecruit.java b/Mage.Sets/src/mage/sets/eventide/UnwillingRecruit.java index 62b05c07bae..18c2ebee0ee 100644 --- a/Mage.Sets/src/mage/sets/eventide/UnwillingRecruit.java +++ b/Mage.Sets/src/mage/sets/eventide/UnwillingRecruit.java @@ -58,7 +58,7 @@ public class UnwillingRecruit extends CardImpl { // Gain control of target creature until end of turn. Untap that creature. It gets +X/+0 and gains haste until end of turn. this.getSpellAbility().addEffect(new UnwillingRecruitEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/eventide/WickerboughElder.java b/Mage.Sets/src/mage/sets/eventide/WickerboughElder.java index ffcf7fc8892..c6d2a95c978 100644 --- a/Mage.Sets/src/mage/sets/eventide/WickerboughElder.java +++ b/Mage.Sets/src/mage/sets/eventide/WickerboughElder.java @@ -72,7 +72,7 @@ public class WickerboughElder extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new AddCountersSourceEffect(CounterType.M1M1.createInstance(1)), false)); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new RemoveCountersSourceCost(CounterType.M1M1.createInstance(1))); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/eventide/WildernessHypnotist.java b/Mage.Sets/src/mage/sets/eventide/WildernessHypnotist.java index 64009bbf762..3d277559cbe 100644 --- a/Mage.Sets/src/mage/sets/eventide/WildernessHypnotist.java +++ b/Mage.Sets/src/mage/sets/eventide/WildernessHypnotist.java @@ -67,7 +67,7 @@ public class WildernessHypnotist extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/exodus/CatBurglar.java b/Mage.Sets/src/mage/sets/exodus/CatBurglar.java index bb80432d9f9..efbe5471df3 100644 --- a/Mage.Sets/src/mage/sets/exodus/CatBurglar.java +++ b/Mage.Sets/src/mage/sets/exodus/CatBurglar.java @@ -61,7 +61,7 @@ public class CatBurglar extends CardImpl { // {2}{B}, {tap}: Target player discards a card. Activate this ability only any time you could cast a sorcery. Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl("{2}{B}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/exodus/EntropicSpecter.java b/Mage.Sets/src/mage/sets/exodus/EntropicSpecter.java index 34e26572698..5279f01c6e2 100644 --- a/Mage.Sets/src/mage/sets/exodus/EntropicSpecter.java +++ b/Mage.Sets/src/mage/sets/exodus/EntropicSpecter.java @@ -106,7 +106,7 @@ class ChooseOpponent extends OneShotEffect { Player player = game.getPlayer(source.getControllerId()); Permanent permanent = game.getPermanent(source.getSourceId()); if (player != null && permanent != null) { - TargetOpponent target = new TargetOpponent(true); + TargetOpponent target = new TargetOpponent(); target.setRequired(true); target.setNotTarget(true); if (player.choose(this.outcome, target, source.getSourceId(), game)) { diff --git a/Mage.Sets/src/mage/sets/exodus/Equilibrium.java b/Mage.Sets/src/mage/sets/exodus/Equilibrium.java index 3cd654f0ba5..954ace5f654 100644 --- a/Mage.Sets/src/mage/sets/exodus/Equilibrium.java +++ b/Mage.Sets/src/mage/sets/exodus/Equilibrium.java @@ -60,7 +60,7 @@ public class Equilibrium extends CardImpl { // Whenever you cast a creature spell, you may pay {1}. If you do, return target creature to its owner's hand. Ability ability = new SpellCastControllerTriggeredAbility(new DoIfCostPaid(new ReturnToHandTargetEffect(), new GenericManaCost(1)), filter, false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/exodus/ErraticPortal.java b/Mage.Sets/src/mage/sets/exodus/ErraticPortal.java index ad7487ea46e..0e30181ea6e 100644 --- a/Mage.Sets/src/mage/sets/exodus/ErraticPortal.java +++ b/Mage.Sets/src/mage/sets/exodus/ErraticPortal.java @@ -59,7 +59,7 @@ public class ErraticPortal extends CardImpl { // {1}, {tap}: Return target creature to its owner's hand unless its controller pays {1}. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ErraticPortalEffect(new GenericManaCost(1)), new ManaCostsImpl("{1}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/exodus/SoltariVisionary.java b/Mage.Sets/src/mage/sets/exodus/SoltariVisionary.java index 262bf53714f..0a17ab53643 100644 --- a/Mage.Sets/src/mage/sets/exodus/SoltariVisionary.java +++ b/Mage.Sets/src/mage/sets/exodus/SoltariVisionary.java @@ -101,7 +101,7 @@ class SoltariVisionaryTriggeredAbility extends TriggeredAbilityImpl { filter.add(new ControllerIdPredicate(event.getPlayerId())); filter.setMessage("enchantment controlled by " + game.getPlayer(event.getTargetId()).getName()); this.getTargets().clear(); - this.addTarget(new TargetPermanent(filter, true)); + this.addTarget(new TargetPermanent(filter)); return true; } } diff --git a/Mage.Sets/src/mage/sets/exodus/SpikeWeaver.java b/Mage.Sets/src/mage/sets/exodus/SpikeWeaver.java index e34fa2a4ace..8fa5b558d84 100644 --- a/Mage.Sets/src/mage/sets/exodus/SpikeWeaver.java +++ b/Mage.Sets/src/mage/sets/exodus/SpikeWeaver.java @@ -67,7 +67,7 @@ public class SpikeWeaver extends CardImpl { // {2}, Remove a +1/+1 counter from Spike Weaver: Put a +1/+1 counter on target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {1}, Remove a +1/+1 counter from Spike Weaver: Prevent all combat damage that would be dealt this turn. diff --git a/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach.java b/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach.java index c86fdf9733b..cefe809ac15 100644 --- a/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach.java +++ b/Mage.Sets/src/mage/sets/fallenempires/HymnToTourach.java @@ -48,7 +48,7 @@ public class HymnToTourach extends CardImpl { // Target player discards two cards at random. this.getSpellAbility().addEffect(new DiscardTargetEffect(2, true)); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); } public HymnToTourach(final HymnToTourach card) { diff --git a/Mage.Sets/src/mage/sets/fifthdawn/BatonOfCourage.java b/Mage.Sets/src/mage/sets/fifthdawn/BatonOfCourage.java index dbfa6161af3..bb00a1370de 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/BatonOfCourage.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/BatonOfCourage.java @@ -59,7 +59,7 @@ public class BatonOfCourage extends CardImpl { this.addAbility(new SunburstAbility(this)); // Remove a charge counter from Baton of Courage: Target creature gets +1/+1 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(1))); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfTomorrows.java b/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfTomorrows.java index 63d44a701c3..fd482505c6f 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfTomorrows.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfTomorrows.java @@ -52,7 +52,7 @@ public class BeaconOfTomorrows extends CardImpl { this.color.setBlue(true); // Target player takes an extra turn after this one. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new BeaconOfTomorrowsEffect()); // Shuffle Beacon of Tomorrows into its owner's library. this.getSpellAbility().addEffect(ShuffleSpellEffect.getInstance()); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/BlastingStation.java b/Mage.Sets/src/mage/sets/fifthdawn/BlastingStation.java index d5c53be5ed5..a35b4a62bd5 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/BlastingStation.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/BlastingStation.java @@ -55,8 +55,8 @@ public class BlastingStation extends CardImpl { // {tap}, Sacrifice a creature: Blasting Station deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); - ability.addTarget(new TargetCreatureOrPlayer(true)); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); + ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); // Whenever a creature enters the battlefield, you may untap Blasting Station. this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new FilterCreaturePermanent("a creature"), true)); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/GrindingStation.java b/Mage.Sets/src/mage/sets/fifthdawn/GrindingStation.java index d2147366549..de1b9388df7 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/GrindingStation.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/GrindingStation.java @@ -64,7 +64,7 @@ public class GrindingStation extends CardImpl { // {tap}, Sacrifice an artifact: Target player puts the top three cards of his or her library into his or her graveyard. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutTopCardOfLibraryIntoGraveTargetEffect(3), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); // Whenever an artifact enters the battlefield, you may untap Grinding Station. diff --git a/Mage.Sets/src/mage/sets/fifthdawn/StaffOfDomination.java b/Mage.Sets/src/mage/sets/fifthdawn/StaffOfDomination.java index 105231f2104..dc2ff306f92 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/StaffOfDomination.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/StaffOfDomination.java @@ -62,12 +62,12 @@ public class StaffOfDomination extends CardImpl { // {3}, {tap}: Untap target creature. Ability ability3 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl("{3}")); ability3.addCost(new TapSourceCost()); - ability3.addTarget(new TargetCreaturePermanent(true)); + ability3.addTarget(new TargetCreaturePermanent()); this.addAbility(ability3); // {4}, {tap}: Tap target creature. Ability ability4 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{4}")); ability4.addCost(new TapSourceCost()); - ability4.addTarget(new TargetCreaturePermanent(true)); + ability4.addTarget(new TargetCreaturePermanent()); this.addAbility(ability4); // {5}, {tap}: Draw a card. Ability ability5 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{5}")); diff --git a/Mage.Sets/src/mage/sets/fifthdawn/StandFirm.java b/Mage.Sets/src/mage/sets/fifthdawn/StandFirm.java index f45c4d804f5..4ff312c727c 100644 --- a/Mage.Sets/src/mage/sets/fifthdawn/StandFirm.java +++ b/Mage.Sets/src/mage/sets/fifthdawn/StandFirm.java @@ -50,7 +50,7 @@ public class StandFirm extends CardImpl { // Target creature gets +1/+1 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(1,1, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Scry 2. this.getSpellAbility().addEffect(new ScryEffect(2)); } diff --git a/Mage.Sets/src/mage/sets/fifthedition/AmuletOfKroog.java b/Mage.Sets/src/mage/sets/fifthedition/AmuletOfKroog.java index 480ce98b764..3a038d28681 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/AmuletOfKroog.java +++ b/Mage.Sets/src/mage/sets/fifthedition/AmuletOfKroog.java @@ -53,7 +53,7 @@ public class AmuletOfKroog extends CardImpl { // {2}, {tap}: Prevent the next 1 damage that would be dealt to target creature or player this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer(true)); + ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/fifthedition/DivineTransformation.java b/Mage.Sets/src/mage/sets/fifthedition/DivineTransformation.java index 0a9a501036a..07f19a8b3d6 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/DivineTransformation.java +++ b/Mage.Sets/src/mage/sets/fifthedition/DivineTransformation.java @@ -56,7 +56,7 @@ public class DivineTransformation extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); // Enchanted creature gets +3/+3. diff --git a/Mage.Sets/src/mage/sets/fifthedition/HurkylsRecall.java b/Mage.Sets/src/mage/sets/fifthedition/HurkylsRecall.java index 71a72471224..379419157b6 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/HurkylsRecall.java +++ b/Mage.Sets/src/mage/sets/fifthedition/HurkylsRecall.java @@ -55,7 +55,7 @@ public class HurkylsRecall extends CardImpl { // Return all artifacts target player owns to his or her hand. this.getSpellAbility().addEffect(new HurkylsRecallReturnToHandEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public HurkylsRecall(final HurkylsRecall card) { diff --git a/Mage.Sets/src/mage/sets/fifthedition/Juxtapose.java b/Mage.Sets/src/mage/sets/fifthedition/Juxtapose.java index 78229fefaf2..1716dc7e7af 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/Juxtapose.java +++ b/Mage.Sets/src/mage/sets/fifthedition/Juxtapose.java @@ -72,7 +72,7 @@ public class Juxtapose extends CardImpl { // You and target player exchange control of the creature you each control with the highest converted mana cost. Then exchange control of artifacts the same way. If two or more permanents a player controls are tied for highest cost, their controller chooses one of them. this.getSpellAbility().addEffect(new JuxtaposeEffect(new FilterCreaturePermanent(), "You and target player exchange control of the creature you each control with the highest converted mana cost.")); this.getSpellAbility().addEffect(new JuxtaposeEffect(new FilterArtifactPermanent(), "Then exchange control of artifacts the same way. If two or more permanents a player controls are tied for highest cost, their controller chooses one of them.")); - this.getSpellAbility().addTarget(new TargetPlayer(true) ); + this.getSpellAbility().addTarget(new TargetPlayer() ); } public Juxtapose(final Juxtapose card) { diff --git a/Mage.Sets/src/mage/sets/fifthedition/Millstone.java b/Mage.Sets/src/mage/sets/fifthedition/Millstone.java index a3ed79f35a8..0012b080a51 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/Millstone.java +++ b/Mage.Sets/src/mage/sets/fifthedition/Millstone.java @@ -52,7 +52,7 @@ public class Millstone extends CardImpl { // {2}, {tap}: Target player puts the top two cards of his or her library into his or her graveyard. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(2), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/fifthedition/PradeshGypsies.java b/Mage.Sets/src/mage/sets/fifthedition/PradeshGypsies.java index 65d88222e9b..09ec4ef9931 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/PradeshGypsies.java +++ b/Mage.Sets/src/mage/sets/fifthedition/PradeshGypsies.java @@ -60,7 +60,7 @@ public class PradeshGypsies extends CardImpl { // {1}{G}, {tap}: Target creature gets -2/-0 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}{G}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/fifthedition/RadjanSpirit.java b/Mage.Sets/src/mage/sets/fifthedition/RadjanSpirit.java index 19c0f74faef..b2eea268894 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/RadjanSpirit.java +++ b/Mage.Sets/src/mage/sets/fifthedition/RadjanSpirit.java @@ -58,7 +58,7 @@ public class RadjanSpirit extends CardImpl { // {tap}: Target creature loses flying until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/fifthedition/WyluliWolf.java b/Mage.Sets/src/mage/sets/fifthedition/WyluliWolf.java index 2324773c14e..01191083a2a 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/WyluliWolf.java +++ b/Mage.Sets/src/mage/sets/fifthedition/WyluliWolf.java @@ -57,7 +57,7 @@ public class WyluliWolf extends CardImpl { // {tap}: Target creature gets +1/+1 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/fourthedition/Blessing.java b/Mage.Sets/src/mage/sets/fourthedition/Blessing.java index 083be513148..c0095a5b75a 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/Blessing.java +++ b/Mage.Sets/src/mage/sets/fourthedition/Blessing.java @@ -58,7 +58,7 @@ public class Blessing extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); // {W}: Enchanted creature gets +1/+1 until end of turn. diff --git a/Mage.Sets/src/mage/sets/fourthedition/EbonyHorse.java b/Mage.Sets/src/mage/sets/fourthedition/EbonyHorse.java index d085ddb2ac5..ada18ae0610 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/EbonyHorse.java +++ b/Mage.Sets/src/mage/sets/fourthedition/EbonyHorse.java @@ -63,7 +63,7 @@ public class EbonyHorse extends CardImpl { ability.addCost(new TapSourceCost()); ability.addEffect(new PreventCombatDamageToSourceEffect(Duration.EndOfTurn)); ability.addEffect(new PreventCombatDamageBySourceEffect(Duration.EndOfTurn)); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/fourthedition/HolyArmor.java b/Mage.Sets/src/mage/sets/fourthedition/HolyArmor.java index 1a865a76a8c..8a77798f263 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/HolyArmor.java +++ b/Mage.Sets/src/mage/sets/fourthedition/HolyArmor.java @@ -59,7 +59,7 @@ public class HolyArmor extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/fourthedition/SwordsToPlowshares.java b/Mage.Sets/src/mage/sets/fourthedition/SwordsToPlowshares.java index b909779c94c..b0084528757 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/SwordsToPlowshares.java +++ b/Mage.Sets/src/mage/sets/fourthedition/SwordsToPlowshares.java @@ -54,7 +54,7 @@ public class SwordsToPlowshares extends CardImpl { this.color.setWhite(true); // Exile target creature. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new ExileTargetEffect()); // Its controller gains life equal to its power. this.getSpellAbility().addEffect(new SwordsToPlowsharesEffect()); diff --git a/Mage.Sets/src/mage/sets/fourthedition/TheRack.java b/Mage.Sets/src/mage/sets/fourthedition/TheRack.java index af7e2589ba9..7ebef417de7 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/TheRack.java +++ b/Mage.Sets/src/mage/sets/fourthedition/TheRack.java @@ -121,7 +121,7 @@ class ChooseOpponent extends OneShotEffect { Player player = game.getPlayer(source.getControllerId()); Permanent permanent = game.getPermanent(source.getSourceId()); if (player != null && permanent != null) { - TargetOpponent target = new TargetOpponent(true); + TargetOpponent target = new TargetOpponent(); target.setRequired(true); target.setNotTarget(true); if (player.choose(this.outcome, target, source.getSourceId(), game)) { diff --git a/Mage.Sets/src/mage/sets/futuresight/DaybreakCoronet.java b/Mage.Sets/src/mage/sets/futuresight/DaybreakCoronet.java index df6212305c1..e3eee7538e9 100644 --- a/Mage.Sets/src/mage/sets/futuresight/DaybreakCoronet.java +++ b/Mage.Sets/src/mage/sets/futuresight/DaybreakCoronet.java @@ -69,7 +69,7 @@ public class DaybreakCoronet extends CardImpl { this.color.setWhite(true); // Enchant creature with another Aura attached to it - TargetPermanent auraTarget = new TargetCreaturePermanent(filter, true); + TargetPermanent auraTarget = new TargetCreaturePermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/futuresight/IchorSlick.java b/Mage.Sets/src/mage/sets/futuresight/IchorSlick.java index 8015c5bbf42..8fa7494d020 100644 --- a/Mage.Sets/src/mage/sets/futuresight/IchorSlick.java +++ b/Mage.Sets/src/mage/sets/futuresight/IchorSlick.java @@ -53,7 +53,7 @@ public class IchorSlick extends CardImpl { // Target creature gets -3/-3 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(-3, -3, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Cycling {2} this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); diff --git a/Mage.Sets/src/mage/sets/futuresight/LlanowarAugur.java b/Mage.Sets/src/mage/sets/futuresight/LlanowarAugur.java index 9184befb6a7..39bc05f1d67 100644 --- a/Mage.Sets/src/mage/sets/futuresight/LlanowarAugur.java +++ b/Mage.Sets/src/mage/sets/futuresight/LlanowarAugur.java @@ -66,7 +66,7 @@ public class LlanowarAugur extends CardImpl { new SacrificeSourceCost()); ability.addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); ability.addCost(new OnlyDuringUpkeepCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/futuresight/SlaughterPact.java b/Mage.Sets/src/mage/sets/futuresight/SlaughterPact.java index 1fec7ed8dce..c98f611b303 100644 --- a/Mage.Sets/src/mage/sets/futuresight/SlaughterPact.java +++ b/Mage.Sets/src/mage/sets/futuresight/SlaughterPact.java @@ -60,7 +60,7 @@ public class SlaughterPact extends CardImpl { this.color.setBlack(true); // Destroy target nonblack creature. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); // At the beginning of your next upkeep, pay {2}{B}. If you don't, you lose the game. this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new PactDelayedTriggeredAbility(new ManaCostsImpl("{2}{B}")),false)); diff --git a/Mage.Sets/src/mage/sets/futuresight/WitchsMist.java b/Mage.Sets/src/mage/sets/futuresight/WitchsMist.java index 490b3159f51..155560952df 100644 --- a/Mage.Sets/src/mage/sets/futuresight/WitchsMist.java +++ b/Mage.Sets/src/mage/sets/futuresight/WitchsMist.java @@ -60,7 +60,7 @@ public class WitchsMist extends CardImpl { // {2}{B}, {T}: Destroy target creature that was dealt damage this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(),new ManaCostsImpl("{2}{B}")); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/AerialManeuver.java b/Mage.Sets/src/mage/sets/gatecrash/AerialManeuver.java index 232d5605c8d..2f6880d07f5 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/AerialManeuver.java +++ b/Mage.Sets/src/mage/sets/gatecrash/AerialManeuver.java @@ -54,7 +54,7 @@ public class AerialManeuver extends CardImpl { getSpellAbility().addEffect(new BoostTargetEffect(1,1, Duration.EndOfTurn)); getSpellAbility().addEffect(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); getSpellAbility().addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn)); - getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + getSpellAbility().addTarget(new TargetCreaturePermanent()); } public AerialManeuver(final AerialManeuver card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/Agoraphobia.java b/Mage.Sets/src/mage/sets/gatecrash/Agoraphobia.java index 865b0ab81b7..d63641491ae 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Agoraphobia.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Agoraphobia.java @@ -59,7 +59,7 @@ public class Agoraphobia extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/AlphaAuthority.java b/Mage.Sets/src/mage/sets/gatecrash/AlphaAuthority.java index 2e24b509482..e7e27d3144e 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/AlphaAuthority.java +++ b/Mage.Sets/src/mage/sets/gatecrash/AlphaAuthority.java @@ -65,7 +65,7 @@ public class AlphaAuthority extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/AngelicEdict.java b/Mage.Sets/src/mage/sets/gatecrash/AngelicEdict.java index 786039c773e..0b7c6e59d4d 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/AngelicEdict.java +++ b/Mage.Sets/src/mage/sets/gatecrash/AngelicEdict.java @@ -56,7 +56,7 @@ public class AngelicEdict extends CardImpl { // Exile target creature or enchantment. getSpellAbility().addEffect(new ExileTargetEffect()); - getSpellAbility().addTarget(new TargetPermanent(filter, true)); + getSpellAbility().addTarget(new TargetPermanent(filter)); } public AngelicEdict(final AngelicEdict card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/BalustradeSpy.java b/Mage.Sets/src/mage/sets/gatecrash/BalustradeSpy.java index 53f698fee89..9c9b6d1b51f 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BalustradeSpy.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BalustradeSpy.java @@ -65,7 +65,7 @@ public class BalustradeSpy extends CardImpl { // When Balustrade Spy enters the battlefield, target player reveals cards from the top of his or her library until he or she reveals a land card, then puts those cards into his or her graveyard. Ability ability = new EntersBattlefieldTriggeredAbility(new BalustradeSpyEffect(), false); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/BorosCharm.java b/Mage.Sets/src/mage/sets/gatecrash/BorosCharm.java index 8384334ac21..822acc37932 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BorosCharm.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BorosCharm.java @@ -59,7 +59,7 @@ public class BorosCharm extends CardImpl { //Choose one - Boros Charm deals 4 damage to target player this.getSpellAbility().addEffect(new DamageTargetEffect(4)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); //or permanents you control are indestructible this turn Mode mode = new Mode(); Effect effect = new GainAbilityAllEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn, new FilterControlledPermanent(), false); @@ -69,7 +69,7 @@ public class BorosCharm extends CardImpl { //or target creature gains double strike until end of turn. Mode mode2 = new Mode(); mode2.getEffects().add(new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn)); - mode2.getTargets().add(new TargetCreaturePermanent(true)); + mode2.getTargets().add(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode2); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/BurstOfStrength.java b/Mage.Sets/src/mage/sets/gatecrash/BurstOfStrength.java index 2a32aba3c12..778d17a577b 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/BurstOfStrength.java +++ b/Mage.Sets/src/mage/sets/gatecrash/BurstOfStrength.java @@ -51,7 +51,7 @@ public class BurstOfStrength extends CardImpl { // Put a +1/+1 counter on target creature and untap it. this.getSpellAbility().addEffect(new AddCountersTargetEffect(CounterType.P1P1.createInstance(1))); this.getSpellAbility().addEffect(new UntapTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public BurstOfStrength(final BurstOfStrength card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/ClanDefiance.java b/Mage.Sets/src/mage/sets/gatecrash/ClanDefiance.java index 5d5aab324f7..d2e06d4ea2d 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ClanDefiance.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ClanDefiance.java @@ -69,7 +69,7 @@ public class ClanDefiance extends CardImpl { this.getSpellAbility().getModes().setMaxModes(3); // Clan Defiance deals X damage to target creature with flying; this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); // Clan Defiance deals X damage to target creature without flying; Mode mode1 = new Mode(); mode1.getEffects().add(new DamageTargetEffect(new ManacostVariableValue())); @@ -78,7 +78,7 @@ public class ClanDefiance extends CardImpl { // and/or Clan Defiance deals X damage to target player. Mode mode2 = new Mode(); mode2.getEffects().add(new DamageTargetEffect(new ManacostVariableValue())); - mode2.getTargets().add(new TargetPlayer(true)); + mode2.getTargets().add(new TargetPlayer()); this.getSpellAbility().addMode(mode2); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/CoercedConfession.java b/Mage.Sets/src/mage/sets/gatecrash/CoercedConfession.java index ff2addf1307..04f1affe9ee 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/CoercedConfession.java +++ b/Mage.Sets/src/mage/sets/gatecrash/CoercedConfession.java @@ -56,7 +56,7 @@ public class CoercedConfession extends CardImpl { // Target player puts the top four cards of his or her library into his or her graveyard. You draw a card for each creature card put into a graveyard this way. getSpellAbility().addEffect(new CoercedConfessionMillEffect()); - getSpellAbility().addTarget(new TargetPlayer(true)); + getSpellAbility().addTarget(new TargetPlayer()); } public CoercedConfession(final CoercedConfession card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/DeathsApproach.java b/Mage.Sets/src/mage/sets/gatecrash/DeathsApproach.java index 3d51fe2e78c..f3751adef22 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DeathsApproach.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DeathsApproach.java @@ -63,7 +63,7 @@ public class DeathsApproach extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/DebtorsPulpit.java b/Mage.Sets/src/mage/sets/gatecrash/DebtorsPulpit.java index 5a09398dbc4..e14c717c1a1 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DebtorsPulpit.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DebtorsPulpit.java @@ -66,7 +66,7 @@ public class DebtorsPulpit extends CardImpl { // Enchanted land has "{T}: Tap target creature." Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); - gainAbility.addTarget(new TargetCreaturePermanent(true)); + gainAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{T}: Tap target creature.\""))); diff --git a/Mage.Sets/src/mage/sets/gatecrash/DevourFlesh.java b/Mage.Sets/src/mage/sets/gatecrash/DevourFlesh.java index 94fd25b7825..058f80d0c6d 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DevourFlesh.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DevourFlesh.java @@ -65,7 +65,7 @@ public class DevourFlesh extends CardImpl { // Target player sacrifices a creature, then gains life equal to that creature's toughness. this.getSpellAbility().addEffect(new DevourFleshSacrificeEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public DevourFlesh(final DevourFlesh card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/DimirCharm.java b/Mage.Sets/src/mage/sets/gatecrash/DimirCharm.java index 62f599f0447..8d200bafa9f 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DimirCharm.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DimirCharm.java @@ -88,7 +88,7 @@ public class DimirCharm extends CardImpl { //or look at the top three cards of target player's library, then put one back and the rest into that player's graveyard Mode mode2 = new Mode(); mode2.getEffects().add(new DimirCharmEffect()); - mode2.getTargets().add(new TargetPlayer(true)); + mode2.getTargets().add(new TargetPlayer()); this.getSpellAbility().addMode(mode2); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/DinrovaHorror.java b/Mage.Sets/src/mage/sets/gatecrash/DinrovaHorror.java index e100b2d9be8..e74f30c8cd9 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DinrovaHorror.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DinrovaHorror.java @@ -60,7 +60,7 @@ public class DinrovaHorror extends CardImpl { // When Dinrova Horror enters the battlefield, return target permanent to its owner's hand, then that player discards a card. Ability ability = new EntersBattlefieldTriggeredAbility(new DinrovaHorrorEffect(), false); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/DomriRade.java b/Mage.Sets/src/mage/sets/gatecrash/DomriRade.java index 3165280d60d..ebdca13d94f 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DomriRade.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DomriRade.java @@ -78,8 +78,8 @@ public class DomriRade extends CardImpl { // -2: Target creature you control fights another target creature. LoyaltyAbility ability2 = new LoyaltyAbility(new FightTargetsEffect(), -2); - ability2.addTarget(new TargetControlledCreaturePermanent(true)); - ability2.addTarget(new TargetOtherCreaturePermanent(true)); + ability2.addTarget(new TargetControlledCreaturePermanent()); + ability2.addTarget(new TargetOtherCreaturePermanent()); this.addAbility(ability2); // -7: You get an emblem with "Creatures you control have double strike, trample, hexproof and haste." diff --git a/Mage.Sets/src/mage/sets/gatecrash/DuskmantleGuildmage.java b/Mage.Sets/src/mage/sets/gatecrash/DuskmantleGuildmage.java index 3d9bf5550e3..a5fd5af73ac 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DuskmantleGuildmage.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DuskmantleGuildmage.java @@ -72,7 +72,7 @@ public class DuskmantleGuildmage extends CardImpl { // {2}{U}{B}: Target player puts the top two cards of his or her library into his or her graveyard. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(2), new ManaCostsImpl("{2}{U}{B}")); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/DyingWish.java b/Mage.Sets/src/mage/sets/gatecrash/DyingWish.java index c1f7f5d6211..c0225074a27 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/DyingWish.java +++ b/Mage.Sets/src/mage/sets/gatecrash/DyingWish.java @@ -57,7 +57,7 @@ public class DyingWish extends CardImpl { this.color.setBlack(true); // Enchant creature you control - TargetPermanent auraTarget = new TargetControlledCreaturePermanent(true); + TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); @@ -68,7 +68,7 @@ public class DyingWish extends CardImpl { DynamicValue attachedPower = new AttachedPermanentPowerCount(); ability = new DiesAttachedTriggeredAbility(new LoseLifeTargetEffect(attachedPower), "enchanted creature"); ability.addEffect(new GainLifeEffect(attachedPower)); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/FirefistStriker.java b/Mage.Sets/src/mage/sets/gatecrash/FirefistStriker.java index ee603e6558f..1b4c3b0e5fb 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/FirefistStriker.java +++ b/Mage.Sets/src/mage/sets/gatecrash/FirefistStriker.java @@ -58,7 +58,7 @@ public class FirefistStriker extends CardImpl { // Battalion — Whenever Firefist Striker and at least two other creatures attack, target creature can't block this turn. Ability ability = new BattalionAbility(new CantBlockTargetEffect(Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/FiremaneAvenger.java b/Mage.Sets/src/mage/sets/gatecrash/FiremaneAvenger.java index 840047b26ab..8088d7ba08d 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/FiremaneAvenger.java +++ b/Mage.Sets/src/mage/sets/gatecrash/FiremaneAvenger.java @@ -59,7 +59,7 @@ public class FiremaneAvenger extends CardImpl { // Battalion - Whenever Firemane Avenger and at least two other creatures attack, Firemane Avenger deals 3 damage to target creature or player and you gain 3 life. Ability ability = new BattalionAbility(new DamageTargetEffect(3)); - ability.addTarget(new TargetCreatureOrPlayer(true)); + ability.addTarget(new TargetCreatureOrPlayer()); ability.addEffect(new GainLifeEffect(3)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/ForcedAdaptation.java b/Mage.Sets/src/mage/sets/gatecrash/ForcedAdaptation.java index a13846d00b4..f5831c6c71c 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ForcedAdaptation.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ForcedAdaptation.java @@ -56,7 +56,7 @@ public class ForcedAdaptation extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/FoundryChampion.java b/Mage.Sets/src/mage/sets/gatecrash/FoundryChampion.java index 0ca7d044bb1..fcdc9ab8b1a 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/FoundryChampion.java +++ b/Mage.Sets/src/mage/sets/gatecrash/FoundryChampion.java @@ -66,7 +66,7 @@ public class FoundryChampion extends CardImpl { //When Foundry Champion enters the battlefield, it deals damage to target creature or player equal to the number of creatures you control. Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent()))); - ability.addTarget(new TargetCreatureOrPlayer(true)); + ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); //{R}: Foundry Champion gets +1/+0 until end of turn. diff --git a/Mage.Sets/src/mage/sets/gatecrash/FuriousResistance.java b/Mage.Sets/src/mage/sets/gatecrash/FuriousResistance.java index e5d91b062ae..d7b43dbbb86 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/FuriousResistance.java +++ b/Mage.Sets/src/mage/sets/gatecrash/FuriousResistance.java @@ -63,7 +63,7 @@ public class FuriousResistance extends CardImpl { // Target blocking creature gets +3/+0 and gains first strike until end of turn. this.getSpellAbility().addEffect(new FuriousResistanceEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); } public FuriousResistance(final FuriousResistance card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/GideonChampionOfJustice.java b/Mage.Sets/src/mage/sets/gatecrash/GideonChampionOfJustice.java index 7d5a0ddb053..16e5ca4593f 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GideonChampionOfJustice.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GideonChampionOfJustice.java @@ -68,7 +68,7 @@ public class GideonChampionOfJustice extends CardImpl { // +1: Put a loyalty counter on Gideon, Champion of Justice for each creature target opponent controls. LoyaltyAbility ability1 = new LoyaltyAbility( new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(0), new PermanentsTargetOpponentControlsCount(), false), 1); - ability1.addTarget(new TargetOpponent(true)); + ability1.addTarget(new TargetOpponent()); this.addAbility(ability1); // 0: Until end of turn, Gideon becomes an indestructible Human Soldier creature with power and toughness each equal to the number of loyalty counters on him. He's still a planeswalker. Prevent all damage that would be dealt to him this turn. diff --git a/Mage.Sets/src/mage/sets/gatecrash/GiftOfOrzhova.java b/Mage.Sets/src/mage/sets/gatecrash/GiftOfOrzhova.java index 8b77e4ccc85..ea82cd9f64e 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GiftOfOrzhova.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GiftOfOrzhova.java @@ -61,7 +61,7 @@ public class GiftOfOrzhova extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/GreensideWatcher.java b/Mage.Sets/src/mage/sets/gatecrash/GreensideWatcher.java index cc33fe0b4b2..9ecc1f2308b 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GreensideWatcher.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GreensideWatcher.java @@ -65,7 +65,7 @@ public class GreensideWatcher extends CardImpl { // {tap}: Untap target Gate. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/GrislySpectacle.java b/Mage.Sets/src/mage/sets/gatecrash/GrislySpectacle.java index fbdd0f9e339..501df68cbf0 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GrislySpectacle.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GrislySpectacle.java @@ -66,7 +66,7 @@ public class GrislySpectacle extends CardImpl { // Destroy target nonartifact creature. Its controller puts a number of cards equal to that creature's power from the top of his or her library into his or her graveyard. this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new GrislySpectacleEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); } public GrislySpectacle(final GrislySpectacle card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/GroundAssault.java b/Mage.Sets/src/mage/sets/gatecrash/GroundAssault.java index f76bfcb4203..fbf6d242bb6 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GroundAssault.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GroundAssault.java @@ -51,7 +51,7 @@ public class GroundAssault extends CardImpl { // Ground Assault deals damage to target creature equal to the number of lands you control. this.getSpellAbility().addEffect(new DamageTargetEffect(new PermanentsOnBattlefieldCount(new FilterControlledLandPermanent()))); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public GroundAssault(final GroundAssault card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/GuildscornWard.java b/Mage.Sets/src/mage/sets/gatecrash/GuildscornWard.java index 2cfa757866a..797ec57de4a 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/GuildscornWard.java +++ b/Mage.Sets/src/mage/sets/gatecrash/GuildscornWard.java @@ -65,7 +65,7 @@ public class GuildscornWard extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Protect)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/HandsOfBinding.java b/Mage.Sets/src/mage/sets/gatecrash/HandsOfBinding.java index 675e91da1fd..26e68556e17 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/HandsOfBinding.java +++ b/Mage.Sets/src/mage/sets/gatecrash/HandsOfBinding.java @@ -60,7 +60,7 @@ public class HandsOfBinding extends CardImpl { //Tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step. this.getSpellAbility().addEffect(new TapTargetEffect()); this.getSpellAbility().addEffect(new SkipNextUntapTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); //Cipher this.getSpellAbility().addEffect(new CipherEffect()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/HolyMantle.java b/Mage.Sets/src/mage/sets/gatecrash/HolyMantle.java index f4d6fa78860..8428d7906a2 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/HolyMantle.java +++ b/Mage.Sets/src/mage/sets/gatecrash/HolyMantle.java @@ -60,7 +60,7 @@ public class HolyMantle extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Protect)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/HomingLightning.java b/Mage.Sets/src/mage/sets/gatecrash/HomingLightning.java index c2b81d39fdb..536f36b2b6a 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/HomingLightning.java +++ b/Mage.Sets/src/mage/sets/gatecrash/HomingLightning.java @@ -56,7 +56,7 @@ public class HomingLightning extends CardImpl { // Homing Lightning deals 4 damage to target creature and each other creature with the same name as that creature. this.getSpellAbility().addEffect(new HomingLightningEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public HomingLightning(final HomingLightning card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/IvyLaneDenizen.java b/Mage.Sets/src/mage/sets/gatecrash/IvyLaneDenizen.java index 7a678c506de..3357a529479 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/IvyLaneDenizen.java +++ b/Mage.Sets/src/mage/sets/gatecrash/IvyLaneDenizen.java @@ -70,7 +70,7 @@ public class IvyLaneDenizen extends CardImpl { Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), filter, false, null, true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/KillingGlare.java b/Mage.Sets/src/mage/sets/gatecrash/KillingGlare.java index fc6bf5f8003..8bcb53c71ad 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/KillingGlare.java +++ b/Mage.Sets/src/mage/sets/gatecrash/KillingGlare.java @@ -69,7 +69,7 @@ public class KillingGlare extends CardImpl { ability.getTargets().clear(); FilterCreaturePermanent filter = new FilterCreaturePermanent(new StringBuilder("creature with power ").append(xValue).append(" or less").toString()); filter.add(new PowerPredicate(Filter.ComparisonType.LessThan, xValue + 1)); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); } } diff --git a/Mage.Sets/src/mage/sets/gatecrash/MadcapSkills.java b/Mage.Sets/src/mage/sets/gatecrash/MadcapSkills.java index 5917201432e..c0154c09703 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MadcapSkills.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MadcapSkills.java @@ -58,7 +58,7 @@ public class MadcapSkills extends CardImpl { this.color.setRed(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/MarkForDeath.java b/Mage.Sets/src/mage/sets/gatecrash/MarkForDeath.java index de5f10f79f4..6f01d876675 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MarkForDeath.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MarkForDeath.java @@ -70,7 +70,7 @@ public class MarkForDeath extends CardImpl { // Target creature an opponent controls blocks this turn if able. Untap that creature. Other creatures that player controls can't block this turn. this.getSpellAbility().addEffect(new MarkForDeathEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); } public MarkForDeath(final MarkForDeath card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/MentalVapors.java b/Mage.Sets/src/mage/sets/gatecrash/MentalVapors.java index 90d416a86cb..090978a3665 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MentalVapors.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MentalVapors.java @@ -49,7 +49,7 @@ public class MentalVapors extends CardImpl { // Target player discards a card. this.getSpellAbility().addEffect(new DiscardTargetEffect(1)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); // Cipher (Then you may exilce this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.) this.getSpellAbility().addEffect(new CipherEffect()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/MindeyeDrake.java b/Mage.Sets/src/mage/sets/gatecrash/MindeyeDrake.java index 6e928bb92d4..107dad9c952 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MindeyeDrake.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MindeyeDrake.java @@ -57,7 +57,7 @@ public class MindeyeDrake extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Mindeye Drake dies, target player puts the top five cards of his or her library into his or her graveyard. Ability ability = new DiesTriggeredAbility(new PutLibraryIntoGraveTargetEffect(5)); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/Mugging.java b/Mage.Sets/src/mage/sets/gatecrash/Mugging.java index 7bfae241cdd..2c34e8c715b 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Mugging.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Mugging.java @@ -52,7 +52,7 @@ public class Mugging extends CardImpl { // Mugging deals 2 damage to target creature. That creature can't block this turn. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellAbility().addEffect(new CantBlockTargetEffect(Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public Mugging(final Mugging card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/MurderInvestigation.java b/Mage.Sets/src/mage/sets/gatecrash/MurderInvestigation.java index 0b1ab556330..400b0c74114 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/MurderInvestigation.java +++ b/Mage.Sets/src/mage/sets/gatecrash/MurderInvestigation.java @@ -58,7 +58,7 @@ public class MurderInvestigation extends CardImpl { this.color.setWhite(true); // Enchant creature you control - TargetPermanent auraTarget = new TargetControlledCreaturePermanent(true); + TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/ObzedatGhostCouncil.java b/Mage.Sets/src/mage/sets/gatecrash/ObzedatGhostCouncil.java index dbd50fd78f8..18476e0e8ca 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ObzedatGhostCouncil.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ObzedatGhostCouncil.java @@ -79,7 +79,7 @@ public class ObzedatGhostCouncil extends CardImpl { //When Obzedat, Ghost Council enters the battlefield, target opponent loses 2 life and you gain 2 life. Ability ability = new EntersBattlefieldTriggeredAbility(new LoseLifeTargetEffect(2)); ability.addEffect(new GainLifeEffect(2)); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); //At the beginning of your end step you may exile Obzedat. If you do, return it to the battlefield under it's owner's control at the beginning of your next upkeep. It gains haste. Ability ability2 = new BeginningOfYourEndStepTriggeredAbility(new ObzedatGhostCouncilExileSourceEffect(), true); diff --git a/Mage.Sets/src/mage/sets/gatecrash/OneThousandLashes.java b/Mage.Sets/src/mage/sets/gatecrash/OneThousandLashes.java index 918cf8b4759..b54c0f1d676 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/OneThousandLashes.java +++ b/Mage.Sets/src/mage/sets/gatecrash/OneThousandLashes.java @@ -60,7 +60,7 @@ public class OneThousandLashes extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/OrzhovCharm.java b/Mage.Sets/src/mage/sets/gatecrash/OrzhovCharm.java index 561242fbf62..16d5b40c37e 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/OrzhovCharm.java +++ b/Mage.Sets/src/mage/sets/gatecrash/OrzhovCharm.java @@ -69,12 +69,12 @@ public class OrzhovCharm extends CardImpl { //Choose one - Return target creature you control and all Auras you control attached to it to their owner's hand this.getSpellAbility().addEffect(new OrzhovCharmReturnToHandEffect()); - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); // or destroy target creature and you lose life equal to its toughness; Mode mode = new Mode(); mode.getEffects().add(new OrzhovCharmDestroyAndLoseLifeEffect()); - mode.getTargets().add(new TargetCreaturePermanent(true)); + mode.getTargets().add(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); // or return target creature card with converted mana cost 1 or less from your graveyard to the battlefield. diff --git a/Mage.Sets/src/mage/sets/gatecrash/ParanoidDelusions.java b/Mage.Sets/src/mage/sets/gatecrash/ParanoidDelusions.java index c339f993f3b..5886df0c8b9 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ParanoidDelusions.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ParanoidDelusions.java @@ -50,7 +50,7 @@ public class ParanoidDelusions extends CardImpl { // Target player puts the top three cards of his or her library into his or her graveyard. this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); // Cipher this.getSpellAbility().addEffect(new CipherEffect()); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/PitFight.java b/Mage.Sets/src/mage/sets/gatecrash/PitFight.java index bc94b6c8ac1..06585a9b909 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/PitFight.java +++ b/Mage.Sets/src/mage/sets/gatecrash/PitFight.java @@ -52,8 +52,8 @@ public class PitFight extends CardImpl { // Target creature you control fights another target creature. this.getSpellAbility().addEffect(new FightTargetsEffect()); - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); - this.getSpellAbility().addTarget(new TargetOtherCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); + this.getSpellAbility().addTarget(new TargetOtherCreaturePermanent()); } public PitFight(final PitFight card) { @@ -68,9 +68,9 @@ public class PitFight extends CardImpl { class TargetOtherCreaturePermanent extends TargetCreaturePermanent { - - public TargetOtherCreaturePermanent(boolean required) { - super(required); + + public TargetOtherCreaturePermanent() { + super(); } public TargetOtherCreaturePermanent(final TargetOtherCreaturePermanent target) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/PredatorsRapport.java b/Mage.Sets/src/mage/sets/gatecrash/PredatorsRapport.java index 67076bef06e..1fd324846d6 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/PredatorsRapport.java +++ b/Mage.Sets/src/mage/sets/gatecrash/PredatorsRapport.java @@ -55,7 +55,7 @@ public class PredatorsRapport extends CardImpl { Effect effect = new GainLifeEffect(new TargetPermanentPowerPlusToughnessCount()); effect.setText("Choose target creature you control. You gain life equal to that creature's power plus its toughness"); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); } public PredatorsRapport(final PredatorsRapport card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/PrimalVisitation.java b/Mage.Sets/src/mage/sets/gatecrash/PrimalVisitation.java index fc280abba33..32245603b3c 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/PrimalVisitation.java +++ b/Mage.Sets/src/mage/sets/gatecrash/PrimalVisitation.java @@ -61,7 +61,7 @@ public class PrimalVisitation extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/PurgeTheProfane.java b/Mage.Sets/src/mage/sets/gatecrash/PurgeTheProfane.java index 88f7d3a350a..ce49bfbc6a2 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/PurgeTheProfane.java +++ b/Mage.Sets/src/mage/sets/gatecrash/PurgeTheProfane.java @@ -50,7 +50,7 @@ public class PurgeTheProfane extends CardImpl { // Target opponent discards two cards and you gain 2 life. this.getSpellAbility().addEffect(new DiscardTargetEffect(2)); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); this.getSpellAbility().addEffect(new GainLifeEffect(2)); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/RapidHybridization.java b/Mage.Sets/src/mage/sets/gatecrash/RapidHybridization.java index 94ecde0c9f9..4a49ff51536 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/RapidHybridization.java +++ b/Mage.Sets/src/mage/sets/gatecrash/RapidHybridization.java @@ -56,7 +56,7 @@ public class RapidHybridization extends CardImpl { this.color.setBlue(true); // Destroy target creature. It can't be regenerated. That creature's controller puts a 3/3 green Frog Lizard creature token onto the battlefield. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new RapidHybridizationEffect()); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/RazortipWhip.java b/Mage.Sets/src/mage/sets/gatecrash/RazortipWhip.java index ee1585f124c..fb3f5b59441 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/RazortipWhip.java +++ b/Mage.Sets/src/mage/sets/gatecrash/RazortipWhip.java @@ -52,7 +52,7 @@ public class RazortipWhip extends CardImpl { // {1}, {tap}: Razortip Whip deals 1 damage to target opponent. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/RustScarab.java b/Mage.Sets/src/mage/sets/gatecrash/RustScarab.java index 7c93299204a..574b2a2b29a 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/RustScarab.java +++ b/Mage.Sets/src/mage/sets/gatecrash/RustScarab.java @@ -104,7 +104,7 @@ class BecomesBlockedTriggeredAbility extends TriggeredAbilityImpl { FilterPermanent filter = new FilterPermanent("artifact or enchantment defending player controls"); filter.add(Predicates.or(new CardTypePredicate(CardType.ARTIFACT), new CardTypePredicate(CardType.ENCHANTMENT))); filter.add(new ControllerIdPredicate(defenderId)); - Target target = new TargetPermanent(filter, true); + Target target = new TargetPermanent(filter); this.addTarget(target); return true; } diff --git a/Mage.Sets/src/mage/sets/gatecrash/SagesRowDenizen.java b/Mage.Sets/src/mage/sets/gatecrash/SagesRowDenizen.java index 5b38ab9949b..07f1da8f9a5 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SagesRowDenizen.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SagesRowDenizen.java @@ -68,7 +68,7 @@ public class SagesRowDenizen extends CardImpl { // Whenever another blue creature enters the battlefield under your control, target player puts the top two cards of his or her library into his or her graveyard. Ability ability = new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(2), filter, false, null, true); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/ShadowAlleyDenizen.java b/Mage.Sets/src/mage/sets/gatecrash/ShadowAlleyDenizen.java index f13a24b887a..c161fb3908a 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ShadowAlleyDenizen.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ShadowAlleyDenizen.java @@ -73,7 +73,7 @@ public class ShadowAlleyDenizen extends CardImpl { Zone.BATTLEFIELD, new GainAbilityTargetEffect(IntimidateAbility.getInstance(), Duration.EndOfTurn), filter, false, null, true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/ShadowSlice.java b/Mage.Sets/src/mage/sets/gatecrash/ShadowSlice.java index 8adbfa7f3ea..ae14a089955 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ShadowSlice.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ShadowSlice.java @@ -49,7 +49,7 @@ public class ShadowSlice extends CardImpl { // Target Opponent loses 3 life. this.getSpellAbility().addEffect(new LoseLifeTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); // Cipher (Then you may exilce this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.) this.getSpellAbility().addEffect(new CipherEffect()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/ShieldedPassage.java b/Mage.Sets/src/mage/sets/gatecrash/ShieldedPassage.java index 83d3af44415..af9f8e6f207 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ShieldedPassage.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ShieldedPassage.java @@ -49,7 +49,7 @@ public class ShieldedPassage extends CardImpl { // Prevent all damage that would be dealt to target creature this turn. this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, Integer.MAX_VALUE)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public ShieldedPassage(final ShieldedPassage card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/SimicCharm.java b/Mage.Sets/src/mage/sets/gatecrash/SimicCharm.java index 5023aead001..51fc4f2506f 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SimicCharm.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SimicCharm.java @@ -56,7 +56,7 @@ public class SimicCharm extends CardImpl { //Choose one - Target creature gets +3/+3 until end of turn this.getSpellAbility().addEffect(new BoostTargetEffect(3, 3, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); //permanents you control gain hexproof until end of turn Mode mode = new Mode(); mode.getEffects().add(new GainAbilityAllEffect(HexproofAbility.getInstance(), Duration.EndOfTurn, new FilterControlledPermanent())); @@ -64,7 +64,7 @@ public class SimicCharm extends CardImpl { //return target creature to its owner's hand. Mode mode2 = new Mode(); mode2.getEffects().add(new ReturnToHandTargetEffect()); - mode2.getTargets().add(new TargetCreaturePermanent(true)); + mode2.getTargets().add(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode2); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/SimicFluxmage.java b/Mage.Sets/src/mage/sets/gatecrash/SimicFluxmage.java index 5c7445995c1..30a2a485cbd 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SimicFluxmage.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SimicFluxmage.java @@ -68,7 +68,7 @@ public class SimicFluxmage extends CardImpl { // 1{U}, {T}: Move a +1/+1 counter from Simic Fluxmage onto target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MoveCounterFromSourceToTargetEffect(),new ManaCostsImpl("{1}{U}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/SimicManipulator.java b/Mage.Sets/src/mage/sets/gatecrash/SimicManipulator.java index 3e47e930bd0..d0821c1b35e 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SimicManipulator.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SimicManipulator.java @@ -83,7 +83,7 @@ public class SimicManipulator extends CardImpl { // TODO: Improve targeting, that only valid targets (power <= removed counters) can be choosen // Disadvantage now is, that a creature can be targeted that couldn't be targeted by rules. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SimicManipulatorGainControlTargetEffect(Duration.Custom), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); ability.addCost(new RemoveVariableCountersSourceCost(CounterType.P1P1.createInstance(),1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/Skullcrack.java b/Mage.Sets/src/mage/sets/gatecrash/Skullcrack.java index ed7d36a1081..73107dbed87 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Skullcrack.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Skullcrack.java @@ -58,7 +58,7 @@ public class Skullcrack extends CardImpl { this.getSpellAbility().addEffect(new CantGainLifeAllEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new DamageCantBePreventedEffect()); this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/Skygames.java b/Mage.Sets/src/mage/sets/gatecrash/Skygames.java index a7b3e80a60e..772fe792470 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Skygames.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Skygames.java @@ -66,7 +66,7 @@ public class Skygames extends CardImpl { // Enchanted land has "{tap}: Target creature gains flying until end of turn. Activate this ability only any time you could cast a sorcery." Ability gainAbility = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); - gainAbility.addTarget(new TargetCreaturePermanent(true)); + gainAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{T}: Target creature gains flying until end of turn. Activate this ability only any time you could cast a sorcery.\""))); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/SoulRansom.java b/Mage.Sets/src/mage/sets/gatecrash/SoulRansom.java index 1ad141c31c7..5e9be79dcfa 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/SoulRansom.java +++ b/Mage.Sets/src/mage/sets/gatecrash/SoulRansom.java @@ -61,7 +61,7 @@ public class SoulRansom extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/StolenIdentity.java b/Mage.Sets/src/mage/sets/gatecrash/StolenIdentity.java index 019fc87ac02..cf73dbbc5f7 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/StolenIdentity.java +++ b/Mage.Sets/src/mage/sets/gatecrash/StolenIdentity.java @@ -65,7 +65,7 @@ public class StolenIdentity extends CardImpl { // Put a token onto the battlefield that's a copy of target artifact or creature. this.getSpellAbility().addEffect(new StolenIdentityEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); // Cipher this.getSpellAbility().addEffect(new CipherEffect()); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/StructuralCollapse.java b/Mage.Sets/src/mage/sets/gatecrash/StructuralCollapse.java index b4e1969e0b5..b2f41caf80a 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/StructuralCollapse.java +++ b/Mage.Sets/src/mage/sets/gatecrash/StructuralCollapse.java @@ -53,7 +53,7 @@ public class StructuralCollapse extends CardImpl { this.getSpellAbility().addEffect(new SacrificeEffect(new FilterArtifactPermanent(), 1, "Target player")); this.getSpellAbility().addEffect(new SacrificeEffect(new FilterLandPermanent(), 1, "Target player")); this.getSpellAbility().addEffect(new DamageTargetEffect(2)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public StructuralCollapse(final StructuralCollapse card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/UndercityInformer.java b/Mage.Sets/src/mage/sets/gatecrash/UndercityInformer.java index 122e852b5c2..190c41f7d8c 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/UndercityInformer.java +++ b/Mage.Sets/src/mage/sets/gatecrash/UndercityInformer.java @@ -68,8 +68,8 @@ public class UndercityInformer extends CardImpl { //{1}, Sacrifice a creature: Target player reveals the top card of his or her library until he or she reveals a land card, then puts those cards into his or her graveyard. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UndercityInformerEffect(), new ManaCostsImpl("{1}")); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); - ability.addTarget(new TargetPlayer(true)); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/UndercityPlague.java b/Mage.Sets/src/mage/sets/gatecrash/UndercityPlague.java index 21cbd4e0776..638a5926982 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/UndercityPlague.java +++ b/Mage.Sets/src/mage/sets/gatecrash/UndercityPlague.java @@ -51,7 +51,7 @@ public class UndercityPlague extends CardImpl { this.color.setBlack(true); // Target player loses 1 life, discards a card, then sacrifices a permanent. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new LoseLifeTargetEffect(1)); this.getSpellAbility().addEffect(new DiscardTargetEffect(1)); this.getSpellAbility().addEffect(new SacrificeEffect(new FilterPermanent(),1,"then that player")); diff --git a/Mage.Sets/src/mage/sets/gatecrash/VizkopaConfessor.java b/Mage.Sets/src/mage/sets/gatecrash/VizkopaConfessor.java index 3b10ff3ff10..4b10ecea937 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/VizkopaConfessor.java +++ b/Mage.Sets/src/mage/sets/gatecrash/VizkopaConfessor.java @@ -69,7 +69,7 @@ public class VizkopaConfessor extends CardImpl { // When Vizkopa Confessor enters the battlefield, pay any amount of life. Target opponent reveals that many cards from his or her hand. You choose one of them and exile it. Ability ability = new EntersBattlefieldTriggeredAbility(new VizkopaConfessorEffect()); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/VizkopaGuildmage.java b/Mage.Sets/src/mage/sets/gatecrash/VizkopaGuildmage.java index 51f8e7b1cc9..68c10c7fd04 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/VizkopaGuildmage.java +++ b/Mage.Sets/src/mage/sets/gatecrash/VizkopaGuildmage.java @@ -80,7 +80,7 @@ public class VizkopaGuildmage extends CardImpl { // 1{W}{B}: Target creature gains lifelink until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn),new ManaCostsImpl("{1}{W}{B}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // 1{W}{B}: Whenever you gain life this turn, each opponent loses that much life. diff --git a/Mage.Sets/src/mage/sets/gatecrash/Voidwalk.java b/Mage.Sets/src/mage/sets/gatecrash/Voidwalk.java index 44b55c9652d..aa0b2dda211 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/Voidwalk.java +++ b/Mage.Sets/src/mage/sets/gatecrash/Voidwalk.java @@ -58,7 +58,7 @@ public class Voidwalk extends CardImpl { // Exile target creature. Return it to the battlefield under its owner's control at the beginning of the next end step. this.getSpellAbility().addEffect(new VoidwalkEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Cipher this.getSpellAbility().addEffect(new CipherEffect()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/WayOfTheThief.java b/Mage.Sets/src/mage/sets/gatecrash/WayOfTheThief.java index 542587d4edf..cfd9f8fa541 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/WayOfTheThief.java +++ b/Mage.Sets/src/mage/sets/gatecrash/WayOfTheThief.java @@ -71,7 +71,7 @@ public class WayOfTheThief extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/gatecrash/ZameckGuildmage.java b/Mage.Sets/src/mage/sets/gatecrash/ZameckGuildmage.java index d804fbf9c20..43b052b865f 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ZameckGuildmage.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ZameckGuildmage.java @@ -77,7 +77,7 @@ public class ZameckGuildmage extends CardImpl { // {G}{U}, Remove a +1/+1 counter from a creature you control: Draw a card. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{G}{U}")); - ability.addCost(new RemoveCounterCost(new TargetControlledCreaturePermanent(true), CounterType.P1P1)); + ability.addCost(new RemoveCounterCost(new TargetControlledCreaturePermanent(), CounterType.P1P1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/guildpact/AngelOfDespair.java b/Mage.Sets/src/mage/sets/guildpact/AngelOfDespair.java index 2f572c17d0e..a3653d86276 100644 --- a/Mage.Sets/src/mage/sets/guildpact/AngelOfDespair.java +++ b/Mage.Sets/src/mage/sets/guildpact/AngelOfDespair.java @@ -55,7 +55,7 @@ public class AngelOfDespair extends CardImpl { this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect()); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/guildpact/BlindHunter.java b/Mage.Sets/src/mage/sets/guildpact/BlindHunter.java index 5cc8780729b..8202051cf59 100644 --- a/Mage.Sets/src/mage/sets/guildpact/BlindHunter.java +++ b/Mage.Sets/src/mage/sets/guildpact/BlindHunter.java @@ -60,7 +60,7 @@ public class BlindHunter extends CardImpl { // Haunt // When Blind Hunter enters the battlefield or the creature it haunts dies, target player loses 2 life and you gain 2 life. Ability ability = new HauntAbility(this, new LoseLifeTargetEffect(2)); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); ability.addEffect(new GainLifeEffect(2)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/guildpact/BurningTreeShaman.java b/Mage.Sets/src/mage/sets/guildpact/BurningTreeShaman.java index 966a9605b32..9460451c3c4 100644 --- a/Mage.Sets/src/mage/sets/guildpact/BurningTreeShaman.java +++ b/Mage.Sets/src/mage/sets/guildpact/BurningTreeShaman.java @@ -74,7 +74,7 @@ public class BurningTreeShaman extends CardImpl { class BurningTreeShamanTriggeredAbility extends TriggeredAbilityImpl { BurningTreeShamanTriggeredAbility() { super(Zone.BATTLEFIELD, new DamageTargetEffect(1)); - this.addTarget(new TargetPlayer(true)); + this.addTarget(new TargetPlayer()); } BurningTreeShamanTriggeredAbility(final BurningTreeShamanTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/guildpact/DouseInGloom.java b/Mage.Sets/src/mage/sets/guildpact/DouseInGloom.java index cdf960c202d..60148914eba 100644 --- a/Mage.Sets/src/mage/sets/guildpact/DouseInGloom.java +++ b/Mage.Sets/src/mage/sets/guildpact/DouseInGloom.java @@ -46,7 +46,7 @@ public class DouseInGloom extends CardImpl { this.expansionSetCode = "GPT"; this.color.setBlack(true); this.getSpellAbility().addEffect(new DamageTargetEffect(2)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new GainLifeEffect(2)); } diff --git a/Mage.Sets/src/mage/sets/guildpact/DrownedRusalka.java b/Mage.Sets/src/mage/sets/guildpact/DrownedRusalka.java index 955cc116a34..9ad39f92d0c 100644 --- a/Mage.Sets/src/mage/sets/guildpact/DrownedRusalka.java +++ b/Mage.Sets/src/mage/sets/guildpact/DrownedRusalka.java @@ -59,7 +59,7 @@ public class DrownedRusalka extends CardImpl { // {U}, Sacrifice a creature: Discard a card, then draw a card. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardControllerEffect(1), new ManaCostsImpl("{U}")); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1, new FilterControlledCreaturePermanent("a creature"), true, true))); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1, new FilterControlledCreaturePermanent("a creature"), true))); ability.addEffect(new DrawCardSourceControllerEffect(1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/guildpact/GhostCouncilOfOrzhova.java b/Mage.Sets/src/mage/sets/guildpact/GhostCouncilOfOrzhova.java index c32b971eda8..cc25f76cc43 100644 --- a/Mage.Sets/src/mage/sets/guildpact/GhostCouncilOfOrzhova.java +++ b/Mage.Sets/src/mage/sets/guildpact/GhostCouncilOfOrzhova.java @@ -67,12 +67,12 @@ public class GhostCouncilOfOrzhova extends CardImpl { // When Ghost Council of Orzhova enters the battlefield, target opponent loses 1 life and you gain 1 life. Ability ability = new EntersBattlefieldTriggeredAbility(new GhostCouncilOfOrzhovaEffect()); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); // {1}, Sacrifice a creature: Exile Ghost Council of Orzhova. Return it to the battlefield under its owner's control at the beginning of the next end step. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GhostCouncilOfOrzhovaRemovingEffect(), new GenericManaCost(1)); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/guildpact/Gigadrowse.java b/Mage.Sets/src/mage/sets/guildpact/Gigadrowse.java index 306ad41889c..effc23d09bb 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Gigadrowse.java +++ b/Mage.Sets/src/mage/sets/guildpact/Gigadrowse.java @@ -54,7 +54,7 @@ public class Gigadrowse extends CardImpl { this.addAbility(new ReplicateAbility(this, "{U}")); // Tap target permanent. this.getSpellAbility().addEffect(new TapTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(true)); + this.getSpellAbility().addTarget(new TargetPermanent()); } public Gigadrowse(final Gigadrowse card) { diff --git a/Mage.Sets/src/mage/sets/guildpact/GruulGuildmage.java b/Mage.Sets/src/mage/sets/guildpact/GruulGuildmage.java index 9ff745614a6..f9e60cd509c 100644 --- a/Mage.Sets/src/mage/sets/guildpact/GruulGuildmage.java +++ b/Mage.Sets/src/mage/sets/guildpact/GruulGuildmage.java @@ -71,7 +71,7 @@ public class GruulGuildmage extends CardImpl { this.addAbility(firstAbility); // {3}{G}: Target creature gets +2/+2 until end of turn. Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("{3}{G}")); - secondAbility.addTarget(new TargetCreaturePermanent(true)); + secondAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/sets/guildpact/HarrierGriffin.java b/Mage.Sets/src/mage/sets/guildpact/HarrierGriffin.java index c49091d54f8..8473c0bfc5d 100644 --- a/Mage.Sets/src/mage/sets/guildpact/HarrierGriffin.java +++ b/Mage.Sets/src/mage/sets/guildpact/HarrierGriffin.java @@ -55,7 +55,7 @@ public class HarrierGriffin extends CardImpl { this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); Ability ability = new BeginningOfUpkeepTriggeredAbility(new TapTargetEffect(), TargetController.YOU, false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/guildpact/HypervoltGrasp.java b/Mage.Sets/src/mage/sets/guildpact/HypervoltGrasp.java index cbb3265b1bc..c23a7b35111 100644 --- a/Mage.Sets/src/mage/sets/guildpact/HypervoltGrasp.java +++ b/Mage.Sets/src/mage/sets/guildpact/HypervoltGrasp.java @@ -56,7 +56,7 @@ public class HypervoltGrasp extends CardImpl { this.expansionSetCode = "GPT"; this.subtype.add("Aura"); this.color.setRed(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/guildpact/InfiltratorsMagemark.java b/Mage.Sets/src/mage/sets/guildpact/InfiltratorsMagemark.java index d8cca61a40e..aa40a7f5291 100644 --- a/Mage.Sets/src/mage/sets/guildpact/InfiltratorsMagemark.java +++ b/Mage.Sets/src/mage/sets/guildpact/InfiltratorsMagemark.java @@ -72,7 +72,7 @@ public class InfiltratorsMagemark extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/guildpact/LeapOfFlame.java b/Mage.Sets/src/mage/sets/guildpact/LeapOfFlame.java index 3698e68c39c..588cc181da8 100644 --- a/Mage.Sets/src/mage/sets/guildpact/LeapOfFlame.java +++ b/Mage.Sets/src/mage/sets/guildpact/LeapOfFlame.java @@ -56,7 +56,7 @@ public class LeapOfFlame extends CardImpl { // Replicate {U}{R} this.addAbility(new ReplicateAbility(this, "{U}{R}")); // Target creature gets +1/+0 and gains flying and first strike until end of turn. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); Effect effect = new BoostTargetEffect(1,0,Duration.EndOfTurn); effect.setText("Target creature gets +1/+0"); this.getSpellAbility().addEffect(effect); diff --git a/Mage.Sets/src/mage/sets/guildpact/Mortify.java b/Mage.Sets/src/mage/sets/guildpact/Mortify.java index f34c79b1352..fe1a72d7ee7 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Mortify.java +++ b/Mage.Sets/src/mage/sets/guildpact/Mortify.java @@ -56,7 +56,7 @@ public class Mortify extends CardImpl { this.color.setBlack(true); this.color.setWhite(true); this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); } public Mortify(final Mortify card) { diff --git a/Mage.Sets/src/mage/sets/guildpact/OrzhovEuthanist.java b/Mage.Sets/src/mage/sets/guildpact/OrzhovEuthanist.java index 15d4899c031..37659712bf1 100644 --- a/Mage.Sets/src/mage/sets/guildpact/OrzhovEuthanist.java +++ b/Mage.Sets/src/mage/sets/guildpact/OrzhovEuthanist.java @@ -64,7 +64,7 @@ public class OrzhovEuthanist extends CardImpl { // Haunt // When Orzhov Euthanist enters the battlefield or the creature it haunts dies, destroy target creature that was dealt damage this turn. Ability ability = new HauntAbility(this, new DestroyTargetEffect()); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/guildpact/OstiaryThrull.java b/Mage.Sets/src/mage/sets/guildpact/OstiaryThrull.java index 70664bd4f58..1c79543004d 100644 --- a/Mage.Sets/src/mage/sets/guildpact/OstiaryThrull.java +++ b/Mage.Sets/src/mage/sets/guildpact/OstiaryThrull.java @@ -57,7 +57,7 @@ public class OstiaryThrull extends CardImpl { this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/guildpact/PilloryOfTheSleepless.java b/Mage.Sets/src/mage/sets/guildpact/PilloryOfTheSleepless.java index 67edb55e3b9..c8b0c6d1b9d 100644 --- a/Mage.Sets/src/mage/sets/guildpact/PilloryOfTheSleepless.java +++ b/Mage.Sets/src/mage/sets/guildpact/PilloryOfTheSleepless.java @@ -60,7 +60,7 @@ public class PilloryOfTheSleepless extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Removal)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/guildpact/PlaguedRusalka.java b/Mage.Sets/src/mage/sets/guildpact/PlaguedRusalka.java index 2e33a943260..959dbae029d 100644 --- a/Mage.Sets/src/mage/sets/guildpact/PlaguedRusalka.java +++ b/Mage.Sets/src/mage/sets/guildpact/PlaguedRusalka.java @@ -54,8 +54,8 @@ public class PlaguedRusalka extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/guildpact/Pyromatics.java b/Mage.Sets/src/mage/sets/guildpact/Pyromatics.java index 22cd21986e6..3616e1abee7 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Pyromatics.java +++ b/Mage.Sets/src/mage/sets/guildpact/Pyromatics.java @@ -51,7 +51,7 @@ public class Pyromatics extends CardImpl { this.addAbility(new ReplicateAbility(this, "{1}{R}")); // Pyromatics deals 1 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); } diff --git a/Mage.Sets/src/mage/sets/guildpact/RestlessBones.java b/Mage.Sets/src/mage/sets/guildpact/RestlessBones.java index 6514184859d..7e818ad9fba 100644 --- a/Mage.Sets/src/mage/sets/guildpact/RestlessBones.java +++ b/Mage.Sets/src/mage/sets/guildpact/RestlessBones.java @@ -59,7 +59,7 @@ public class RestlessBones extends CardImpl { this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new SwampwalkAbility(), Duration.EndOfTurn), new ManaCostsImpl("{3}{B}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}"))); } diff --git a/Mage.Sets/src/mage/sets/guildpact/ScorchedRusalka.java b/Mage.Sets/src/mage/sets/guildpact/ScorchedRusalka.java index 286ffea472c..63d5435624f 100644 --- a/Mage.Sets/src/mage/sets/guildpact/ScorchedRusalka.java +++ b/Mage.Sets/src/mage/sets/guildpact/ScorchedRusalka.java @@ -57,8 +57,8 @@ public class ScorchedRusalka extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ColoredManaCost(ColoredManaSymbol.R)); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); - ability.addTarget(new TargetPlayer(true)); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/guildpact/ShadowLance.java b/Mage.Sets/src/mage/sets/guildpact/ShadowLance.java index 1f3f561fbb7..db44aa60191 100644 --- a/Mage.Sets/src/mage/sets/guildpact/ShadowLance.java +++ b/Mage.Sets/src/mage/sets/guildpact/ShadowLance.java @@ -56,7 +56,7 @@ public class ShadowLance extends CardImpl { this.color.setWhite(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/guildpact/SiegeOfTowers.java b/Mage.Sets/src/mage/sets/guildpact/SiegeOfTowers.java index 92f047bb02e..820df95abc2 100644 --- a/Mage.Sets/src/mage/sets/guildpact/SiegeOfTowers.java +++ b/Mage.Sets/src/mage/sets/guildpact/SiegeOfTowers.java @@ -65,7 +65,7 @@ public class SiegeOfTowers extends CardImpl { Effect effect = new BecomesCreatureTargetEffect(new SiegeOfTowersToken(), "land", Duration.EndOfGame); effect.setText("Target Mountain becomes a 3/1 creature. It's still a land"); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); } diff --git a/Mage.Sets/src/mage/sets/guildpact/SkarrgTheRagePits.java b/Mage.Sets/src/mage/sets/guildpact/SkarrgTheRagePits.java index 172f6eadee2..d36e6294ed7 100644 --- a/Mage.Sets/src/mage/sets/guildpact/SkarrgTheRagePits.java +++ b/Mage.Sets/src/mage/sets/guildpact/SkarrgTheRagePits.java @@ -57,7 +57,7 @@ public class SkarrgTheRagePits extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{R}{G}")); ability.addCost(new TapSourceCost()); ability.addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/guildpact/StarvedRusalka.java b/Mage.Sets/src/mage/sets/guildpact/StarvedRusalka.java index 09c9d3d90b1..d6373eb8d37 100644 --- a/Mage.Sets/src/mage/sets/guildpact/StarvedRusalka.java +++ b/Mage.Sets/src/mage/sets/guildpact/StarvedRusalka.java @@ -56,7 +56,7 @@ public class StarvedRusalka extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new ColoredManaCost(ColoredManaSymbol.G)); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/guildpact/TiborAndLumia.java b/Mage.Sets/src/mage/sets/guildpact/TiborAndLumia.java index 8d9dd957e1d..9b7cc751073 100644 --- a/Mage.Sets/src/mage/sets/guildpact/TiborAndLumia.java +++ b/Mage.Sets/src/mage/sets/guildpact/TiborAndLumia.java @@ -74,7 +74,7 @@ public class TiborAndLumia extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); Ability firstAbility = new SpellCastControllerTriggeredAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), filterBlue, false); - firstAbility.addTarget(new TargetCreaturePermanent(true)); + firstAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(firstAbility); this.addAbility(new SpellCastControllerTriggeredAbility(new DamageAllEffect(1, filter), filterRed, false)); diff --git a/Mage.Sets/src/mage/sets/guildpact/TinStreetHooligan.java b/Mage.Sets/src/mage/sets/guildpact/TinStreetHooligan.java index 61e531adbc3..90434468cb3 100644 --- a/Mage.Sets/src/mage/sets/guildpact/TinStreetHooligan.java +++ b/Mage.Sets/src/mage/sets/guildpact/TinStreetHooligan.java @@ -59,7 +59,7 @@ public class TinStreetHooligan extends CardImpl { // When Tin Street Hooligan enters the battlefield, if {G} was spent to cast Tin Street Hooligan, destroy target artifact. Ability ability = new EntersBattlefieldTriggeredAbility(new ConditionalOneShotEffect(new DestroyTargetEffect(), new ManaWasSpentCondition(ColoredManaSymbol.G), "if {G} was spent to cast {this}, destroy target artifact"), false); - ability.addTarget(new TargetArtifactPermanent(true)); + ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/guildpact/Vacuumelt.java b/Mage.Sets/src/mage/sets/guildpact/Vacuumelt.java index 214c1c8df5a..d02dcb85d4e 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Vacuumelt.java +++ b/Mage.Sets/src/mage/sets/guildpact/Vacuumelt.java @@ -50,7 +50,7 @@ public class Vacuumelt extends CardImpl { // Replicate {2}{U} this.addAbility(new ReplicateAbility(this, "{2}{U}")); // Return target creature to its owner's hand. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/guildpact/Wildsize.java b/Mage.Sets/src/mage/sets/guildpact/Wildsize.java index a1edcbb805b..6cfa1f14dca 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Wildsize.java +++ b/Mage.Sets/src/mage/sets/guildpact/Wildsize.java @@ -51,7 +51,7 @@ public class Wildsize extends CardImpl { this.color.setGreen(true); this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/guildpact/WreakHavoc.java b/Mage.Sets/src/mage/sets/guildpact/WreakHavoc.java index 5c6f594e71f..718e56db204 100644 --- a/Mage.Sets/src/mage/sets/guildpact/WreakHavoc.java +++ b/Mage.Sets/src/mage/sets/guildpact/WreakHavoc.java @@ -59,7 +59,7 @@ public class WreakHavoc extends CardImpl { this.color.setGreen(true); this.addAbility(new CantCounterAbility()); this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); } public WreakHavoc(final WreakHavoc card) { diff --git a/Mage.Sets/src/mage/sets/guildpact/WurmweaverCoil.java b/Mage.Sets/src/mage/sets/guildpact/WurmweaverCoil.java index f4cf438113a..a2cfecfd7e0 100644 --- a/Mage.Sets/src/mage/sets/guildpact/WurmweaverCoil.java +++ b/Mage.Sets/src/mage/sets/guildpact/WurmweaverCoil.java @@ -65,7 +65,7 @@ public class WurmweaverCoil extends CardImpl { this.expansionSetCode = "GPT"; this.subtype.add("Aura"); this.color.setGreen(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(filter, true); + TargetPermanent auraTarget = new TargetCreaturePermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/ShowerOfSparks.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/ShowerOfSparks.java index 8cd8c2b841a..d55429c021a 100644 --- a/Mage.Sets/src/mage/sets/heroesvsmonsters/ShowerOfSparks.java +++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/ShowerOfSparks.java @@ -51,13 +51,13 @@ public class ShowerOfSparks extends CardImpl { // Shower of Sparks deals 1 damage to target creature and 1 damage to target player. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); Effect effect = new DamageTargetEffect(1); effect.setTargetPointer(new SecondTargetPointer()); effect.setText("and 1 damage to target player"); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public ShowerOfSparks(final ShowerOfSparks card) { diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/SkarrganSkybreaker.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/SkarrganSkybreaker.java index ed5a6099c54..19833abdaa4 100644 --- a/Mage.Sets/src/mage/sets/heroesvsmonsters/SkarrganSkybreaker.java +++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/SkarrganSkybreaker.java @@ -64,7 +64,7 @@ public class SkarrganSkybreaker extends CardImpl { // {1}, Sacrifice Skarrgan Skybreaker: Skarrgan Skybreaker deals damage equal to its power to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new SourcePermanentPowerCount()), new GenericManaCost(1)); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer(true)); + ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/UndyingRage.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/UndyingRage.java index a696fb575e4..ad8e784d2a3 100644 --- a/Mage.Sets/src/mage/sets/heroesvsmonsters/UndyingRage.java +++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/UndyingRage.java @@ -61,7 +61,7 @@ public class UndyingRage extends CardImpl { this.color.setRed(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/homelands/FeastOfTheUnicorn.java b/Mage.Sets/src/mage/sets/homelands/FeastOfTheUnicorn.java index 9d1d4b64269..660dd39680b 100644 --- a/Mage.Sets/src/mage/sets/homelands/FeastOfTheUnicorn.java +++ b/Mage.Sets/src/mage/sets/homelands/FeastOfTheUnicorn.java @@ -56,7 +56,7 @@ public class FeastOfTheUnicorn extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/homelands/Forget.java b/Mage.Sets/src/mage/sets/homelands/Forget.java index 61d1c889032..fadef6df16a 100644 --- a/Mage.Sets/src/mage/sets/homelands/Forget.java +++ b/Mage.Sets/src/mage/sets/homelands/Forget.java @@ -52,7 +52,7 @@ public class Forget extends CardImpl { // Target player discards two cards, then draws as many cards as he or she discarded this way. this.getSpellAbility().addEffect(new ForgetEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public Forget(final Forget card) { diff --git a/Mage.Sets/src/mage/sets/homelands/SerratedArrows.java b/Mage.Sets/src/mage/sets/homelands/SerratedArrows.java index 0224dd72ddf..be8f776102a 100644 --- a/Mage.Sets/src/mage/sets/homelands/SerratedArrows.java +++ b/Mage.Sets/src/mage/sets/homelands/SerratedArrows.java @@ -71,7 +71,7 @@ public class SerratedArrows extends CardImpl { new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.ARROWHEAD.createInstance())); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/homelands/Torture.java b/Mage.Sets/src/mage/sets/homelands/Torture.java index 53d5af7c9a5..846bf093470 100644 --- a/Mage.Sets/src/mage/sets/homelands/Torture.java +++ b/Mage.Sets/src/mage/sets/homelands/Torture.java @@ -60,7 +60,7 @@ public class Torture extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/iceage/CentaurArcher.java b/Mage.Sets/src/mage/sets/iceage/CentaurArcher.java index e0ae5668488..b9d860c90b1 100644 --- a/Mage.Sets/src/mage/sets/iceage/CentaurArcher.java +++ b/Mage.Sets/src/mage/sets/iceage/CentaurArcher.java @@ -67,7 +67,7 @@ public class CentaurArcher extends CardImpl { // {tap}: Centaur Archer deals 1 damage to target creature with flying. Ability activatedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - activatedAbility.addTarget(new TargetCreaturePermanent(filter, true)); + activatedAbility.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(activatedAbility); } diff --git a/Mage.Sets/src/mage/sets/iceage/ElderDruid.java b/Mage.Sets/src/mage/sets/iceage/ElderDruid.java index 118b8f18c37..a9e95f383cd 100644 --- a/Mage.Sets/src/mage/sets/iceage/ElderDruid.java +++ b/Mage.Sets/src/mage/sets/iceage/ElderDruid.java @@ -72,7 +72,7 @@ public class ElderDruid extends CardImpl { // {3}{G}, {tap}: You may tap or untap target artifact, creature, or land. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new ManaCostsImpl("{3}{G}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/iceage/FieryJustice.java b/Mage.Sets/src/mage/sets/iceage/FieryJustice.java index 328ecba21df..11eca0a68cb 100644 --- a/Mage.Sets/src/mage/sets/iceage/FieryJustice.java +++ b/Mage.Sets/src/mage/sets/iceage/FieryJustice.java @@ -59,7 +59,7 @@ public class FieryJustice extends CardImpl { effect.setTargetPointer(new SecondTargetPointer()); effect.setText("Target opponent gains 5 life"); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); } public FieryJustice(final FieryJustice card) { diff --git a/Mage.Sets/src/mage/sets/iceage/FyndhornBrownie.java b/Mage.Sets/src/mage/sets/iceage/FyndhornBrownie.java index 5ab63bda5e5..817e025db0d 100644 --- a/Mage.Sets/src/mage/sets/iceage/FyndhornBrownie.java +++ b/Mage.Sets/src/mage/sets/iceage/FyndhornBrownie.java @@ -58,7 +58,7 @@ public class FyndhornBrownie extends CardImpl { // {2}{G}, {tap}: Untap target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl("{2}{G}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/iceage/ImposingVisage.java b/Mage.Sets/src/mage/sets/iceage/ImposingVisage.java index e3763d13c0a..215e3eb740d 100644 --- a/Mage.Sets/src/mage/sets/iceage/ImposingVisage.java +++ b/Mage.Sets/src/mage/sets/iceage/ImposingVisage.java @@ -55,7 +55,7 @@ public class ImposingVisage extends CardImpl { this.color.setRed(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/iceage/LeshracsRite.java b/Mage.Sets/src/mage/sets/iceage/LeshracsRite.java index 26c7a4c9357..fab0b23e45f 100644 --- a/Mage.Sets/src/mage/sets/iceage/LeshracsRite.java +++ b/Mage.Sets/src/mage/sets/iceage/LeshracsRite.java @@ -57,7 +57,7 @@ public class LeshracsRite extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/iceage/MindWarp.java b/Mage.Sets/src/mage/sets/iceage/MindWarp.java index ceb04877f3f..444d4d5a5b3 100644 --- a/Mage.Sets/src/mage/sets/iceage/MindWarp.java +++ b/Mage.Sets/src/mage/sets/iceage/MindWarp.java @@ -50,7 +50,7 @@ public class MindWarp extends CardImpl { // Look at target player's hand and choose X cards from it. That player discards those cards. this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(new ManacostVariableValue(), TargetController.ANY)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public MindWarp(final MindWarp card) { diff --git a/Mage.Sets/src/mage/sets/iceage/Pyroblast.java b/Mage.Sets/src/mage/sets/iceage/Pyroblast.java index 5fd277af37b..7f883f9a43c 100644 --- a/Mage.Sets/src/mage/sets/iceage/Pyroblast.java +++ b/Mage.Sets/src/mage/sets/iceage/Pyroblast.java @@ -58,7 +58,7 @@ public class Pyroblast extends CardImpl { Mode mode = new Mode(); mode.getEffects().add(new DestroyTargetEffect()); - mode.getTargets().add(new TargetPermanent(true)); + mode.getTargets().add(new TargetPermanent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/sets/iceage/Regeneration.java b/Mage.Sets/src/mage/sets/iceage/Regeneration.java index ef2621b382f..612e6b964e6 100644 --- a/Mage.Sets/src/mage/sets/iceage/Regeneration.java +++ b/Mage.Sets/src/mage/sets/iceage/Regeneration.java @@ -54,7 +54,7 @@ public class Regeneration extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/iceage/SkullCatapult.java b/Mage.Sets/src/mage/sets/iceage/SkullCatapult.java index d5e4ce177bb..4601d6c3748 100644 --- a/Mage.Sets/src/mage/sets/iceage/SkullCatapult.java +++ b/Mage.Sets/src/mage/sets/iceage/SkullCatapult.java @@ -54,7 +54,7 @@ public class SkullCatapult extends CardImpl { // {1}, {tap}, Sacrifice a creature: Skull Catapult deals 2 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/iceage/TinderWall.java b/Mage.Sets/src/mage/sets/iceage/TinderWall.java index 6321166be76..bfeed21e545 100644 --- a/Mage.Sets/src/mage/sets/iceage/TinderWall.java +++ b/Mage.Sets/src/mage/sets/iceage/TinderWall.java @@ -78,7 +78,7 @@ public class TinderWall extends CardImpl { FilterAttackingCreature filter = new FilterAttackingCreature("creature it's blocking"); filter.add(new BlockingByPredicate(this.getId())); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{R}")); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/iceage/Vertigo.java b/Mage.Sets/src/mage/sets/iceage/Vertigo.java index 70e21a29ccd..cd6c0a80158 100644 --- a/Mage.Sets/src/mage/sets/iceage/Vertigo.java +++ b/Mage.Sets/src/mage/sets/iceage/Vertigo.java @@ -60,7 +60,7 @@ public class Vertigo extends CardImpl { // Vertigo deals 2 damage to target creature with flying. That creature loses flying until end of turn. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellAbility().addEffect(new LoseAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); } public Vertigo(final Vertigo card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/AltarsReap.java b/Mage.Sets/src/mage/sets/innistrad/AltarsReap.java index f2a552af1de..0f42bae13df 100644 --- a/Mage.Sets/src/mage/sets/innistrad/AltarsReap.java +++ b/Mage.Sets/src/mage/sets/innistrad/AltarsReap.java @@ -48,7 +48,7 @@ public class AltarsReap extends CardImpl { this.color.setBlack(true); // As an additional cost to cast Altar's Reap, sacrifice a creature. - this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); // Draw two cards. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(2)); } diff --git a/Mage.Sets/src/mage/sets/innistrad/AncientGrudge.java b/Mage.Sets/src/mage/sets/innistrad/AncientGrudge.java index 310589027db..96aadf31d6a 100644 --- a/Mage.Sets/src/mage/sets/innistrad/AncientGrudge.java +++ b/Mage.Sets/src/mage/sets/innistrad/AncientGrudge.java @@ -59,7 +59,7 @@ public class AncientGrudge extends CardImpl { // Destroy target artifact. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); // Flashback {G} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{G}"), TimingRule.INSTANT)); diff --git a/Mage.Sets/src/mage/sets/innistrad/AvacynianPriest.java b/Mage.Sets/src/mage/sets/innistrad/AvacynianPriest.java index 74519862d91..770a20dae02 100644 --- a/Mage.Sets/src/mage/sets/innistrad/AvacynianPriest.java +++ b/Mage.Sets/src/mage/sets/innistrad/AvacynianPriest.java @@ -68,7 +68,7 @@ public class AvacynianPriest extends CardImpl { // {1}, {T}: Tap target non-Human creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/BitterheartWitch.java b/Mage.Sets/src/mage/sets/innistrad/BitterheartWitch.java index bca11e25e18..b6ae9610e01 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BitterheartWitch.java +++ b/Mage.Sets/src/mage/sets/innistrad/BitterheartWitch.java @@ -67,7 +67,7 @@ public class BitterheartWitch extends CardImpl { // When Bitterheart Witch dies, you may search your library for a Curse card, put it onto the battlefield attached to target player, then shuffle your library. Ability ability = new DiesTriggeredAbility(new BitterheartWitchEffect(), true); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/BloodgiftDemon.java b/Mage.Sets/src/mage/sets/innistrad/BloodgiftDemon.java index d106b524fbd..deb900e3cff 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BloodgiftDemon.java +++ b/Mage.Sets/src/mage/sets/innistrad/BloodgiftDemon.java @@ -60,7 +60,7 @@ public class BloodgiftDemon extends CardImpl { // At the beginning of your upkeep, target player draws a card and loses 1 life. Ability ability = new OnEventTriggeredAbility(EventType.UPKEEP_STEP_PRE, "beginning of your upkeep", new DrawCardTargetEffect(1), false); ability.addEffect(new LoseLifeTargetEffect(1)); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/BondsOfFaith.java b/Mage.Sets/src/mage/sets/innistrad/BondsOfFaith.java index 3f45ef8410a..bdd431c560f 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BondsOfFaith.java +++ b/Mage.Sets/src/mage/sets/innistrad/BondsOfFaith.java @@ -63,7 +63,7 @@ public class BondsOfFaith extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Neutral)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/innistrad/BrainWeevil.java b/Mage.Sets/src/mage/sets/innistrad/BrainWeevil.java index 06d7074107d..4f9cb535317 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BrainWeevil.java +++ b/Mage.Sets/src/mage/sets/innistrad/BrainWeevil.java @@ -59,7 +59,7 @@ public class BrainWeevil extends CardImpl { this.addAbility(IntimidateAbility.getInstance()); // Sacrifice Brain Weevil: Target player discards two cards. Activate this ability only any time you could cast a sorcery. Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(2), new SacrificeSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/Bramblecrush.java b/Mage.Sets/src/mage/sets/innistrad/Bramblecrush.java index 26114410dff..3216c0092a9 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Bramblecrush.java +++ b/Mage.Sets/src/mage/sets/innistrad/Bramblecrush.java @@ -56,7 +56,7 @@ public class Bramblecrush extends CardImpl { this.color.setGreen(true); // Destroy target noncreature permanent. - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/innistrad/BumpInTheNight.java b/Mage.Sets/src/mage/sets/innistrad/BumpInTheNight.java index 7686d151037..b0974919550 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BumpInTheNight.java +++ b/Mage.Sets/src/mage/sets/innistrad/BumpInTheNight.java @@ -51,7 +51,7 @@ public class BumpInTheNight extends CardImpl { // Target opponent loses 3 life. this.getSpellAbility().addEffect(new LoseLifeTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); // Flashback {5}{R} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{5}{R}"), TimingRule.SORCERY)); diff --git a/Mage.Sets/src/mage/sets/innistrad/CacklingCounterpart.java b/Mage.Sets/src/mage/sets/innistrad/CacklingCounterpart.java index 2da2434a879..7cc5e54c652 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CacklingCounterpart.java +++ b/Mage.Sets/src/mage/sets/innistrad/CacklingCounterpart.java @@ -57,7 +57,7 @@ public class CacklingCounterpart extends CardImpl { // Put a token onto the battlefield that's a copy of target creature you control. this.getSpellAbility().addEffect(new CacklingCounterpartEffect()); - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); // Flashback {5}{U}{U} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{5}{U}{U}"), TimingRule.INSTANT)); diff --git a/Mage.Sets/src/mage/sets/innistrad/CellarDoor.java b/Mage.Sets/src/mage/sets/innistrad/CellarDoor.java index e0d66d33aa2..ae19e02ec96 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CellarDoor.java +++ b/Mage.Sets/src/mage/sets/innistrad/CellarDoor.java @@ -57,7 +57,7 @@ public class CellarDoor extends CardImpl { // {3}, {tap}: Target player puts the bottom card of his or her library into his or her graveyard. If it's a creature card, you put a 2/2 black Zombie creature token onto the battlefield. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CellarDoorEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/Claustrophobia.java b/Mage.Sets/src/mage/sets/innistrad/Claustrophobia.java index 55f5dae4362..0d13b60f59c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Claustrophobia.java +++ b/Mage.Sets/src/mage/sets/innistrad/Claustrophobia.java @@ -56,7 +56,7 @@ public class Claustrophobia extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/innistrad/CorpseLunge.java b/Mage.Sets/src/mage/sets/innistrad/CorpseLunge.java index 07b2914ad32..83c876cd00e 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CorpseLunge.java +++ b/Mage.Sets/src/mage/sets/innistrad/CorpseLunge.java @@ -58,7 +58,7 @@ public class CorpseLunge extends CardImpl { // As an additional cost to cast Corpse Lunge, exile a creature card from your graveyard. this.getSpellAbility().addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard")))); // Corpse Lunge deals damage equal to the exiled card's power to target creature. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new CorpseLungeEffect()); } diff --git a/Mage.Sets/src/mage/sets/innistrad/CrosswayVampire.java b/Mage.Sets/src/mage/sets/innistrad/CrosswayVampire.java index 022bfc185c3..94bf3e0b9c9 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CrosswayVampire.java +++ b/Mage.Sets/src/mage/sets/innistrad/CrosswayVampire.java @@ -55,7 +55,7 @@ public class CrosswayVampire extends CardImpl { // When Crossway Vampire enters the battlefield, target creature can't block this turn. Ability ability = new EntersBattlefieldTriggeredAbility(new CantBlockTargetEffect(Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/Curiosity.java b/Mage.Sets/src/mage/sets/innistrad/Curiosity.java index bc4bff215a7..ed271ea491c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Curiosity.java +++ b/Mage.Sets/src/mage/sets/innistrad/Curiosity.java @@ -60,7 +60,7 @@ public class Curiosity extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Neutral)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/innistrad/CurseOfDeathsHold.java b/Mage.Sets/src/mage/sets/innistrad/CurseOfDeathsHold.java index 55e9457a29f..326fe0e54ab 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CurseOfDeathsHold.java +++ b/Mage.Sets/src/mage/sets/innistrad/CurseOfDeathsHold.java @@ -57,7 +57,7 @@ public class CurseOfDeathsHold extends CardImpl { this.color.setBlack(true); // Enchant player - TargetPlayer auraTarget = new TargetPlayer(true); + TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/innistrad/CurseOfOblivion.java b/Mage.Sets/src/mage/sets/innistrad/CurseOfOblivion.java index e0fd93dbc8a..147f730105f 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CurseOfOblivion.java +++ b/Mage.Sets/src/mage/sets/innistrad/CurseOfOblivion.java @@ -63,7 +63,7 @@ public class CurseOfOblivion extends CardImpl { this.color.setBlack(true); // Enchant player - TargetPlayer target = new TargetPlayer(true); + TargetPlayer target = new TargetPlayer(); this.getSpellAbility().addTarget(target); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(target.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/innistrad/CurseOfStalkedPrey.java b/Mage.Sets/src/mage/sets/innistrad/CurseOfStalkedPrey.java index 23e372335a7..4ef2d7b073b 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CurseOfStalkedPrey.java +++ b/Mage.Sets/src/mage/sets/innistrad/CurseOfStalkedPrey.java @@ -64,7 +64,7 @@ public class CurseOfStalkedPrey extends CardImpl { this.color.setRed(true); // Enchant player - TargetPlayer target = new TargetPlayer(true); + TargetPlayer target = new TargetPlayer(); this.getSpellAbility().addTarget(target); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(target.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/innistrad/CurseOfTheBloodyTome.java b/Mage.Sets/src/mage/sets/innistrad/CurseOfTheBloodyTome.java index 56ceb0a2f79..e5da8ee561b 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CurseOfTheBloodyTome.java +++ b/Mage.Sets/src/mage/sets/innistrad/CurseOfTheBloodyTome.java @@ -61,7 +61,7 @@ public class CurseOfTheBloodyTome extends CardImpl { this.color.setBlue(true); // Enchant player - TargetPlayer target = new TargetPlayer(true); + TargetPlayer target = new TargetPlayer(); this.getSpellAbility().addTarget(target); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(target.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/innistrad/CurseOfTheNightlyHunt.java b/Mage.Sets/src/mage/sets/innistrad/CurseOfTheNightlyHunt.java index e42ffa848e1..ff009e43a02 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CurseOfTheNightlyHunt.java +++ b/Mage.Sets/src/mage/sets/innistrad/CurseOfTheNightlyHunt.java @@ -58,7 +58,7 @@ public class CurseOfTheNightlyHunt extends CardImpl { this.color.setRed(true); // Enchant player - TargetPlayer auraTarget = new TargetPlayer(true); + TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/innistrad/CurseOfThePiercedHeart.java b/Mage.Sets/src/mage/sets/innistrad/CurseOfThePiercedHeart.java index df3f084b7bd..549e45265f0 100644 --- a/Mage.Sets/src/mage/sets/innistrad/CurseOfThePiercedHeart.java +++ b/Mage.Sets/src/mage/sets/innistrad/CurseOfThePiercedHeart.java @@ -62,7 +62,7 @@ public class CurseOfThePiercedHeart extends CardImpl { this.color.setRed(true); // Enchant player - TargetPlayer target = new TargetPlayer(true); + TargetPlayer target = new TargetPlayer(); this.getSpellAbility().addTarget(target); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(target.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/innistrad/DaybreakRanger.java b/Mage.Sets/src/mage/sets/innistrad/DaybreakRanger.java index b4c889a700e..bf8c8ae6e3b 100644 --- a/Mage.Sets/src/mage/sets/innistrad/DaybreakRanger.java +++ b/Mage.Sets/src/mage/sets/innistrad/DaybreakRanger.java @@ -77,7 +77,7 @@ public class DaybreakRanger extends CardImpl { // {tap}: Daybreak Ranger deals 2 damage to target creature with flying. Ability activatedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); - activatedAbility.addTarget(new TargetCreaturePermanent(filter, true)); + activatedAbility.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(activatedAbility); // At the beginning of each upkeep, if no spells were cast last turn, transform Daybreak Ranger. this.addAbility(new TransformAbility()); diff --git a/Mage.Sets/src/mage/sets/innistrad/DeadWeight.java b/Mage.Sets/src/mage/sets/innistrad/DeadWeight.java index 4279582e24b..f4cba0fd46e 100644 --- a/Mage.Sets/src/mage/sets/innistrad/DeadWeight.java +++ b/Mage.Sets/src/mage/sets/innistrad/DeadWeight.java @@ -53,7 +53,7 @@ public class DeadWeight extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Neutral)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/innistrad/DemonmailHauberk.java b/Mage.Sets/src/mage/sets/innistrad/DemonmailHauberk.java index 4c3306cbe56..69e29182f71 100644 --- a/Mage.Sets/src/mage/sets/innistrad/DemonmailHauberk.java +++ b/Mage.Sets/src/mage/sets/innistrad/DemonmailHauberk.java @@ -52,7 +52,7 @@ public class DemonmailHauberk extends CardImpl { this.subtype.add("Equipment"); // Equip - Sacrifice a creature. - this.addAbility(new EquipAbility(Outcome.AddAbility, new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); // Equipped creature gets +4/+2. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(4, 2))); diff --git a/Mage.Sets/src/mage/sets/innistrad/DiscipleOfGriselbrand.java b/Mage.Sets/src/mage/sets/innistrad/DiscipleOfGriselbrand.java index 68131915c42..db125152468 100644 --- a/Mage.Sets/src/mage/sets/innistrad/DiscipleOfGriselbrand.java +++ b/Mage.Sets/src/mage/sets/innistrad/DiscipleOfGriselbrand.java @@ -62,7 +62,7 @@ public class DiscipleOfGriselbrand extends CardImpl { // {1}, Sacrifice a creature: You gain life equal to the sacrificed creature's toughness. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscipleOfGriselbrandEffect(), new GenericManaCost(1)); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/DreamTwist.java b/Mage.Sets/src/mage/sets/innistrad/DreamTwist.java index ec2ff5f3ca5..129efedd359 100644 --- a/Mage.Sets/src/mage/sets/innistrad/DreamTwist.java +++ b/Mage.Sets/src/mage/sets/innistrad/DreamTwist.java @@ -50,7 +50,7 @@ public class DreamTwist extends CardImpl { this.color.setBlue(true); // Target player puts the top three cards of his or her library into his or her graveyard. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(3)); // Flashback {1}{U} diff --git a/Mage.Sets/src/mage/sets/innistrad/ElderCathar.java b/Mage.Sets/src/mage/sets/innistrad/ElderCathar.java index fc3668809c1..6f1c2fdfc91 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ElderCathar.java +++ b/Mage.Sets/src/mage/sets/innistrad/ElderCathar.java @@ -60,7 +60,7 @@ public class ElderCathar extends CardImpl { // When Elder Cathar dies, put a +1/+1 counter on target creature you control. If that creature is a Human, put two +1/+1 counters on it instead. Ability ability = new DiesTriggeredAbility(new ElderCatharAddCountersTargetEffect(), false); - ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/ElderOfLaurels.java b/Mage.Sets/src/mage/sets/innistrad/ElderOfLaurels.java index 01b396dec35..e3768bfecb9 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ElderOfLaurels.java +++ b/Mage.Sets/src/mage/sets/innistrad/ElderOfLaurels.java @@ -62,7 +62,7 @@ public class ElderOfLaurels extends CardImpl { SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(amount, amount, Duration.EndOfTurn, true), new ManaCostsImpl("{3}{G}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/EvilTwin.java b/Mage.Sets/src/mage/sets/innistrad/EvilTwin.java index 7dfd74b5c3c..de5aac94ab7 100644 --- a/Mage.Sets/src/mage/sets/innistrad/EvilTwin.java +++ b/Mage.Sets/src/mage/sets/innistrad/EvilTwin.java @@ -95,7 +95,7 @@ class EvilTwinApplyToPermanent extends ApplyToPermanent { public Boolean apply(Game game, Permanent permanent) { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{U}{B}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); permanent.addAbility(ability, game); return true; } diff --git a/Mage.Sets/src/mage/sets/innistrad/FalkenrathNoble.java b/Mage.Sets/src/mage/sets/innistrad/FalkenrathNoble.java index a012eb285aa..b26f63236f4 100644 --- a/Mage.Sets/src/mage/sets/innistrad/FalkenrathNoble.java +++ b/Mage.Sets/src/mage/sets/innistrad/FalkenrathNoble.java @@ -78,7 +78,7 @@ class FalkenrathNobleTriggeredAbility extends TriggeredAbilityImpl { public FalkenrathNobleTriggeredAbility() { super(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), false); this.addEffect(new GainLifeEffect(1)); - this.addTarget(new TargetPlayer(true)); + this.addTarget(new TargetPlayer()); } public FalkenrathNobleTriggeredAbility(final FalkenrathNobleTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/innistrad/FiendHunter.java b/Mage.Sets/src/mage/sets/innistrad/FiendHunter.java index 4a63252214b..088378f0f06 100644 --- a/Mage.Sets/src/mage/sets/innistrad/FiendHunter.java +++ b/Mage.Sets/src/mage/sets/innistrad/FiendHunter.java @@ -66,7 +66,7 @@ public class FiendHunter extends CardImpl { // When Fiend Hunter enters the battlefield, you may exile another target creature. Ability ability1 = new EntersBattlefieldTriggeredAbility(new ExileTargetForSourceEffect("Fiend Hunter Exile"), true); - Target target = new TargetPermanent(filter, true); + Target target = new TargetPermanent(filter); target.setRequired(true); ability1.addTarget(target); this.addAbility(ability1); diff --git a/Mage.Sets/src/mage/sets/innistrad/FurorOfTheBitten.java b/Mage.Sets/src/mage/sets/innistrad/FurorOfTheBitten.java index 89b71de094a..a977ef885dd 100644 --- a/Mage.Sets/src/mage/sets/innistrad/FurorOfTheBitten.java +++ b/Mage.Sets/src/mage/sets/innistrad/FurorOfTheBitten.java @@ -58,7 +58,7 @@ public class FurorOfTheBitten extends CardImpl { this.color.setRed(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/innistrad/GarrukRelentless.java b/Mage.Sets/src/mage/sets/innistrad/GarrukRelentless.java index 00e0af61484..b315eceb63b 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GarrukRelentless.java +++ b/Mage.Sets/src/mage/sets/innistrad/GarrukRelentless.java @@ -73,7 +73,7 @@ public class GarrukRelentless extends CardImpl { // 0: Garruk Relentless deals 3 damage to target creature. That creature deals damage equal to its power to him LoyaltyAbility ability1 = new LoyaltyAbility(new GarrukRelentlessDamageEffect(), 0); - ability1.addTarget(new TargetCreaturePermanent(true)); + ability1.addTarget(new TargetCreaturePermanent()); this.addAbility(ability1); // 0: Put a 2/2 green Wolf creature token onto the battlefield. diff --git a/Mage.Sets/src/mage/sets/innistrad/GeistcatchersRig.java b/Mage.Sets/src/mage/sets/innistrad/GeistcatchersRig.java index 41a872dd178..1faeb2acf27 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GeistcatchersRig.java +++ b/Mage.Sets/src/mage/sets/innistrad/GeistcatchersRig.java @@ -61,7 +61,7 @@ public class GeistcatchersRig extends CardImpl { this.toughness = new MageInt(5); // When Geistcatcher's Rig enters the battlefield, you may have it deal 4 damage to target creature with flying. Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(4), true); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/GhostlyPossession.java b/Mage.Sets/src/mage/sets/innistrad/GhostlyPossession.java index 31975b9a72f..c8d5ae3db68 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GhostlyPossession.java +++ b/Mage.Sets/src/mage/sets/innistrad/GhostlyPossession.java @@ -58,7 +58,7 @@ public class GhostlyPossession extends CardImpl { this.color.setWhite(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/innistrad/GraspOfPhantoms.java b/Mage.Sets/src/mage/sets/innistrad/GraspOfPhantoms.java index 425d2055506..990fcca4068 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GraspOfPhantoms.java +++ b/Mage.Sets/src/mage/sets/innistrad/GraspOfPhantoms.java @@ -52,7 +52,7 @@ public class GraspOfPhantoms extends CardImpl { // Put target creature on top of its owner's library. this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Flashback {7}{U} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{7}{U}"), TimingRule.SORCERY)); diff --git a/Mage.Sets/src/mage/sets/innistrad/GraveyardShovel.java b/Mage.Sets/src/mage/sets/innistrad/GraveyardShovel.java index 7454ffd51c0..6f2e32bc163 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GraveyardShovel.java +++ b/Mage.Sets/src/mage/sets/innistrad/GraveyardShovel.java @@ -58,7 +58,7 @@ public class GraveyardShovel extends CardImpl { // {2}, {tap}: Target player exiles a card from his or her graveyard. If it's a creature card, you gain 2 life. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GraveyardShovelEffect(), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/GrimgrinCorpseBorn.java b/Mage.Sets/src/mage/sets/innistrad/GrimgrinCorpseBorn.java index e1eaed00f95..cc1213a6aa8 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GrimgrinCorpseBorn.java +++ b/Mage.Sets/src/mage/sets/innistrad/GrimgrinCorpseBorn.java @@ -116,7 +116,7 @@ class GrimgrinCorpseBornAbility extends TriggeredAbilityImpl { filter.add(new ControllerIdPredicate(defenderId)); this.getTargets().clear(); - TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true); + TargetCreaturePermanent target = new TargetCreaturePermanent(filter); target.setRequired(true); this.addTarget(target); return true; diff --git a/Mage.Sets/src/mage/sets/innistrad/GruesomeDeformity.java b/Mage.Sets/src/mage/sets/innistrad/GruesomeDeformity.java index 8db01106eb2..8163b829d3c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/GruesomeDeformity.java +++ b/Mage.Sets/src/mage/sets/innistrad/GruesomeDeformity.java @@ -54,7 +54,7 @@ public class GruesomeDeformity extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent target = new TargetCreaturePermanent(true); + TargetPermanent target = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(target); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(target.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/innistrad/HarvestPyre.java b/Mage.Sets/src/mage/sets/innistrad/HarvestPyre.java index 4482636a12f..5d7bd499bb3 100644 --- a/Mage.Sets/src/mage/sets/innistrad/HarvestPyre.java +++ b/Mage.Sets/src/mage/sets/innistrad/HarvestPyre.java @@ -53,7 +53,7 @@ public class HarvestPyre extends CardImpl { this.getSpellAbility().addCost(new ExileXFromYourGraveCost(new FilterCard("cards from your graveyard"))); // Harvest Pyre deals X damage to target creature. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DamageTargetEffect(new GetXValue())); } diff --git a/Mage.Sets/src/mage/sets/innistrad/InfernalPlunge.java b/Mage.Sets/src/mage/sets/innistrad/InfernalPlunge.java index 861dfaecc17..d491dc90003 100644 --- a/Mage.Sets/src/mage/sets/innistrad/InfernalPlunge.java +++ b/Mage.Sets/src/mage/sets/innistrad/InfernalPlunge.java @@ -49,7 +49,7 @@ public class InfernalPlunge extends CardImpl { this.color.setRed(true); // As an additional cost to cast Infernal Plunge, sacrifice a creature. - this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); // Add {R}{R}{R} to your mana pool. this.getSpellAbility().addEffect(new BasicManaEffect(Mana.RedMana(3))); } diff --git a/Mage.Sets/src/mage/sets/innistrad/IntoTheMawOfHell.java b/Mage.Sets/src/mage/sets/innistrad/IntoTheMawOfHell.java index 72644d798d0..84cd5f5fef2 100644 --- a/Mage.Sets/src/mage/sets/innistrad/IntoTheMawOfHell.java +++ b/Mage.Sets/src/mage/sets/innistrad/IntoTheMawOfHell.java @@ -55,7 +55,7 @@ public class IntoTheMawOfHell extends CardImpl { // Destroy target land. Into the Maw of Hell deals 13 damage to target creature. this.getSpellAbility().addTarget(new TargetLandPermanent()); this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new IntoTheMawOfHellEffect()); } diff --git a/Mage.Sets/src/mage/sets/innistrad/KessigWolfRun.java b/Mage.Sets/src/mage/sets/innistrad/KessigWolfRun.java index 393c5bc9802..4fefc8877fe 100644 --- a/Mage.Sets/src/mage/sets/innistrad/KessigWolfRun.java +++ b/Mage.Sets/src/mage/sets/innistrad/KessigWolfRun.java @@ -62,7 +62,7 @@ public class KessigWolfRun extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{X}{R}{G}")); ability.addCost(new TapSourceCost()); ability.addEffect(new BoostTargetEffect(new ManacostVariableValue(), new StaticValue(0), Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/LilianaOfTheVeil.java b/Mage.Sets/src/mage/sets/innistrad/LilianaOfTheVeil.java index af8b2ad74b4..4fbc0bfa5f6 100644 --- a/Mage.Sets/src/mage/sets/innistrad/LilianaOfTheVeil.java +++ b/Mage.Sets/src/mage/sets/innistrad/LilianaOfTheVeil.java @@ -70,11 +70,11 @@ public class LilianaOfTheVeil extends CardImpl { this.addAbility(new LoyaltyAbility(new DiscardEachPlayerEffect(), 1)); // -2: Target player sacrifices a creature. LoyaltyAbility ability = new LoyaltyAbility(new SacrificeEffect(new FilterCreaturePermanent(), 1, "Target player"), -2); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); // -6: Separate all permanents target player controls into two piles. That player sacrifices all permanents in the pile of his or her choice. ability = new LoyaltyAbility(new LilianaOfTheVeilEffect(), -6); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/LostInTheMist.java b/Mage.Sets/src/mage/sets/innistrad/LostInTheMist.java index a6d49763b38..0588693c0d4 100644 --- a/Mage.Sets/src/mage/sets/innistrad/LostInTheMist.java +++ b/Mage.Sets/src/mage/sets/innistrad/LostInTheMist.java @@ -56,7 +56,7 @@ public class LostInTheMist extends CardImpl { // Counter target spell. Return target permanent to its owner's hand. this.getSpellAbility().addTarget(new TargetSpell()); this.getSpellAbility().addEffect(new CounterTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(true)); + this.getSpellAbility().addTarget(new TargetPermanent()); this.getSpellAbility().addEffect(new LostInTheMistEffect()); } diff --git a/Mage.Sets/src/mage/sets/innistrad/MemorysJourney.java b/Mage.Sets/src/mage/sets/innistrad/MemorysJourney.java index c68ccbe8ba4..232994a47ad 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MemorysJourney.java +++ b/Mage.Sets/src/mage/sets/innistrad/MemorysJourney.java @@ -60,7 +60,7 @@ public class MemorysJourney extends CardImpl { // Target player shuffles up to three target cards from his or her graveyard into his or her library. this.getSpellAbility().addEffect(new MemorysJourneyEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addTarget(new MemorysJourneyTarget()); // Flashback {G} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{G}"), TimingRule.INSTANT)); diff --git a/Mage.Sets/src/mage/sets/innistrad/Mindshrieker.java b/Mage.Sets/src/mage/sets/innistrad/Mindshrieker.java index 4df6bae2b31..81142f91c2e 100644 --- a/Mage.Sets/src/mage/sets/innistrad/Mindshrieker.java +++ b/Mage.Sets/src/mage/sets/innistrad/Mindshrieker.java @@ -65,7 +65,7 @@ public class Mindshrieker extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {2}: Target player puts the top card of his or her library into his or her graveyard. Mindshrieker gets +X/+X until end of turn, where X is that card's converted mana cost. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MindshriekerEffect(), new ManaCostsImpl("{2}")); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/MomentOfHeroism.java b/Mage.Sets/src/mage/sets/innistrad/MomentOfHeroism.java index ef029cea1ab..9aa54cd21e3 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MomentOfHeroism.java +++ b/Mage.Sets/src/mage/sets/innistrad/MomentOfHeroism.java @@ -52,7 +52,7 @@ public class MomentOfHeroism extends CardImpl { // Target creature gets +2/+2 and gains lifelink until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public MomentOfHeroism(final MomentOfHeroism card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/MorkrutBanshee.java b/Mage.Sets/src/mage/sets/innistrad/MorkrutBanshee.java index 8b4b21a1a79..d902d872013 100644 --- a/Mage.Sets/src/mage/sets/innistrad/MorkrutBanshee.java +++ b/Mage.Sets/src/mage/sets/innistrad/MorkrutBanshee.java @@ -60,7 +60,7 @@ public class MorkrutBanshee extends CardImpl { // Morbid - When Morkut Banshee enters the battlefield, if a creature died this turn, target creature gets -4/-4 until end of turn. TriggeredAbility triggeredAbility = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(-4, -4, Duration.EndOfTurn)); TriggeredAbility ability = new ConditionalTriggeredAbility(triggeredAbility, MorbidCondition.getInstance(), staticText); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/NephaliaDrownyard.java b/Mage.Sets/src/mage/sets/innistrad/NephaliaDrownyard.java index 937fbb0c5e2..d2782d24450 100644 --- a/Mage.Sets/src/mage/sets/innistrad/NephaliaDrownyard.java +++ b/Mage.Sets/src/mage/sets/innistrad/NephaliaDrownyard.java @@ -56,7 +56,7 @@ public class NephaliaDrownyard extends CardImpl { // {1}{U}{B}, {T}: Target player puts the top three cards of his or her library into his or her graveyard. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(3), new ManaCostsImpl("{1}{U}{B}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/NightTerrors.java b/Mage.Sets/src/mage/sets/innistrad/NightTerrors.java index 527703fe6ec..85d838c353c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/NightTerrors.java +++ b/Mage.Sets/src/mage/sets/innistrad/NightTerrors.java @@ -55,7 +55,7 @@ public class NightTerrors extends CardImpl { this.color.setBlack(true); // Target player reveals his or her hand. You choose a nonland card from it. Exile that card. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new NightTerrorsEffect()); } diff --git a/Mage.Sets/src/mage/sets/innistrad/NightfallPredator.java b/Mage.Sets/src/mage/sets/innistrad/NightfallPredator.java index 84e155f31ae..3ef05647990 100644 --- a/Mage.Sets/src/mage/sets/innistrad/NightfallPredator.java +++ b/Mage.Sets/src/mage/sets/innistrad/NightfallPredator.java @@ -72,7 +72,7 @@ public class NightfallPredator extends CardImpl { // {R}, {tap}: Nightfall Predator fights target creature. Ability activatedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new NightfallPredatorEffect(), new ManaCostsImpl("{R}")); activatedAbility.addCost(new TapSourceCost()); - activatedAbility.addTarget(new TargetCreaturePermanent(true)); + activatedAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(activatedAbility); // At the beginning of each upkeep, if a player cast two or more spells last turn, transform Nightfall Predator. TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), TargetController.ANY, false); diff --git a/Mage.Sets/src/mage/sets/innistrad/OliviaVoldaren.java b/Mage.Sets/src/mage/sets/innistrad/OliviaVoldaren.java index 12b12633284..3f132f3fc41 100644 --- a/Mage.Sets/src/mage/sets/innistrad/OliviaVoldaren.java +++ b/Mage.Sets/src/mage/sets/innistrad/OliviaVoldaren.java @@ -86,7 +86,7 @@ public class OliviaVoldaren extends CardImpl { // {1}{R}: Olivia Voldaren deals 1 damage to another target creature. That creature becomes a Vampire in addition to its other types. Put a +1/+1 counter on Olivia Voldaren. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}{R}")); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); ability.addEffect(new AddCardSubTypeTargetEffect("Vampire", Duration.WhileOnBattlefield)); ability.addEffect(new AddCountersSourceEffect(CounterType.P1P1.createInstance())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/innistrad/PreyUpon.java b/Mage.Sets/src/mage/sets/innistrad/PreyUpon.java index 5e1c24616f7..b90d8c1795d 100644 --- a/Mage.Sets/src/mage/sets/innistrad/PreyUpon.java +++ b/Mage.Sets/src/mage/sets/innistrad/PreyUpon.java @@ -59,8 +59,8 @@ public class PreyUpon extends CardImpl { // Target creature you control fights target creature you don't control. this.getSpellAbility().addEffect(new FightTargetsEffect()); - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); - Target target = new TargetCreaturePermanent(filter, true); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); this.getSpellAbility().addTarget(target); } diff --git a/Mage.Sets/src/mage/sets/innistrad/RageThrower.java b/Mage.Sets/src/mage/sets/innistrad/RageThrower.java index 87122be8a5f..6de99a18350 100644 --- a/Mage.Sets/src/mage/sets/innistrad/RageThrower.java +++ b/Mage.Sets/src/mage/sets/innistrad/RageThrower.java @@ -54,7 +54,7 @@ public class RageThrower extends CardImpl { // Whenever another creature dies, Rage Thrower deals 2 damage to target player. DiesCreatureTriggeredAbility ability = new DiesCreatureTriggeredAbility(new DamageTargetEffect(2), false, true); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/RangersGuile.java b/Mage.Sets/src/mage/sets/innistrad/RangersGuile.java index 9be79f7c554..006606126dc 100644 --- a/Mage.Sets/src/mage/sets/innistrad/RangersGuile.java +++ b/Mage.Sets/src/mage/sets/innistrad/RangersGuile.java @@ -50,7 +50,7 @@ public class RangersGuile extends CardImpl { this.color.setGreen(true); // Target creature you control gets +1/+1 and gains hexproof until end of turn. - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(1, 1, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HexproofAbility.getInstance(), Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/innistrad/ReaperFromTheAbyss.java b/Mage.Sets/src/mage/sets/innistrad/ReaperFromTheAbyss.java index 5276e9e0cda..4dd89f5cf7a 100644 --- a/Mage.Sets/src/mage/sets/innistrad/ReaperFromTheAbyss.java +++ b/Mage.Sets/src/mage/sets/innistrad/ReaperFromTheAbyss.java @@ -69,7 +69,7 @@ public class ReaperFromTheAbyss extends CardImpl { this.addAbility(FlyingAbility.getInstance()); Ability ability = new ReaperFromTheAbyssAbility(); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/SelhoffOccultist.java b/Mage.Sets/src/mage/sets/innistrad/SelhoffOccultist.java index ffabfe1bf90..bcfb2654af9 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SelhoffOccultist.java +++ b/Mage.Sets/src/mage/sets/innistrad/SelhoffOccultist.java @@ -56,7 +56,7 @@ public class SelhoffOccultist extends CardImpl { // Whenever Selhoff Occultist or another creature dies, target player puts the top card of his or her library into his or her graveyard. Ability ability = new DiesThisOrAnotherCreatureTriggeredAbility(new PutLibraryIntoGraveTargetEffect(1), false); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/SensoryDeprivation.java b/Mage.Sets/src/mage/sets/innistrad/SensoryDeprivation.java index 3177e676a8c..60c29ee4ce8 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SensoryDeprivation.java +++ b/Mage.Sets/src/mage/sets/innistrad/SensoryDeprivation.java @@ -55,7 +55,7 @@ public class SensoryDeprivation extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/innistrad/SeverTheBloodline.java b/Mage.Sets/src/mage/sets/innistrad/SeverTheBloodline.java index adb3e7bac4f..398b29ee30f 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SeverTheBloodline.java +++ b/Mage.Sets/src/mage/sets/innistrad/SeverTheBloodline.java @@ -58,7 +58,7 @@ public class SeverTheBloodline extends CardImpl { // Exile target creature and all other creatures with the same name as that creature. this.getSpellAbility().addEffect(new SeverTheBloodlineEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Flashback {5}{B}{B} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{5}{B}{B}"), TimingRule.SORCERY)); } diff --git a/Mage.Sets/src/mage/sets/innistrad/SilentDeparture.java b/Mage.Sets/src/mage/sets/innistrad/SilentDeparture.java index a8d1e1e991c..4b2fa22c0f1 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SilentDeparture.java +++ b/Mage.Sets/src/mage/sets/innistrad/SilentDeparture.java @@ -51,7 +51,7 @@ public class SilentDeparture extends CardImpl { this.color.setBlue(true); // Return target creature to its owner's hand. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); // Flashback {4}{U} diff --git a/Mage.Sets/src/mage/sets/innistrad/SilverchaseFox.java b/Mage.Sets/src/mage/sets/innistrad/SilverchaseFox.java index 945b23071c1..8c691c0651c 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SilverchaseFox.java +++ b/Mage.Sets/src/mage/sets/innistrad/SilverchaseFox.java @@ -65,7 +65,7 @@ public class SilverchaseFox extends CardImpl { // {1}{W}, Sacrifice Silverchase Fox: Exile target enchantment. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl("{1}{W}")); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/SkeletalGrimace.java b/Mage.Sets/src/mage/sets/innistrad/SkeletalGrimace.java index c491beff3cd..1bfa2f815e7 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SkeletalGrimace.java +++ b/Mage.Sets/src/mage/sets/innistrad/SkeletalGrimace.java @@ -61,7 +61,7 @@ public class SkeletalGrimace extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/innistrad/SkirsdagCultist.java b/Mage.Sets/src/mage/sets/innistrad/SkirsdagCultist.java index b657ee51675..eff79dcca0e 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SkirsdagCultist.java +++ b/Mage.Sets/src/mage/sets/innistrad/SkirsdagCultist.java @@ -61,7 +61,7 @@ public class SkirsdagCultist extends CardImpl { // {R}, {T}, Sacrifice a creature: Skirsdag Cultist deals 2 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{R}")); ability.addCost(new TapSourceCost()); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/SlayerOfTheWicked.java b/Mage.Sets/src/mage/sets/innistrad/SlayerOfTheWicked.java index 85a0a1988e4..8aedd8e60ae 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SlayerOfTheWicked.java +++ b/Mage.Sets/src/mage/sets/innistrad/SlayerOfTheWicked.java @@ -67,7 +67,7 @@ public class SlayerOfTheWicked extends CardImpl { // When Slayer of the Wicked enters the battlefield, you may destroy target Vampire, Werewolf, or Zombie. Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), true); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/SmiteTheMonstrous.java b/Mage.Sets/src/mage/sets/innistrad/SmiteTheMonstrous.java index 06b8ff0cb0d..0efffacc97b 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SmiteTheMonstrous.java +++ b/Mage.Sets/src/mage/sets/innistrad/SmiteTheMonstrous.java @@ -56,7 +56,7 @@ public class SmiteTheMonstrous extends CardImpl { // Destroy target creature with power 4 or greater. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); } public SmiteTheMonstrous(final SmiteTheMonstrous card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/SnapcasterMage.java b/Mage.Sets/src/mage/sets/innistrad/SnapcasterMage.java index 46fc0c6492f..a1dacf3e28f 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SnapcasterMage.java +++ b/Mage.Sets/src/mage/sets/innistrad/SnapcasterMage.java @@ -77,7 +77,7 @@ public class SnapcasterMage extends CardImpl { this.addAbility(FlashAbility.getInstance()); // When Snapcaster Mage enters the battlefield, target instant or sorcery card in your graveyard gains flashback until end of turn. The flashback cost is equal to its mana cost. Ability ability = new EntersBattlefieldTriggeredAbility(new SnapcasterMageEffect()); - ability.addTarget(new TargetCardInYourGraveyard(filter, true)); + ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/SpectralFlight.java b/Mage.Sets/src/mage/sets/innistrad/SpectralFlight.java index c72e7df5da8..bc9c5de53be 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SpectralFlight.java +++ b/Mage.Sets/src/mage/sets/innistrad/SpectralFlight.java @@ -55,7 +55,7 @@ public class SpectralFlight extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent target = new TargetCreaturePermanent(true); + TargetPermanent target = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(target); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(target.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/innistrad/SpideryGrasp.java b/Mage.Sets/src/mage/sets/innistrad/SpideryGrasp.java index e1d962280da..091260596f8 100644 --- a/Mage.Sets/src/mage/sets/innistrad/SpideryGrasp.java +++ b/Mage.Sets/src/mage/sets/innistrad/SpideryGrasp.java @@ -53,7 +53,7 @@ public class SpideryGrasp extends CardImpl { this.getSpellAbility().addEffect(new UntapTargetEffect()); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(ReachAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addEffect(new BoostTargetEffect(2, 4, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public SpideryGrasp(final SpideryGrasp card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/StensiaBloodhall.java b/Mage.Sets/src/mage/sets/innistrad/StensiaBloodhall.java index 62558a1d2d3..94b072ce12a 100644 --- a/Mage.Sets/src/mage/sets/innistrad/StensiaBloodhall.java +++ b/Mage.Sets/src/mage/sets/innistrad/StensiaBloodhall.java @@ -56,7 +56,7 @@ public class StensiaBloodhall extends CardImpl { // {3}{B}{R}, {T}: Stensia Bloodhall deals 2 damage to target player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{3}{B}{R}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/TraitorousBlood.java b/Mage.Sets/src/mage/sets/innistrad/TraitorousBlood.java index d1db16850cd..5f947347e78 100644 --- a/Mage.Sets/src/mage/sets/innistrad/TraitorousBlood.java +++ b/Mage.Sets/src/mage/sets/innistrad/TraitorousBlood.java @@ -52,7 +52,7 @@ public class TraitorousBlood extends CardImpl { this.color.setRed(true); // Gain control of target creature until end of turn. Untap it. It gains trample and haste until end of turn. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new UntapTargetEffect()); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/innistrad/TributeToHunger.java b/Mage.Sets/src/mage/sets/innistrad/TributeToHunger.java index 82a8f4fd475..561e198b146 100644 --- a/Mage.Sets/src/mage/sets/innistrad/TributeToHunger.java +++ b/Mage.Sets/src/mage/sets/innistrad/TributeToHunger.java @@ -57,7 +57,7 @@ public class TributeToHunger extends CardImpl { this.color.setBlack(true); // Target opponent sacrifices a creature. You gain life equal to that creature's toughness. - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); this.getSpellAbility().addEffect(new TributeToHungerEffect()); } diff --git a/Mage.Sets/src/mage/sets/innistrad/UrgentExorcism.java b/Mage.Sets/src/mage/sets/innistrad/UrgentExorcism.java index a40bf42ad76..6a1dddcedd1 100644 --- a/Mage.Sets/src/mage/sets/innistrad/UrgentExorcism.java +++ b/Mage.Sets/src/mage/sets/innistrad/UrgentExorcism.java @@ -61,7 +61,7 @@ public class UrgentExorcism extends CardImpl { // Destroy target Spirit or enchantment. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); } public UrgentExorcism(final UrgentExorcism card) { diff --git a/Mage.Sets/src/mage/sets/innistrad/VictimOfNight.java b/Mage.Sets/src/mage/sets/innistrad/VictimOfNight.java index c9c0843fb2e..dbe084a7bc7 100644 --- a/Mage.Sets/src/mage/sets/innistrad/VictimOfNight.java +++ b/Mage.Sets/src/mage/sets/innistrad/VictimOfNight.java @@ -58,7 +58,7 @@ public class VictimOfNight extends CardImpl { this.color.setBlack(true); // Destroy target non-Vampire, non-Werewolf, non-Zombie creature. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/innistrad/WreathofGeists.java b/Mage.Sets/src/mage/sets/innistrad/WreathofGeists.java index db05a618a8e..524b575db68 100644 --- a/Mage.Sets/src/mage/sets/innistrad/WreathofGeists.java +++ b/Mage.Sets/src/mage/sets/innistrad/WreathofGeists.java @@ -58,7 +58,7 @@ public class WreathofGeists extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); diff --git a/Mage.Sets/src/mage/sets/invasion/Annihilate.java b/Mage.Sets/src/mage/sets/invasion/Annihilate.java index 8f5d7d8928e..2aadd123c7f 100644 --- a/Mage.Sets/src/mage/sets/invasion/Annihilate.java +++ b/Mage.Sets/src/mage/sets/invasion/Annihilate.java @@ -58,7 +58,7 @@ public class Annihilate extends CardImpl { // Destroy target nonblack creature. It can't be regenerated. this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/invasion/ArmadilloCloak.java b/Mage.Sets/src/mage/sets/invasion/ArmadilloCloak.java index 15995f6a716..9e003c8434b 100644 --- a/Mage.Sets/src/mage/sets/invasion/ArmadilloCloak.java +++ b/Mage.Sets/src/mage/sets/invasion/ArmadilloCloak.java @@ -67,7 +67,7 @@ public class ArmadilloCloak extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/invasion/AssaultBattery.java b/Mage.Sets/src/mage/sets/invasion/AssaultBattery.java index bb8b6f266de..b658ba52cc7 100644 --- a/Mage.Sets/src/mage/sets/invasion/AssaultBattery.java +++ b/Mage.Sets/src/mage/sets/invasion/AssaultBattery.java @@ -59,7 +59,7 @@ public class AssaultBattery extends SplitCard { Effect effect = new DamageTargetEffect(2); effect.setText("Assault deals 2 damage to target creature or player"); getLeftHalfCard().getSpellAbility().addEffect(effect); - getLeftHalfCard().getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); + getLeftHalfCard().getSpellAbility().addTarget(new TargetCreatureOrPlayer()); // Battery // Put a 3/3 green Elephant creature token onto the battlefield. diff --git a/Mage.Sets/src/mage/sets/invasion/BenalishTrapper.java b/Mage.Sets/src/mage/sets/invasion/BenalishTrapper.java index a89047fa04a..a1d0a68a540 100644 --- a/Mage.Sets/src/mage/sets/invasion/BenalishTrapper.java +++ b/Mage.Sets/src/mage/sets/invasion/BenalishTrapper.java @@ -61,7 +61,7 @@ public class BenalishTrapper extends CardImpl { // {W}, {tap}: Tap target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/invasion/HannaShipsNavigator.java b/Mage.Sets/src/mage/sets/invasion/HannaShipsNavigator.java index 80953eabe93..2832cf26af7 100644 --- a/Mage.Sets/src/mage/sets/invasion/HannaShipsNavigator.java +++ b/Mage.Sets/src/mage/sets/invasion/HannaShipsNavigator.java @@ -73,7 +73,7 @@ public class HannaShipsNavigator extends CardImpl { // {1}{W}{U}, {tap}: Return target artifact or enchantment card from your graveyard to your hand. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl("{1}{W}{U}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCardInYourGraveyard(filter, true)); + ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/invasion/HeroesReunion.java b/Mage.Sets/src/mage/sets/invasion/HeroesReunion.java index a7aa64aa0a8..09a91efa031 100644 --- a/Mage.Sets/src/mage/sets/invasion/HeroesReunion.java +++ b/Mage.Sets/src/mage/sets/invasion/HeroesReunion.java @@ -49,7 +49,7 @@ public class HeroesReunion extends CardImpl { // Target player gains 7 life. this.getSpellAbility().addEffect(new GainLifeTargetEffect(7)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public HeroesReunion(final HeroesReunion card) { diff --git a/Mage.Sets/src/mage/sets/invasion/HypnoticCloud.java b/Mage.Sets/src/mage/sets/invasion/HypnoticCloud.java index ce43b974e04..c813373d516 100644 --- a/Mage.Sets/src/mage/sets/invasion/HypnoticCloud.java +++ b/Mage.Sets/src/mage/sets/invasion/HypnoticCloud.java @@ -53,7 +53,7 @@ public class HypnoticCloud extends CardImpl { this.addAbility(new KickerAbility("{4}")); // Target player discards a card. If Hypnotic Cloud was kicked, that player discards three cards instead. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new DiscardTargetEffect(3), new DiscardTargetEffect(1), KickedCondition.getInstance(), "Target player discards a card. If {this} was kicked, that player discards three cards instead")); diff --git a/Mage.Sets/src/mage/sets/invasion/PhyrexianAltar.java b/Mage.Sets/src/mage/sets/invasion/PhyrexianAltar.java index 205ebeeb66a..620ffc4b449 100644 --- a/Mage.Sets/src/mage/sets/invasion/PhyrexianAltar.java +++ b/Mage.Sets/src/mage/sets/invasion/PhyrexianAltar.java @@ -46,7 +46,7 @@ public class PhyrexianAltar extends CardImpl { this.expansionSetCode = "INV"; // Sacrifice a creature: Add one mana of any color to your mana pool. - this.addAbility(new AnyColorManaAbility(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); + this.addAbility(new AnyColorManaAbility(new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); } public PhyrexianAltar(final PhyrexianAltar card) { diff --git a/Mage.Sets/src/mage/sets/invasion/Repulse.java b/Mage.Sets/src/mage/sets/invasion/Repulse.java index 3e93749a41b..e3e3bf833dc 100644 --- a/Mage.Sets/src/mage/sets/invasion/Repulse.java +++ b/Mage.Sets/src/mage/sets/invasion/Repulse.java @@ -49,7 +49,7 @@ public class Repulse extends CardImpl { // Return target creature to its owner's hand. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/invasion/Shackles.java b/Mage.Sets/src/mage/sets/invasion/Shackles.java index 7c6550577a9..b91292b3659 100644 --- a/Mage.Sets/src/mage/sets/invasion/Shackles.java +++ b/Mage.Sets/src/mage/sets/invasion/Shackles.java @@ -60,7 +60,7 @@ public class Shackles extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); diff --git a/Mage.Sets/src/mage/sets/invasion/SpinalEmbrace.java b/Mage.Sets/src/mage/sets/invasion/SpinalEmbrace.java index 380146142f8..3eb25724a08 100644 --- a/Mage.Sets/src/mage/sets/invasion/SpinalEmbrace.java +++ b/Mage.Sets/src/mage/sets/invasion/SpinalEmbrace.java @@ -78,7 +78,7 @@ public class SpinalEmbrace extends CardImpl { ability.setRuleAtTheTop(true); this.addAbility(ability); // Untap target creature you don't control and gain control of it. It gains haste until end of turn. At the beginning of the next end step, sacrifice it. If you do, you gain life equal to its toughness. - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new UntapTargetEffect()); Effect effect = new GainControlTargetEffect(Duration.EndOfTurn); effect.setText("and gain control of it"); diff --git a/Mage.Sets/src/mage/sets/invasion/ThunderscapeApprentice.java b/Mage.Sets/src/mage/sets/invasion/ThunderscapeApprentice.java index 5d3b0eeb8a8..b1a18a32533 100644 --- a/Mage.Sets/src/mage/sets/invasion/ThunderscapeApprentice.java +++ b/Mage.Sets/src/mage/sets/invasion/ThunderscapeApprentice.java @@ -60,12 +60,12 @@ public class ThunderscapeApprentice extends CardImpl { // {B}, {tap}: Target player loses 1 life. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); // {G}, {tap}: Target creature gets +1/+1 until end of turn. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/invasion/ThunderscapeMaster.java b/Mage.Sets/src/mage/sets/invasion/ThunderscapeMaster.java index 523ceda0ef4..15b0466d908 100644 --- a/Mage.Sets/src/mage/sets/invasion/ThunderscapeMaster.java +++ b/Mage.Sets/src/mage/sets/invasion/ThunderscapeMaster.java @@ -64,7 +64,7 @@ public class ThunderscapeMaster extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2), new ManaCostsImpl("{B}{B}")); ability.addEffect(new GainLifeEffect(2)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); // {G}{G}, {tap}: Creatures you control get +2/+2 until end of turn. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("{G}{G}")); diff --git a/Mage.Sets/src/mage/sets/invasion/TsaboTavoc.java b/Mage.Sets/src/mage/sets/invasion/TsaboTavoc.java index 826dfcd11c9..00ef8fc1045 100644 --- a/Mage.Sets/src/mage/sets/invasion/TsaboTavoc.java +++ b/Mage.Sets/src/mage/sets/invasion/TsaboTavoc.java @@ -76,7 +76,7 @@ public class TsaboTavoc extends CardImpl { // {B}{B}, {tap}: Destroy target legendary creature. It can't be regenerated. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(true), new ManaCostsImpl("{B}{B}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filterDestroy, true)); + ability.addTarget(new TargetCreaturePermanent(filterDestroy)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/invasion/Void.java b/Mage.Sets/src/mage/sets/invasion/Void.java index f2d208af36e..65066933427 100644 --- a/Mage.Sets/src/mage/sets/invasion/Void.java +++ b/Mage.Sets/src/mage/sets/invasion/Void.java @@ -72,7 +72,7 @@ public class Void extends CardImpl { numberChoice.setChoices(numbers); numberChoice.setMessage("Choose a number"); this.getSpellAbility().addChoice(numberChoice); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new VoidEffect()); } diff --git a/Mage.Sets/src/mage/sets/invasion/Zap.java b/Mage.Sets/src/mage/sets/invasion/Zap.java index 9646cee711c..1325e05a566 100644 --- a/Mage.Sets/src/mage/sets/invasion/Zap.java +++ b/Mage.Sets/src/mage/sets/invasion/Zap.java @@ -49,7 +49,7 @@ public class Zap extends CardImpl { // Zap deals 1 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/AgentOfErebos.java b/Mage.Sets/src/mage/sets/journeyintonyx/AgentOfErebos.java index 483ce9c85f6..1ab85ac1018 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/AgentOfErebos.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/AgentOfErebos.java @@ -54,7 +54,7 @@ public class AgentOfErebos extends CardImpl { // Constellation - Whenever Agent of Erebos or another enchantment enters the battlefield under your control, exile all cards from target player's graveyard. Ability ability = new ConstellationAbility(new ExileGraveyardAllTargetPlayerEffect(), false); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/AkroanMastiff.java b/Mage.Sets/src/mage/sets/journeyintonyx/AkroanMastiff.java index c4904562ff3..6e80bfd785e 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/AkroanMastiff.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/AkroanMastiff.java @@ -58,7 +58,7 @@ public class AkroanMastiff extends CardImpl { // {W},{T}: Tap target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{W}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/ArmamentOfNyx.java b/Mage.Sets/src/mage/sets/journeyintonyx/ArmamentOfNyx.java index d936500a299..40b0eb684a8 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/ArmamentOfNyx.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/ArmamentOfNyx.java @@ -73,7 +73,7 @@ public class ArmamentOfNyx extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/AspectOfGorgon.java b/Mage.Sets/src/mage/sets/journeyintonyx/AspectOfGorgon.java index e9884f92dce..85036a31390 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/AspectOfGorgon.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/AspectOfGorgon.java @@ -60,7 +60,7 @@ public class AspectOfGorgon extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/AthreosGodOfPassage.java b/Mage.Sets/src/mage/sets/journeyintonyx/AthreosGodOfPassage.java index 43ed3247c11..191cb9ff66b 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/AthreosGodOfPassage.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/AthreosGodOfPassage.java @@ -88,7 +88,7 @@ public class AthreosGodOfPassage extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); // Whenever another creature you own dies, return it to your hand unless target opponent pays 3 life. Ability ability = new AthreosDiesCreatureTriggeredAbility(new AthreosGodOfPassageReturnEffect(), false, filter, true); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/BanishingLight.java b/Mage.Sets/src/mage/sets/journeyintonyx/BanishingLight.java index 90d2a89a7a5..6cf75ce9f15 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/BanishingLight.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/BanishingLight.java @@ -71,7 +71,7 @@ public class BanishingLight extends CardImpl { // When Banishing Light enters the battlefield, exile target nonland permanent an opponent controls until Banishing Light leaves the battlefield. Ability ability = new EntersBattlefieldTriggeredAbility(new BanishingLightExileEffect()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); // Implemented as triggered effect that doesn't uses the stack (implementation with watcher does not work correctly because if the returned creature // has a DiesTriggeredAll ability it triggers for the dying / battlefield leaving source object, what shouldn't happen) diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/BloodcrazedHoplite.java b/Mage.Sets/src/mage/sets/journeyintonyx/BloodcrazedHoplite.java index b3d148f42e1..3e76252f344 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/BloodcrazedHoplite.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/BloodcrazedHoplite.java @@ -72,7 +72,7 @@ public class BloodcrazedHoplite extends CardImpl { this.addAbility(new HeroicAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(), false))); // Whenever a +1/+1 counter is placed on Bloodcrazed Hoplite, remove a +1/+1 counter from target creature an opponent controls. Ability ability = new BloodcrazedHopliteTriggeredAbility(); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/BrainMaggot.java b/Mage.Sets/src/mage/sets/journeyintonyx/BrainMaggot.java index 1ec10e98cde..255cbd5b30c 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/BrainMaggot.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/BrainMaggot.java @@ -68,7 +68,7 @@ public class BrainMaggot extends CardImpl { // When Brain Maggot enters the battlefield, target opponent reveals his or her hand and you choose a nonland card from it. Exile that card until Brain Maggot leaves the battlefield. Ability ability = new EntersBattlefieldTriggeredAbility(new BrainMaggotExileEffect()); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); // Implemented as triggered effect that doesn't uses the stack (implementation with watcher does not work correctly because if the returned creature // has a DiesTriggeredAll ability it triggers for the dying / battlefield leaving source object, what shouldn't happen) diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/CastIntoDarkness.java b/Mage.Sets/src/mage/sets/journeyintonyx/CastIntoDarkness.java index 565c84c47be..4b0865196e8 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/CastIntoDarkness.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/CastIntoDarkness.java @@ -59,7 +59,7 @@ public class CastIntoDarkness extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/Deicide.java b/Mage.Sets/src/mage/sets/journeyintonyx/Deicide.java index ffc37c845d9..1d406c1b215 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/Deicide.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/Deicide.java @@ -57,7 +57,7 @@ public class Deicide extends CardImpl { // Exile target enchantment. If the exiled card is a God card, search its controller's graveyard, hand, and library for any number of cards with the same name as that card and exile them, then that player shuffles his or her library. this.getSpellAbility().addEffect(new DeicideExileEffect()); - this.getSpellAbility().addTarget(new TargetEnchantmentPermanent(true)); + this.getSpellAbility().addTarget(new TargetEnchantmentPermanent()); } public Deicide(final Deicide card) { diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/DesecrationPlague.java b/Mage.Sets/src/mage/sets/journeyintonyx/DesecrationPlague.java index 5c32bf40846..69912a120f1 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/DesecrationPlague.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/DesecrationPlague.java @@ -57,7 +57,7 @@ public class DesecrationPlague extends CardImpl { // Destroy target enchantment or land. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/DesertersQuarters.java b/Mage.Sets/src/mage/sets/journeyintonyx/DesertersQuarters.java index 77ae6756cee..c68db17f83b 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/DesertersQuarters.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/DesertersQuarters.java @@ -62,7 +62,7 @@ public class DesertersQuarters extends CardImpl { // {6}, T: Tap target creature. It doesn't untap during its controller's untap step for as long as Deserter's Quarters remains tapped. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DesertersQuartersTapTargetEffect(), new GenericManaCost(6)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DesertersQuartersRestrictionEffect())); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/DreadbringerLampads.java b/Mage.Sets/src/mage/sets/journeyintonyx/DreadbringerLampads.java index e9856b1f247..71050ad1c2d 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/DreadbringerLampads.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/DreadbringerLampads.java @@ -56,7 +56,7 @@ public class DreadbringerLampads extends CardImpl { // Constellation - Whenever Dreadbringer Lampads or another enchantment enters the battlefield under your control, target creature gains intimidate until end of turn. Ability ability = new ConstellationAbility(new GainAbilityTargetEffect(IntimidateAbility.getInstance(), Duration.EndOfTurn), false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/FeastOfDreams.java b/Mage.Sets/src/mage/sets/journeyintonyx/FeastOfDreams.java index 88ebec9ec62..ed4efe82512 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/FeastOfDreams.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/FeastOfDreams.java @@ -63,7 +63,7 @@ public class FeastOfDreams extends CardImpl { // Destroy target enchanted creature or enchantment creature. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); } public FeastOfDreams(final FeastOfDreams card) { diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/FlamespeakersWill.java b/Mage.Sets/src/mage/sets/journeyintonyx/FlamespeakersWill.java index 86009dc02bc..8e639284972 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/FlamespeakersWill.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/FlamespeakersWill.java @@ -62,7 +62,7 @@ public class FlamespeakersWill extends CardImpl { this.color.setRed(true); // Enchant creature you control - TargetPermanent auraTarget = new TargetControlledCreaturePermanent(true); + TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); @@ -73,7 +73,7 @@ public class FlamespeakersWill extends CardImpl { // Whenever enchanted creature deals combat damage to a player, you may sacrifice Flamespeaker's Will. If you do, destroy target artifact. ability = new DealsDamageToAPlayerAttachedTriggeredAbility( new DoIfCostPaid(new DestroyTargetEffect(), new SacrificeSourceCost()), "enchanted creature", false, false, true, TargetController.ANY); - ability.addTarget(new TargetArtifactPermanent(true)); + ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/FontOfIre.java b/Mage.Sets/src/mage/sets/journeyintonyx/FontOfIre.java index f77c9928472..7d8aaba6a14 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/FontOfIre.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/FontOfIre.java @@ -54,7 +54,7 @@ public class FontOfIre extends CardImpl { // {3}{R}, Sacrifice Font of Ire: Font of Ire deals 5 damage to target player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(5), new ManaCostsImpl("{3}{R}")); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/ForgebornOreads.java b/Mage.Sets/src/mage/sets/journeyintonyx/ForgebornOreads.java index 56df47764c1..103e0ae4785 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/ForgebornOreads.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/ForgebornOreads.java @@ -54,7 +54,7 @@ public class ForgebornOreads extends CardImpl { // Constellation - Whenever Forgeborn Oreads or another enchantment enters the battlefield under your control, Forgeborn Oreads deals 1 damage to target creature or player. Ability ability = new ConstellationAbility(new DamageTargetEffect(1)); - ability.addTarget(new TargetCreatureOrPlayer(true)); + ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/Godsend.java b/Mage.Sets/src/mage/sets/journeyintonyx/Godsend.java index 81c9951c363..4accb0c6e3a 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/Godsend.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/Godsend.java @@ -151,7 +151,7 @@ class GodsendTriggeredAbility extends TriggeredAbilityImpl { uuidPredicates.add(new PermanentIdPredicate(creatureId)); } filter.add(Predicates.or(uuidPredicates)); - this.getTargets().add(new TargetCreaturePermanent(filter, true)); + this.getTargets().add(new TargetCreaturePermanent(filter)); } return true; } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/GoldenhideOx.java b/Mage.Sets/src/mage/sets/journeyintonyx/GoldenhideOx.java index cac3c5fe3f6..16aa383a16d 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/GoldenhideOx.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/GoldenhideOx.java @@ -55,7 +55,7 @@ public class GoldenhideOx extends CardImpl { // Constellation - Whenever Goldenhide Ox or another enchantment enters the battlefield under your control, target creature must be blocked this turn if able. Ability ability = new ConstellationAbility(new MustBeBlockedByAtLeastOneTargetEffect(Duration.EndOfTurn), false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/HarvestguardAlseids.java b/Mage.Sets/src/mage/sets/journeyintonyx/HarvestguardAlseids.java index 80897951b5b..d47b6df7349 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/HarvestguardAlseids.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/HarvestguardAlseids.java @@ -55,7 +55,7 @@ public class HarvestguardAlseids extends CardImpl { // Constellation — Whenever Harvestguard Alseids or another enchantment enters the battlefield under your control, prevent all damage that would be dealt to target creature this turn. Ability ability = new ConstellationAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, Integer.MAX_VALUE), false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/Hubris.java b/Mage.Sets/src/mage/sets/journeyintonyx/Hubris.java index 04803b8aa14..15195ac5e13 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/Hubris.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/Hubris.java @@ -56,7 +56,7 @@ public class Hubris extends CardImpl { // Return target creature and all Auras attached to it to their owners' hand. this.getSpellAbility().addEffect(new HubrisReturnEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/KeranosGodOfStorms.java b/Mage.Sets/src/mage/sets/journeyintonyx/KeranosGodOfStorms.java index 100a8f2ded3..69f82edc831 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/KeranosGodOfStorms.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/KeranosGodOfStorms.java @@ -127,7 +127,7 @@ class KeranosGodOfStormsTriggeredAbility extends TriggeredAbilityImpl { this.addEffect(new DrawCardSourceControllerEffect(1)); } else { this.addEffect(new DamageTargetEffect(3)); - this.addTarget(new TargetCreatureOrPlayer(true)); + this.addTarget(new TargetCreatureOrPlayer()); } return true; } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/KingMacarTheGoldCursed.java b/Mage.Sets/src/mage/sets/journeyintonyx/KingMacarTheGoldCursed.java index a417ed1adaa..151d966b871 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/KingMacarTheGoldCursed.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/KingMacarTheGoldCursed.java @@ -60,7 +60,7 @@ public class KingMacarTheGoldCursed extends CardImpl { // Inspired - Whenever King Macar, the Gold-Cursed becomes untapped, you may exile target creature. If you do, put a colorless artifact token named Gold onto the battlefield. It has "Sacrifice this artifact: Add one mana of any color to your mana pool." Ability ability = new InspiredAbility(new ExileTargetEffect(), true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); Effect effect = new CreateTokenEffect(new GoldToken()); effect.setText("If you do, put a colorless artifact token named Gold onto the battlefield. It has \"Sacrifice this artifact: Add one mana of any color to your mana pool.\""); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/KnowledgeAndPower.java b/Mage.Sets/src/mage/sets/journeyintonyx/KnowledgeAndPower.java index 1511dbc73ae..3be926bf291 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/KnowledgeAndPower.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/KnowledgeAndPower.java @@ -76,7 +76,7 @@ class ScryTriggeredAbility extends TriggeredAbilityImpl { public ScryTriggeredAbility() { super(Zone.BATTLEFIELD, new DoIfCostPaid(new DamageTargetEffect(2), new GenericManaCost(2)), false); - this.addTarget(new TargetCreatureOrPlayer(true)); + this.addTarget(new TargetCreatureOrPlayer()); } public ScryTriggeredAbility(final ScryTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/LeoninIconoclast.java b/Mage.Sets/src/mage/sets/journeyintonyx/LeoninIconoclast.java index cd7cd3e39ef..94573d36a24 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/LeoninIconoclast.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/LeoninIconoclast.java @@ -67,7 +67,7 @@ public class LeoninIconoclast extends CardImpl { // Heroic — Whenever you cast a spell that targets Leonin Iconoclast, destroy target enchantment creature an opponent controls. Ability ability = new HeroicAbility(new DestroyTargetEffect()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/LightningDiadem.java b/Mage.Sets/src/mage/sets/journeyintonyx/LightningDiadem.java index f456b4d6f06..cb11d972cc6 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/LightningDiadem.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/LightningDiadem.java @@ -59,7 +59,7 @@ public class LightningDiadem extends CardImpl { this.color.setRed(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); @@ -67,7 +67,7 @@ public class LightningDiadem extends CardImpl { // When Lightning Diadem enters the battlefield, it deals 2 damage to target creature or player. ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(2)); - ability.addTarget(new TargetCreatureOrPlayer(true)); + ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); // Enchanted creature gets +2/+2. diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/MortalObstinacy.java b/Mage.Sets/src/mage/sets/journeyintonyx/MortalObstinacy.java index 3e90c91964e..c9bfc6ad4e0 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/MortalObstinacy.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/MortalObstinacy.java @@ -65,7 +65,7 @@ public class MortalObstinacy extends CardImpl { this.color.setWhite(true); // Enchant creature you control - TargetPermanent auraTarget = new TargetControlledCreaturePermanent(true); + TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); @@ -92,7 +92,7 @@ class MortalObstinacyAbility extends TriggeredAbilityImpl { public MortalObstinacyAbility() { super(Zone.BATTLEFIELD, new DoIfCostPaid(new DestroyTargetEffect(), new SacrificeSourceCost())); - addTarget(new TargetEnchantmentPermanent(true)); + addTarget(new TargetEnchantmentPermanent()); } public MortalObstinacyAbility(final MortalObstinacyAbility ability) { diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/NightmarishEnd.java b/Mage.Sets/src/mage/sets/journeyintonyx/NightmarishEnd.java index eec042c1adb..b402396296e 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/NightmarishEnd.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/NightmarishEnd.java @@ -56,7 +56,7 @@ public class NightmarishEnd extends CardImpl { Effect effect = new BoostTargetEffect(xValue, xValue, Duration.EndOfTurn, true); effect.setText("Target creature gets -X/-X until end of turn, where X is the number of cards in your hand"); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public NightmarishEnd(final NightmarishEnd card) { diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/NyxInfusion.java b/Mage.Sets/src/mage/sets/journeyintonyx/NyxInfusion.java index f2fd247b6c8..f5036f47ce9 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/NyxInfusion.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/NyxInfusion.java @@ -68,7 +68,7 @@ public class NyxInfusion extends CardImpl { // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/NyxWeaver.java b/Mage.Sets/src/mage/sets/journeyintonyx/NyxWeaver.java index aad777172eb..a5f612dc342 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/NyxWeaver.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/NyxWeaver.java @@ -67,7 +67,7 @@ public class NyxWeaver extends CardImpl { // {1}{B}{G}, Exile Nyx Weaver: Return target card from your graveyard to your hand. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl("{1}{B}{G}")); ability.addCost(new ExileSourceCost()); - ability.addTarget(new TargetCardInYourGraveyard(true)); + ability.addTarget(new TargetCardInYourGraveyard()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/OakheartDryads.java b/Mage.Sets/src/mage/sets/journeyintonyx/OakheartDryads.java index a1637449d24..8882e1188b4 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/OakheartDryads.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/OakheartDryads.java @@ -56,7 +56,7 @@ public class OakheartDryads extends CardImpl { // Constellation - Whenever Oakheart Dryads or another enchantment enters the battlefield under your control, target creature gets +1/+1 until end of turn. Ability ability = new ConstellationAbility(new BoostTargetEffect(1,1, Duration.EndOfTurn), false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/OppressiveRays.java b/Mage.Sets/src/mage/sets/journeyintonyx/OppressiveRays.java index c57348c5a50..9c3f45f649b 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/OppressiveRays.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/OppressiveRays.java @@ -66,7 +66,7 @@ public class OppressiveRays extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/PinToTheEarth.java b/Mage.Sets/src/mage/sets/journeyintonyx/PinToTheEarth.java index ef60099d24c..710674c20ef 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/PinToTheEarth.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/PinToTheEarth.java @@ -56,7 +56,7 @@ public class PinToTheEarth extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/QuarryColossus.java b/Mage.Sets/src/mage/sets/journeyintonyx/QuarryColossus.java index bc8bb2b6343..92ff675aaf7 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/QuarryColossus.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/QuarryColossus.java @@ -66,7 +66,7 @@ public class QuarryColossus extends CardImpl { // When Quarry Colossus enters the battlefield, put target creature into its owner's library just beneath the top X cards of that library, where X is the number of Plains you control. Ability ability = new EntersBattlefieldTriggeredAbility(new QuarryColossusReturnLibraryEffect(), false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/RiddleOfLightning.java b/Mage.Sets/src/mage/sets/journeyintonyx/RiddleOfLightning.java index 1fe47d0f7a3..2b58714d09b 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/RiddleOfLightning.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/RiddleOfLightning.java @@ -56,7 +56,7 @@ public class RiddleOfLightning extends CardImpl { this.color.setRed(true); // Choose target creature or player. Scry 3, then reveal the top card of your library. Riddle of Lightning deals damage equal to that card's converted mana cost to that creature or player. - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); Effect effect = new ScryEffect(3); effect.setText("Choose target creature or player. Scry 3"); this.getSpellAbility().addEffect(effect); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/RitualOfTheReturned.java b/Mage.Sets/src/mage/sets/journeyintonyx/RitualOfTheReturned.java index 7762a43410c..82df2502d68 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/RitualOfTheReturned.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/RitualOfTheReturned.java @@ -59,7 +59,7 @@ public class RitualOfTheReturned extends CardImpl { // Exile target creature card from your graveyard. Put a black Zombie creature token onto the battlefield with power equal to the exiled card's power and toughness equal to the exiled card's toughness. this.getSpellAbility().addEffect(new RitualOfTheReturnedExileEffect()); - this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard(), true)); + this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard())); } public RitualOfTheReturned(final RitualOfTheReturned card) { diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/SatyrGrovedancer.java b/Mage.Sets/src/mage/sets/journeyintonyx/SatyrGrovedancer.java index bd461f0f794..93a2e81b3de 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/SatyrGrovedancer.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/SatyrGrovedancer.java @@ -56,7 +56,7 @@ public class SatyrGrovedancer extends CardImpl { // When Satyr Grovedancer enters the battlefield, put a +1/+1 counter on target creature. Ability ability = new EntersBattlefieldTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/SetessanTactics.java b/Mage.Sets/src/mage/sets/journeyintonyx/SetessanTactics.java index be91c109ddb..c40d052d2d2 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/SetessanTactics.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/SetessanTactics.java @@ -71,7 +71,7 @@ public class SetessanTactics extends CardImpl { effect.setText("Until end of turn, any number of target creatures each get +1/+1"); this.getSpellAbility().addEffect(effect); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new FightTargetSourceEffect(), new TapSourceCost()); - gainedAbility.addTarget(new TargetCreaturePermanent(filter, true)); + gainedAbility.addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(gainedAbility, Duration.EndOfTurn, "and gain \"T: This creature fights another target creature")); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/Skybind.java b/Mage.Sets/src/mage/sets/journeyintonyx/Skybind.java index 217bbc5a8c3..1528df2b7b3 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/Skybind.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/Skybind.java @@ -65,7 +65,7 @@ public class Skybind extends CardImpl { // Constellation — When Skybind or another enchantment enters the battlefield under your control, exile target nonenchantment permanent. Return that card to the battlefield under its owner's control at the beginning of the next end step. Ability ability = new ConstellationAbility(new SkybindEffect(), false); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/SpawnOfThraxes.java b/Mage.Sets/src/mage/sets/journeyintonyx/SpawnOfThraxes.java index 39c3638d1f8..fd3b37e525b 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/SpawnOfThraxes.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/SpawnOfThraxes.java @@ -66,7 +66,7 @@ public class SpawnOfThraxes extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Spawn of Thraxes enters the battlefield, it deals damage to target creature or player equal to the number of Mountains you control. Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter))); - ability.addTarget(new TargetCreatureOrPlayer(true)); + ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/SpiteOfMogis.java b/Mage.Sets/src/mage/sets/journeyintonyx/SpiteOfMogis.java index cb31ed5df52..03cd7c5bf4f 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/SpiteOfMogis.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/SpiteOfMogis.java @@ -51,7 +51,7 @@ public class SpiteOfMogis extends CardImpl { // Spite of Mogis deals damage to target creature equal to the number of instant and sorcery cards in your graveyard. Scry 1. this.getSpellAbility().addEffect(new DamageTargetEffect(new CardsInControllerGraveyardCount(new FilterInstantOrSorceryCard("instant and sorcery cards")))); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new ScryEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/SpitefulBlow.java b/Mage.Sets/src/mage/sets/journeyintonyx/SpitefulBlow.java index bf18b44f7e5..33651c06cd2 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/SpitefulBlow.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/SpitefulBlow.java @@ -52,7 +52,7 @@ public class SpitefulBlow extends CardImpl { // Destroy target creature and target land. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); Effect effect = new DestroyTargetEffect(); effect.setText("and target land"); effect.setTargetPointer(new SecondTargetPointer()); diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/Starfall.java b/Mage.Sets/src/mage/sets/journeyintonyx/Starfall.java index c8f92efac1a..3968b9f66de 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/Starfall.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/Starfall.java @@ -53,7 +53,7 @@ public class Starfall extends CardImpl { this.color.setRed(true); // Starfall deals 3 damage to target creature. If that creature is an enchantment, Starfall deals 3 damage to that creature's controller. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new StarfallEffect()); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/StonewiseFortifier.java b/Mage.Sets/src/mage/sets/journeyintonyx/StonewiseFortifier.java index 8063fb6c2f1..0d5cd2a7524 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/StonewiseFortifier.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/StonewiseFortifier.java @@ -61,7 +61,7 @@ public class StonewiseFortifier extends CardImpl { // {4}{W}: Prevent all damage that would be dealt to Stonewise Fortifier by target creature this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new StonewiseFortifierPreventAllDamageToEffect(), new ManaCostsImpl("{4}{W}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/StrengthFromTheFallen.java b/Mage.Sets/src/mage/sets/journeyintonyx/StrengthFromTheFallen.java index 75b04e01a48..4eb4db003d0 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/StrengthFromTheFallen.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/StrengthFromTheFallen.java @@ -55,7 +55,7 @@ public class StrengthFromTheFallen extends CardImpl { // Constellation - Whenever Strength from the Fallen or another entchantment enters the battlefield under your control, target creature gets +X/+X until end of turn, where X is the number of creature cards in your graveyard. DynamicValue xValue = new CardsInControllerGraveyardCount(new FilterCreatureCard("creature cards")); Ability ability = new ConstellationAbility(new BoostTargetEffect(xValue, xValue, Duration.EndOfTurn, true)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/SupplyLineCranes.java b/Mage.Sets/src/mage/sets/journeyintonyx/SupplyLineCranes.java index fd84b5d51cb..b7194261b06 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/SupplyLineCranes.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/SupplyLineCranes.java @@ -58,7 +58,7 @@ public class SupplyLineCranes extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Supply-Line Cranes enters the battlefield, put a +1/+1 counter on target creature. Ability ability = new EntersBattlefieldTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance())); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/ThassasDevourer.java b/Mage.Sets/src/mage/sets/journeyintonyx/ThassasDevourer.java index 4a85441cb77..1db68b64085 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/ThassasDevourer.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/ThassasDevourer.java @@ -54,7 +54,7 @@ public class ThassasDevourer extends CardImpl { // Constellation — Whenever Thassa's Devourer or another enchantment enters the battlefield under your control, target player puts the top two cards of his or her library into his or her graveyard. Ability ability = new ConstellationAbility(new PutTopCardOfLibraryIntoGraveTargetEffect(2), false); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/ThassasIre.java b/Mage.Sets/src/mage/sets/journeyintonyx/ThassasIre.java index 19dd952a36f..fd46c0cc0e1 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/ThassasIre.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/ThassasIre.java @@ -53,7 +53,7 @@ public class ThassasIre extends CardImpl { // {3}{U}: You may tap or untap target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new ManaCostsImpl("{3}{U}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/TormentedThoughts.java b/Mage.Sets/src/mage/sets/journeyintonyx/TormentedThoughts.java index eb09362b7fd..c2e3e3c24ef 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/TormentedThoughts.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/TormentedThoughts.java @@ -60,7 +60,7 @@ public class TormentedThoughts extends CardImpl { // Target player discards a number of cards equal to the sacrificed creature's power. this.getSpellAbility().addEffect(new TormentedThoughtsDiscardEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public TormentedThoughts(final TormentedThoughts card) { diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/TritonCavalry.java b/Mage.Sets/src/mage/sets/journeyintonyx/TritonCavalry.java index ac5179cdbeb..e02f803f1fe 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/TritonCavalry.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/TritonCavalry.java @@ -55,7 +55,7 @@ public class TritonCavalry extends CardImpl { // Heroic — Whenever you cast a spell that targets Triton Cavalry, you may return target enchantment to its owner's hand. Ability ability = new HeroicAbility(new ReturnToHandTargetEffect(), true); - ability.addTarget(new TargetEnchantmentPermanent(true)); + ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/WhitewaterNaiads.java b/Mage.Sets/src/mage/sets/journeyintonyx/WhitewaterNaiads.java index 4bcb79e8534..774d9787110 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/WhitewaterNaiads.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/WhitewaterNaiads.java @@ -55,7 +55,7 @@ public class WhitewaterNaiads extends CardImpl { // Constellation - Whenever Whitewater Naiads or another enchantment enters the battlefield under your control, target creature can't be blocked this turn. Ability ability = new ConstellationAbility(new CantBeBlockedTargetEffect(Duration.EndOfTurn), false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/WorstFears.java b/Mage.Sets/src/mage/sets/journeyintonyx/WorstFears.java index d39a5851c08..b5ea6bf9a01 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/WorstFears.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/WorstFears.java @@ -49,7 +49,7 @@ public class WorstFears extends CardImpl { // You control target player during that player's next turn. Exile Worst Fears. (You see all cards that player could see and make all decisions for that player.) this.getSpellAbility().addEffect(new ControlTargetPlayerNextTurnEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(ExileSpellEffect.getInstance()); } diff --git a/Mage.Sets/src/mage/sets/judgment/CabalTherapy.java b/Mage.Sets/src/mage/sets/judgment/CabalTherapy.java index 81291548204..0990589c10b 100644 --- a/Mage.Sets/src/mage/sets/judgment/CabalTherapy.java +++ b/Mage.Sets/src/mage/sets/judgment/CabalTherapy.java @@ -60,7 +60,7 @@ public class CabalTherapy extends CardImpl { this.color.setBlack(true); // Name a nonland card. Target player reveals his or her hand and discards all cards with that name. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new CabalTherapyEffect()); // Flashback-Sacrifice a creature. this.addAbility(new FlashbackAbility( diff --git a/Mage.Sets/src/mage/sets/judgment/ElephantGuide.java b/Mage.Sets/src/mage/sets/judgment/ElephantGuide.java index 87156e15691..926f63a6759 100644 --- a/Mage.Sets/src/mage/sets/judgment/ElephantGuide.java +++ b/Mage.Sets/src/mage/sets/judgment/ElephantGuide.java @@ -59,7 +59,7 @@ public class ElephantGuide extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/judgment/Genesis.java b/Mage.Sets/src/mage/sets/judgment/Genesis.java index ad83ead7d99..9c70bbb7ecc 100644 --- a/Mage.Sets/src/mage/sets/judgment/Genesis.java +++ b/Mage.Sets/src/mage/sets/judgment/Genesis.java @@ -61,7 +61,7 @@ public class Genesis extends CardImpl { // At the beginning of your upkeep, if Genesis is in your graveyard, you may pay {2}{G}. If you do, return target creature card from your graveyard to your hand. Ability ability = new BeginningOfUpkeepTriggeredAbility( Zone.GRAVEYARD, new DoIfCostPaid(new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl("{3}")),TargetController.YOU, false, false); - ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard"), true)); + ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard"))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/judgment/GoretuskFirebeast.java b/Mage.Sets/src/mage/sets/judgment/GoretuskFirebeast.java index 5a268b12b51..46e88fe45bf 100644 --- a/Mage.Sets/src/mage/sets/judgment/GoretuskFirebeast.java +++ b/Mage.Sets/src/mage/sets/judgment/GoretuskFirebeast.java @@ -56,7 +56,7 @@ public class GoretuskFirebeast extends CardImpl { // When Goretusk Firebeast enters the battlefield, it deals 4 damage to target player. Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(4), false); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/judgment/QuietSpeculation.java b/Mage.Sets/src/mage/sets/judgment/QuietSpeculation.java index ea45bf0c175..211d2494fa4 100644 --- a/Mage.Sets/src/mage/sets/judgment/QuietSpeculation.java +++ b/Mage.Sets/src/mage/sets/judgment/QuietSpeculation.java @@ -69,7 +69,7 @@ public class QuietSpeculation extends CardImpl { // Search target player's library for up to three cards with flashback and put them into that player's graveyard. Then the player shuffles his or her library. TargetCardInLibrary target = new TargetCardInLibrary(0, 3, filterCard); this.getSpellAbility().addEffect(new SearchLibraryPutInGraveEffect(target)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public QuietSpeculation(final QuietSpeculation card) { diff --git a/Mage.Sets/src/mage/sets/judgment/SylvanSafekeeper.java b/Mage.Sets/src/mage/sets/judgment/SylvanSafekeeper.java index ce5d940f1e4..d02e48762e3 100644 --- a/Mage.Sets/src/mage/sets/judgment/SylvanSafekeeper.java +++ b/Mage.Sets/src/mage/sets/judgment/SylvanSafekeeper.java @@ -63,7 +63,7 @@ public class SylvanSafekeeper extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledPermanent(new FilterControlledLandPermanent("a land")))); - ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/judgment/ThrissNantukoPrimus.java b/Mage.Sets/src/mage/sets/judgment/ThrissNantukoPrimus.java index 921e99688f7..dab514189dc 100644 --- a/Mage.Sets/src/mage/sets/judgment/ThrissNantukoPrimus.java +++ b/Mage.Sets/src/mage/sets/judgment/ThrissNantukoPrimus.java @@ -60,7 +60,7 @@ public class ThrissNantukoPrimus extends CardImpl { //G}, {T}: Target creature gets +5/+5 until end of turn. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(5, 5, Duration.EndOfTurn), new ManaCostsImpl("{G}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/judgment/UnquestionedAuthority.java b/Mage.Sets/src/mage/sets/judgment/UnquestionedAuthority.java index def0b58e826..184117cb924 100644 --- a/Mage.Sets/src/mage/sets/judgment/UnquestionedAuthority.java +++ b/Mage.Sets/src/mage/sets/judgment/UnquestionedAuthority.java @@ -62,7 +62,7 @@ public class UnquestionedAuthority extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/legends/DemonicTorment.java b/Mage.Sets/src/mage/sets/legends/DemonicTorment.java index a95ddb66dad..76270f261b1 100644 --- a/Mage.Sets/src/mage/sets/legends/DemonicTorment.java +++ b/Mage.Sets/src/mage/sets/legends/DemonicTorment.java @@ -58,7 +58,7 @@ public class DemonicTorment extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/legends/Karakas.java b/Mage.Sets/src/mage/sets/legends/Karakas.java index 568ac2c8ae8..f62a0489904 100644 --- a/Mage.Sets/src/mage/sets/legends/Karakas.java +++ b/Mage.Sets/src/mage/sets/legends/Karakas.java @@ -62,7 +62,7 @@ public class Karakas extends CardImpl { this.addAbility(new WhiteManaAbility()); // {tap}: Return target legendary creature to its owner's hand. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/legends/XiraArien.java b/Mage.Sets/src/mage/sets/legends/XiraArien.java index be830d15d54..c053fa70a81 100644 --- a/Mage.Sets/src/mage/sets/legends/XiraArien.java +++ b/Mage.Sets/src/mage/sets/legends/XiraArien.java @@ -65,7 +65,7 @@ public class XiraArien extends CardImpl { // {B}{R}{G}, {tap}: Target player draws a card. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardTargetEffect(1), new ManaCostsImpl("{B}{R}{G}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/legions/GempalmIncinerator.java b/Mage.Sets/src/mage/sets/legions/GempalmIncinerator.java index 1486d601e49..a4e9f6d52db 100644 --- a/Mage.Sets/src/mage/sets/legions/GempalmIncinerator.java +++ b/Mage.Sets/src/mage/sets/legions/GempalmIncinerator.java @@ -66,7 +66,7 @@ public class GempalmIncinerator extends CardImpl { this.addAbility(new CyclingAbility(new ManaCostsImpl("{1}{R}"))); // When you cycle Gempalm Incinerator, you may have it deal X damage to target creature, where X is the number of Goblins on the battlefield. Ability ability = new CycleTriggeredAbility(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)),true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/legions/HunterSliver.java b/Mage.Sets/src/mage/sets/legions/HunterSliver.java index 8f066bae736..f95539dcd87 100644 --- a/Mage.Sets/src/mage/sets/legions/HunterSliver.java +++ b/Mage.Sets/src/mage/sets/legions/HunterSliver.java @@ -61,7 +61,7 @@ public class HunterSliver extends CardImpl { // All Sliver creatures have provoke. Ability ability = new AttacksTriggeredAbility(new ProvokeEffect(), true, "may have target creature untap and block if able"); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, new FilterCreaturePermanent("Sliver", "Sliver creatures")))); } diff --git a/Mage.Sets/src/mage/sets/legions/NantukoVigilante.java b/Mage.Sets/src/mage/sets/legions/NantukoVigilante.java index 102cb4af9ff..2a145b8aaca 100644 --- a/Mage.Sets/src/mage/sets/legions/NantukoVigilante.java +++ b/Mage.Sets/src/mage/sets/legions/NantukoVigilante.java @@ -71,7 +71,7 @@ public class NantukoVigilante extends CardImpl { this.addAbility(new MorphAbility(this,new ManaCostsImpl("{1}{G}"))); // When Nantuko Vigilante is turned face up, destroy target artifact or enchantment. Ability ability = new TurnedFaceUpTriggeredAbility(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/limitedalpha/AncestralRecall.java b/Mage.Sets/src/mage/sets/limitedalpha/AncestralRecall.java index fa6cf35d836..96a136e73d1 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/AncestralRecall.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/AncestralRecall.java @@ -48,7 +48,7 @@ public class AncestralRecall extends CardImpl { // Target player draws three cards. this.getSpellAbility().addEffect(new DrawCardTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public AncestralRecall(final AncestralRecall card) { diff --git a/Mage.Sets/src/mage/sets/limitedalpha/AnimateWall.java b/Mage.Sets/src/mage/sets/limitedalpha/AnimateWall.java index ac11b132923..28a4ebe4326 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/AnimateWall.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/AnimateWall.java @@ -67,7 +67,7 @@ public class AnimateWall extends CardImpl { this.color.setWhite(true); // Enchant Wall - TargetPermanent auraTarget = new TargetCreaturePermanent(filter, true); + TargetPermanent auraTarget = new TargetCreaturePermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/AspectOfWolf.java b/Mage.Sets/src/mage/sets/limitedalpha/AspectOfWolf.java index 979899eb844..fb1d2183765 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/AspectOfWolf.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/AspectOfWolf.java @@ -58,7 +58,7 @@ public class AspectOfWolf extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Braingeyser.java b/Mage.Sets/src/mage/sets/limitedalpha/Braingeyser.java index 0c0b83207d3..c36107a11db 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Braingeyser.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Braingeyser.java @@ -50,7 +50,7 @@ public class Braingeyser extends CardImpl { // Target player draws X cards. this.getSpellAbility().addEffect(new DrawCardTargetEffect(new ManacostVariableValue())); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Burrowing.java b/Mage.Sets/src/mage/sets/limitedalpha/Burrowing.java index 9a415d17997..c7a28b416a9 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Burrowing.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Burrowing.java @@ -64,7 +64,7 @@ public class Burrowing extends CardImpl { // Enchant creature // Enchanted creature has mountainwalk. - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Conservator.java b/Mage.Sets/src/mage/sets/limitedalpha/Conservator.java index 4f19b90b2cb..4dcb6db620e 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Conservator.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Conservator.java @@ -56,7 +56,7 @@ public class Conservator extends CardImpl { // {3}, {tap}: Prevent the next 2 damage that would be dealt to you this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConservatorEffect(), new GenericManaCost(3)); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/limitedalpha/ControlMagic.java b/Mage.Sets/src/mage/sets/limitedalpha/ControlMagic.java index 2c6944afe9f..b62773cd586 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/ControlMagic.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/ControlMagic.java @@ -56,7 +56,7 @@ public class ControlMagic extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/CopyArtifact.java b/Mage.Sets/src/mage/sets/limitedalpha/CopyArtifact.java index 47fd5a8b862..7637f88a138 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/CopyArtifact.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/CopyArtifact.java @@ -99,7 +99,7 @@ class CopyArtifactEffect extends OneShotEffect { Player player = game.getPlayer(source.getControllerId()); Permanent sourcePermanent = game.getPermanent(source.getSourceId()); if (player != null && sourcePermanent != null) { - Target target = new TargetPermanent(filter, true); + Target target = new TargetPermanent(filter); if (target.canChoose(source.getControllerId(), game)) { player.choose(Outcome.Copy, target, source.getSourceId(), game); Permanent copyFromPermanent = game.getPermanent(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/sets/limitedalpha/DeathWard.java b/Mage.Sets/src/mage/sets/limitedalpha/DeathWard.java index 40cc813063c..e34827389a5 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/DeathWard.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/DeathWard.java @@ -49,7 +49,7 @@ public class DeathWard extends CardImpl { // Regenerate target creature. this.getSpellAbility().addEffect(new RegenerateTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public DeathWard(final DeathWard card) { diff --git a/Mage.Sets/src/mage/sets/limitedalpha/GlassesOfUrza.java b/Mage.Sets/src/mage/sets/limitedalpha/GlassesOfUrza.java index adcf481a4d2..e32b97cc124 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/GlassesOfUrza.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/GlassesOfUrza.java @@ -50,7 +50,7 @@ public class GlassesOfUrza extends CardImpl { // {tap}: Look at target player's hand. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LookAtTargetPlayerHandEffect(), new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/limitedalpha/HowlFromBeyond.java b/Mage.Sets/src/mage/sets/limitedalpha/HowlFromBeyond.java index 15f76469fff..2c37dcf9fd4 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/HowlFromBeyond.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/HowlFromBeyond.java @@ -52,7 +52,7 @@ public class HowlFromBeyond extends CardImpl { // Target creature gets +X/+0 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(new ManacostVariableValue(), new StaticValue(0), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public HowlFromBeyond(final HowlFromBeyond card) { diff --git a/Mage.Sets/src/mage/sets/limitedalpha/JadeMonolith.java b/Mage.Sets/src/mage/sets/limitedalpha/JadeMonolith.java index f6208c4831c..a27d5fcc2c2 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/JadeMonolith.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/JadeMonolith.java @@ -60,7 +60,7 @@ public class JadeMonolith extends CardImpl { // {1}: The next time a source of your choice would deal damage to target creature this turn, that source deals that damage to you instead. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new JadeMonolithRedirectionEffect(), new GenericManaCost(1)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/limitedalpha/ManaShort.java b/Mage.Sets/src/mage/sets/limitedalpha/ManaShort.java index 0d235d637c8..393ab5fefca 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/ManaShort.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/ManaShort.java @@ -56,7 +56,7 @@ public class ManaShort extends CardImpl { // Tap all lands target player controls and empty his or her mana pool. this.getSpellAbility().addEffect(new ManaShortEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public ManaShort(final ManaShort card) { diff --git a/Mage.Sets/src/mage/sets/limitedalpha/MindTwist.java b/Mage.Sets/src/mage/sets/limitedalpha/MindTwist.java index ce7cf782930..91a80776779 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/MindTwist.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/MindTwist.java @@ -49,7 +49,7 @@ public class MindTwist extends CardImpl { // Target player discards X cards at random. this.getSpellAbility().addEffect(new DiscardTargetEffect(new ManacostVariableValue(), true)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public MindTwist(final MindTwist card) { diff --git a/Mage.Sets/src/mage/sets/limitedalpha/NaturalSelection.java b/Mage.Sets/src/mage/sets/limitedalpha/NaturalSelection.java index 2ef7ae41f2d..a78bc1aa0e3 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/NaturalSelection.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/NaturalSelection.java @@ -60,7 +60,7 @@ public class NaturalSelection extends CardImpl { // Look at the top three cards of target player's library, then put them back in any order. You may have that player shuffle his or her library. this.getSpellAbility().addEffect(new NaturalSelectionEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public NaturalSelection(final NaturalSelection card) { diff --git a/Mage.Sets/src/mage/sets/limitedalpha/NorthernPaladin.java b/Mage.Sets/src/mage/sets/limitedalpha/NorthernPaladin.java index b71428831ab..a589540a93b 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/NorthernPaladin.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/NorthernPaladin.java @@ -68,7 +68,7 @@ public class NorthernPaladin extends CardImpl { // {W}{W}, {tap}: Destroy target black permanent. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{W}{W}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Web.java b/Mage.Sets/src/mage/sets/limitedalpha/Web.java index 231849299b7..1bc6a554795 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/Web.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/Web.java @@ -56,7 +56,7 @@ public class Web extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/lorwyn/BattleMastery.java b/Mage.Sets/src/mage/sets/lorwyn/BattleMastery.java index c18bef8f0bd..e7bea73e263 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/BattleMastery.java +++ b/Mage.Sets/src/mage/sets/lorwyn/BattleMastery.java @@ -51,7 +51,7 @@ public class BattleMastery extends CardImpl { this.expansionSetCode = "LRW"; this.subtype.add("Aura"); this.color.setWhite(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/lorwyn/BlackPoplarShaman.java b/Mage.Sets/src/mage/sets/lorwyn/BlackPoplarShaman.java index 20fae43cf1b..dc7770624b0 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/BlackPoplarShaman.java +++ b/Mage.Sets/src/mage/sets/lorwyn/BlackPoplarShaman.java @@ -63,7 +63,7 @@ public class BlackPoplarShaman extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{2}{B}")); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/BrigidHeroOfKinsbaile.java b/Mage.Sets/src/mage/sets/lorwyn/BrigidHeroOfKinsbaile.java index 4f47aad7ad9..0a0e1e2acee 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/BrigidHeroOfKinsbaile.java +++ b/Mage.Sets/src/mage/sets/lorwyn/BrigidHeroOfKinsbaile.java @@ -72,7 +72,7 @@ public class BrigidHeroOfKinsbaile extends CardImpl { // {tap}: Brigid, Hero of Kinsbaile deals 2 damage to each attacking or blocking creature target player controls. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BrigidHeroOfKinsbaileEffect(), new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/CribSwap.java b/Mage.Sets/src/mage/sets/lorwyn/CribSwap.java index 0b279bd4999..c7b88c65cbb 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/CribSwap.java +++ b/Mage.Sets/src/mage/sets/lorwyn/CribSwap.java @@ -61,7 +61,7 @@ public class CribSwap extends CardImpl { this.addAbility(ChangelingAbility.getInstance()); // Exile target creature. Its controller puts a 1/1 colorless Shapeshifter creature token with changeling onto the battlefield. this.getSpellAbility().addEffect(new ExileTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new CribSwapEffect()); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/CrypticCommand.java b/Mage.Sets/src/mage/sets/lorwyn/CrypticCommand.java index 62d6ec3fdf2..3cc6e3c77cb 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/CrypticCommand.java +++ b/Mage.Sets/src/mage/sets/lorwyn/CrypticCommand.java @@ -68,7 +68,7 @@ public class CrypticCommand extends CardImpl { // or return target permanent to its owner's hand; Mode mode = new Mode(); mode.getEffects().add(new ReturnToHandTargetEffect()); - mode.getTargets().add(new TargetPermanent(true)); + mode.getTargets().add(new TargetPermanent()); this.getSpellAbility().getModes().addMode(mode); // or tap all creatures your opponents control; mode = new Mode(); diff --git a/Mage.Sets/src/mage/sets/lorwyn/DrownerOfSecrets.java b/Mage.Sets/src/mage/sets/lorwyn/DrownerOfSecrets.java index 09555d50472..21f7c68ca2c 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/DrownerOfSecrets.java +++ b/Mage.Sets/src/mage/sets/lorwyn/DrownerOfSecrets.java @@ -70,7 +70,7 @@ public class DrownerOfSecrets extends CardImpl { // Tap an untapped Merfolk you control: Target player puts the top card of his or her library into his or her graveyard. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(1), new TapTargetCost(new TargetControlledPermanent(filter))); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/EpicProportions.java b/Mage.Sets/src/mage/sets/lorwyn/EpicProportions.java index ff4c9b7826b..acfdccb0ae2 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/EpicProportions.java +++ b/Mage.Sets/src/mage/sets/lorwyn/EpicProportions.java @@ -54,7 +54,7 @@ public class EpicProportions extends CardImpl { this.subtype.add("Aura"); this.color.setGreen(true); this.addAbility(FlashAbility.getInstance()); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/lorwyn/EyeblightsEnding.java b/Mage.Sets/src/mage/sets/lorwyn/EyeblightsEnding.java index 9a9ddd0d195..008a995d22b 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/EyeblightsEnding.java +++ b/Mage.Sets/src/mage/sets/lorwyn/EyeblightsEnding.java @@ -56,7 +56,7 @@ public class EyeblightsEnding extends CardImpl { this.subtype.add("Elf"); this.color.setBlack(true); this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); } public EyeblightsEnding(final EyeblightsEnding card) { diff --git a/Mage.Sets/src/mage/sets/lorwyn/GlimmerdustNap.java b/Mage.Sets/src/mage/sets/lorwyn/GlimmerdustNap.java index 9b00b5a89ff..d9965480cf4 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/GlimmerdustNap.java +++ b/Mage.Sets/src/mage/sets/lorwyn/GlimmerdustNap.java @@ -62,7 +62,7 @@ public class GlimmerdustNap extends CardImpl { this.color.setBlue(true); // Enchant tapped creature - TargetPermanent auraTarget = new TargetCreaturePermanent(filter, true); + TargetPermanent auraTarget = new TargetCreaturePermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/lorwyn/Goatnapper.java b/Mage.Sets/src/mage/sets/lorwyn/Goatnapper.java index c142e239700..7ead57f564f 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Goatnapper.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Goatnapper.java @@ -65,7 +65,7 @@ public class Goatnapper extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new EntersBattlefieldTriggeredAbility(new UntapTargetEffect(), false); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); ability.addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/lorwyn/HerbalPoultice.java b/Mage.Sets/src/mage/sets/lorwyn/HerbalPoultice.java index d655e1ab9c5..c1d828dfdfb 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/HerbalPoultice.java +++ b/Mage.Sets/src/mage/sets/lorwyn/HerbalPoultice.java @@ -51,7 +51,7 @@ public class HerbalPoultice extends CardImpl { this.expansionSetCode = "LRW"; Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new GenericManaCost(3)); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/HornetHarasser.java b/Mage.Sets/src/mage/sets/lorwyn/HornetHarasser.java index 28a39bb3f1d..8beb9244fcb 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/HornetHarasser.java +++ b/Mage.Sets/src/mage/sets/lorwyn/HornetHarasser.java @@ -54,7 +54,7 @@ public class HornetHarasser extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new DiesTriggeredAbility(new BoostTargetEffect(-2, -2, Duration.EndOfTurn), false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/ImmaculateMagistrate.java b/Mage.Sets/src/mage/sets/lorwyn/ImmaculateMagistrate.java index c3cb34c8552..ca15e61e219 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ImmaculateMagistrate.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ImmaculateMagistrate.java @@ -66,7 +66,7 @@ public class ImmaculateMagistrate extends CardImpl { SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ImmaculateMagistrateEffect(), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/InnerFlameAcolyte.java b/Mage.Sets/src/mage/sets/lorwyn/InnerFlameAcolyte.java index a0c7ffbd6d8..bc961db52ae 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/InnerFlameAcolyte.java +++ b/Mage.Sets/src/mage/sets/lorwyn/InnerFlameAcolyte.java @@ -60,7 +60,7 @@ public class InnerFlameAcolyte extends CardImpl { // When Inner-Flame Acolyte enters the battlefield, target creature gets +2/+0 and gains haste until end of turn. Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(2,0, Duration.EndOfTurn)); ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Evoke {R} diff --git a/Mage.Sets/src/mage/sets/lorwyn/KinsbaileBalloonist.java b/Mage.Sets/src/mage/sets/lorwyn/KinsbaileBalloonist.java index 2585ccab1ad..b87a18a4838 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/KinsbaileBalloonist.java +++ b/Mage.Sets/src/mage/sets/lorwyn/KinsbaileBalloonist.java @@ -56,7 +56,7 @@ public class KinsbaileBalloonist extends CardImpl { this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); Ability ability = new AttacksTriggeredAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/KinsbaileSkirmisher.java b/Mage.Sets/src/mage/sets/lorwyn/KinsbaileSkirmisher.java index 203847db46c..1af8ab617d0 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/KinsbaileSkirmisher.java +++ b/Mage.Sets/src/mage/sets/lorwyn/KinsbaileSkirmisher.java @@ -54,7 +54,7 @@ public class KinsbaileSkirmisher extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/LaceWithMoonglove.java b/Mage.Sets/src/mage/sets/lorwyn/LaceWithMoonglove.java index a527b4ae466..7b3e2fd2e35 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/LaceWithMoonglove.java +++ b/Mage.Sets/src/mage/sets/lorwyn/LaceWithMoonglove.java @@ -49,7 +49,7 @@ public class LaceWithMoonglove extends CardImpl { this.expansionSetCode = "LRW"; this.color.setGreen(true); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/Lignify.java b/Mage.Sets/src/mage/sets/lorwyn/Lignify.java index 47e3af2ed93..046fbfeaa17 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Lignify.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Lignify.java @@ -59,7 +59,7 @@ public class Lignify extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.LoseAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/lorwyn/MerrowReejerey.java b/Mage.Sets/src/mage/sets/lorwyn/MerrowReejerey.java index ef1316bf545..493bc828a8a 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/MerrowReejerey.java +++ b/Mage.Sets/src/mage/sets/lorwyn/MerrowReejerey.java @@ -76,9 +76,9 @@ public class MerrowReejerey extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter1, true))); // Whenever you cast a Merfolk spell, you may tap or untap target permanent. Ability ability = new SpellCastControllerTriggeredAbility(new MayTapOrUntapTargetEffect(), filter2, true); - Target target = new TargetPermanent(true); + Target target = new TargetPermanent(); target.setRequired(true); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/MistbindClique.java b/Mage.Sets/src/mage/sets/lorwyn/MistbindClique.java index 6a5dfcefd33..47f792b553c 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/MistbindClique.java +++ b/Mage.Sets/src/mage/sets/lorwyn/MistbindClique.java @@ -93,7 +93,7 @@ class MistbindCliqueAbility extends ZoneChangeTriggeredAbility { public MistbindCliqueAbility() { super(Zone.BATTLEFIELD, Zone.EXILED, new MistbindCliqueTapEffect(), "When a Faerie is championed with {this}, ", false); - this.addTarget(new TargetPlayer(true)); + this.addTarget(new TargetPlayer()); } public MistbindCliqueAbility(MistbindCliqueAbility ability) { diff --git a/Mage.Sets/src/mage/sets/lorwyn/Mournwhelk.java b/Mage.Sets/src/mage/sets/lorwyn/Mournwhelk.java index ba28a289ade..cea1deb3ac9 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Mournwhelk.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Mournwhelk.java @@ -55,7 +55,7 @@ public class Mournwhelk extends CardImpl { // When Mournwhelk enters the battlefield, target player discards two cards. Ability ability = new EntersBattlefieldTriggeredAbility(new DiscardTargetEffect(2)); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); // Evoke {3}{B} this.addAbility(new EvokeAbility(this, "{3}{B}")); diff --git a/Mage.Sets/src/mage/sets/lorwyn/NathOfTheGiltLeaf.java b/Mage.Sets/src/mage/sets/lorwyn/NathOfTheGiltLeaf.java index f4b2aaa1a81..909d59dbe5e 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/NathOfTheGiltLeaf.java +++ b/Mage.Sets/src/mage/sets/lorwyn/NathOfTheGiltLeaf.java @@ -65,7 +65,7 @@ public class NathOfTheGiltLeaf extends CardImpl { Effect effect = new DiscardTargetEffect(1, true); effect.setText("you may have target opponent discard a card at random"); Ability ability = new BeginningOfUpkeepTriggeredAbility(effect, TargetController.YOU, true); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); // Whenever an opponent discards a card, you may put a 1/1 green Elf Warrior creature token onto the battlefield. diff --git a/Mage.Sets/src/mage/sets/lorwyn/NectarFaerie.java b/Mage.Sets/src/mage/sets/lorwyn/NectarFaerie.java index 328f9dee5cc..5d73859cc04 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/NectarFaerie.java +++ b/Mage.Sets/src/mage/sets/lorwyn/NectarFaerie.java @@ -68,7 +68,7 @@ public class NectarFaerie extends CardImpl { // {B}, {tap}: Target Faerie or Elf gains lifelink until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/Pestermite.java b/Mage.Sets/src/mage/sets/lorwyn/Pestermite.java index a450e0e04f7..9f3d4df2dfa 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Pestermite.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Pestermite.java @@ -61,7 +61,7 @@ public class Pestermite extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Pestermite enters the battlefield, you may tap or untap target permanent. Ability ability = new EntersBattlefieldTriggeredAbility(new MayTapOrUntapTargetEffect()); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/PrimalCommand.java b/Mage.Sets/src/mage/sets/lorwyn/PrimalCommand.java index 44a00ad6ff8..fa83732ae63 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/PrimalCommand.java +++ b/Mage.Sets/src/mage/sets/lorwyn/PrimalCommand.java @@ -71,7 +71,7 @@ public class PrimalCommand extends CardImpl { this.getSpellAbility().getModes().setMaxModes(2); // Target player gains 7 life; this.getSpellAbility().addEffect(new GainLifeTargetEffect(7)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); // or put target noncreature permanent on top of its owner's library; Mode mode = new Mode(); mode.getEffects().add(new PutOnLibraryTargetEffect(true)); @@ -82,7 +82,7 @@ public class PrimalCommand extends CardImpl { // or target player shuffles his or her graveyard into his or her library; mode = new Mode(); mode.getEffects().add(new PrimalCommandShuffleGraveyardEffect()); - mode.getTargets().add(new TargetPlayer(true)); + mode.getTargets().add(new TargetPlayer()); this.getSpellAbility().getModes().addMode(mode); // or search your library for a creature card, reveal it, put it into your hand, then shuffle your library. mode = new Mode(); diff --git a/Mage.Sets/src/mage/sets/lorwyn/ProtectiveBubble.java b/Mage.Sets/src/mage/sets/lorwyn/ProtectiveBubble.java index fa3c680ce60..afc79d51810 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ProtectiveBubble.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ProtectiveBubble.java @@ -56,7 +56,7 @@ public class ProtectiveBubble extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/lorwyn/SowerOfTemptation.java b/Mage.Sets/src/mage/sets/lorwyn/SowerOfTemptation.java index f576d774a14..fc9595a0c3f 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SowerOfTemptation.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SowerOfTemptation.java @@ -70,7 +70,7 @@ public class SowerOfTemptation extends CardImpl { new SourceOnBattelfieldCondition(), "gain control of target creature for as long as {this} remains on the battlefield"); Ability ability = new EntersBattlefieldTriggeredAbility(effect, false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/SpiderwigBoggart.java b/Mage.Sets/src/mage/sets/lorwyn/SpiderwigBoggart.java index 39664158b70..df51c498b88 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/SpiderwigBoggart.java +++ b/Mage.Sets/src/mage/sets/lorwyn/SpiderwigBoggart.java @@ -56,7 +56,7 @@ public class SpiderwigBoggart extends CardImpl { this.toughness = new MageInt(2); // When Spiderwig Boggart enters the battlefield, target creature gains fear until end of turn. Ability ability = new EntersBattlefieldTriggeredAbility(new GainAbilityTargetEffect(FearAbility.getInstance(), Duration.EndOfTurn), false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/StonybrookAngler.java b/Mage.Sets/src/mage/sets/lorwyn/StonybrookAngler.java index 15adca1e9d7..dcbd6d596f5 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/StonybrookAngler.java +++ b/Mage.Sets/src/mage/sets/lorwyn/StonybrookAngler.java @@ -60,7 +60,7 @@ public class StonybrookAngler extends CardImpl { // {1}{U}, {tap}: You may tap or untap target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new ManaCostsImpl("{1}{U}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/StreambedAquitects.java b/Mage.Sets/src/mage/sets/lorwyn/StreambedAquitects.java index e0dcdf91846..45421c29726 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/StreambedAquitects.java +++ b/Mage.Sets/src/mage/sets/lorwyn/StreambedAquitects.java @@ -71,7 +71,7 @@ public class StreambedAquitects extends CardImpl { // {tap}: Target Merfolk creature gets +1/+1 and gains islandwalk until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1,1, Duration.EndOfTurn), new TapSourceCost()); ability.addEffect(new GainAbilityTargetEffect(new IslandwalkAbility(), Duration.EndOfTurn)); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/lorwyn/Surgespanner.java b/Mage.Sets/src/mage/sets/lorwyn/Surgespanner.java index 6424ec45dd1..4740adc4205 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Surgespanner.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Surgespanner.java @@ -57,7 +57,7 @@ public class Surgespanner extends CardImpl { // Whenever Surgespanner becomes tapped, you may pay {1}{U}. If you do, return target permanent to its owner's hand. Ability ability = new BecomesTappedTriggeredAbility(new DoIfCostPaid(new ReturnToHandTargetEffect(), new ManaCostsImpl("{1}{U}"))); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/ThorntoothWitch.java b/Mage.Sets/src/mage/sets/lorwyn/ThorntoothWitch.java index 15d4bb5c871..b6a53bf4c21 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ThorntoothWitch.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ThorntoothWitch.java @@ -63,7 +63,7 @@ public class ThorntoothWitch extends CardImpl { this.toughness = new MageInt(4); // Whenever you cast a Treefolk spell, you may have target creature get +3/-3 until end of turn. Ability ability = new SpellCastControllerTriggeredAbility(new BoostTargetEffect(3, -3, Duration.EndOfTurn), filter, true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/Thoughtseize.java b/Mage.Sets/src/mage/sets/lorwyn/Thoughtseize.java index 513c23ed8ef..e1cc736bc52 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/Thoughtseize.java +++ b/Mage.Sets/src/mage/sets/lorwyn/Thoughtseize.java @@ -58,7 +58,7 @@ public class Thoughtseize extends CardImpl { this.color.setBlack(true); // Target player reveals his or her hand. You choose a nonland card from it. That player discards that card. You lose 2 life. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(filter, TargetController.ANY)); this.getSpellAbility().addEffect(new LoseLifeSourceControllerEffect(2)); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/ZephyrNet.java b/Mage.Sets/src/mage/sets/lorwyn/ZephyrNet.java index 5596fe2ee7a..307268778f6 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/ZephyrNet.java +++ b/Mage.Sets/src/mage/sets/lorwyn/ZephyrNet.java @@ -53,7 +53,7 @@ public class ZephyrNet extends CardImpl { this.subtype.add("Aura"); this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/magic2010/AcidicSlime.java b/Mage.Sets/src/mage/sets/magic2010/AcidicSlime.java index ba7b7b8867d..702304c4a35 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AcidicSlime.java +++ b/Mage.Sets/src/mage/sets/magic2010/AcidicSlime.java @@ -68,7 +68,7 @@ public class AcidicSlime extends CardImpl { this.addAbility(DeathtouchAbility.getInstance()); Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false); - Target target = new TargetPermanent(filter, true); + Target target = new TargetPermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/magic2010/AcolyteOfXathrid.java b/Mage.Sets/src/mage/sets/magic2010/AcolyteOfXathrid.java index e8a00ab28c4..4e2b15ed440 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AcolyteOfXathrid.java +++ b/Mage.Sets/src/mage/sets/magic2010/AcolyteOfXathrid.java @@ -57,7 +57,7 @@ public class AcolyteOfXathrid extends CardImpl { this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl("{1}{B}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2010/ActOfTreason.java b/Mage.Sets/src/mage/sets/magic2010/ActOfTreason.java index 902f955e767..337afc10d3f 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ActOfTreason.java +++ b/Mage.Sets/src/mage/sets/magic2010/ActOfTreason.java @@ -52,7 +52,7 @@ public class ActOfTreason extends CardImpl { // Gain control of target creature until end of turn. Untap that creature. // It gains haste until end of turn. (It can attack and {T} this turn.) - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new UntapTargetEffect()); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/magic2010/AlluringSiren.java b/Mage.Sets/src/mage/sets/magic2010/AlluringSiren.java index ebb0d56dcb0..d94f407b6e4 100644 --- a/Mage.Sets/src/mage/sets/magic2010/AlluringSiren.java +++ b/Mage.Sets/src/mage/sets/magic2010/AlluringSiren.java @@ -64,7 +64,7 @@ public class AlluringSiren extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttacksIfAbleTargetEffect(Duration.EndOfTurn), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2010/ArmoredAscension.java b/Mage.Sets/src/mage/sets/magic2010/ArmoredAscension.java index e9afa97e381..0c59e91ec60 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ArmoredAscension.java +++ b/Mage.Sets/src/mage/sets/magic2010/ArmoredAscension.java @@ -68,7 +68,7 @@ public class ArmoredAscension extends CardImpl { this.color.setWhite(true); this.subtype.add("Aura"); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/magic2010/BlindingMage.java b/Mage.Sets/src/mage/sets/magic2010/BlindingMage.java index 6ba47255f28..bbe4c9f6520 100644 --- a/Mage.Sets/src/mage/sets/magic2010/BlindingMage.java +++ b/Mage.Sets/src/mage/sets/magic2010/BlindingMage.java @@ -57,7 +57,7 @@ public class BlindingMage extends CardImpl { this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{W}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2010/CapriciousEfreet.java b/Mage.Sets/src/mage/sets/magic2010/CapriciousEfreet.java index a8fbb8bbcf3..507af3cf264 100644 --- a/Mage.Sets/src/mage/sets/magic2010/CapriciousEfreet.java +++ b/Mage.Sets/src/mage/sets/magic2010/CapriciousEfreet.java @@ -70,7 +70,7 @@ public class CapriciousEfreet extends CardImpl { // At the beginning of your upkeep, choose target nonland permanent you control and up to two target nonland permanents you don't control. Destroy one of them at random. Ability ability = new BeginningOfUpkeepTriggeredAbility(new CapriciousEfreetEffect(), TargetController.YOU, false); - ability.addTarget(new TargetPermanent(filterControlled, true)); + ability.addTarget(new TargetPermanent(filterControlled)); ability.addTarget(new TargetPermanent(0, 2, filterNotControlled, false)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java b/Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java index f9d47aa5089..a9d51fbe5af 100644 --- a/Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java +++ b/Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java @@ -64,18 +64,18 @@ public class ChandraNalaar extends CardImpl { LoyaltyAbility ability1 = new LoyaltyAbility(new DamageTargetEffect(1), 1); - ability1.addTarget(new TargetPlayer(true)); + ability1.addTarget(new TargetPlayer()); this.addAbility(ability1); LoyaltyAbility ability2 = new LoyaltyAbility(new DamageTargetEffect(ChandraNalaarXValue.getDefault())); - ability2.addTarget(new TargetCreaturePermanent(true)); + ability2.addTarget(new TargetCreaturePermanent()); this.addAbility(ability2); Effects effects1 = new Effects(); effects1.add(new DamageTargetEffect(10)); effects1.add(new DamageAllControlledTargetEffect(10, new FilterCreaturePermanent())); LoyaltyAbility ability3 = new LoyaltyAbility(effects1, -8); - ability3.addTarget(new TargetPlayer(true)); + ability3.addTarget(new TargetPlayer()); this.addAbility(ability3); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Disorient.java b/Mage.Sets/src/mage/sets/magic2010/Disorient.java index 2aecb60b9c1..dec02a6e5cd 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Disorient.java +++ b/Mage.Sets/src/mage/sets/magic2010/Disorient.java @@ -47,7 +47,7 @@ public class Disorient extends CardImpl { this.expansionSetCode = "M10"; this.color.setBlue(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(-7, 0, Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/magic2010/DoomBlade.java b/Mage.Sets/src/mage/sets/magic2010/DoomBlade.java index 004f53a45c3..aaf05abbadd 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DoomBlade.java +++ b/Mage.Sets/src/mage/sets/magic2010/DoomBlade.java @@ -55,7 +55,7 @@ public class DoomBlade extends CardImpl { super(ownerId, 93, "Doom Blade", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{B}"); this.expansionSetCode = "M10"; this.color.setBlack(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Duress.java b/Mage.Sets/src/mage/sets/magic2010/Duress.java index f22fb1b4f37..aea882b8e65 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Duress.java +++ b/Mage.Sets/src/mage/sets/magic2010/Duress.java @@ -56,7 +56,7 @@ public class Duress extends CardImpl { this.color.setBlack(true); // Target opponent reveals his or her hand. You choose a noncreature, nonland card from it. That player discards that card. - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(filter)); } diff --git a/Mage.Sets/src/mage/sets/magic2010/EntanglingVines.java b/Mage.Sets/src/mage/sets/magic2010/EntanglingVines.java index fd2c2908bb3..c1062f9dcdf 100644 --- a/Mage.Sets/src/mage/sets/magic2010/EntanglingVines.java +++ b/Mage.Sets/src/mage/sets/magic2010/EntanglingVines.java @@ -62,7 +62,7 @@ public class EntanglingVines extends CardImpl { this.color.setGreen(true); // Enchant tapped creature - TargetPermanent auraTarget = new TargetCreaturePermanent(filter, true); + TargetPermanent auraTarget = new TargetCreaturePermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/magic2010/HarmsWay.java b/Mage.Sets/src/mage/sets/magic2010/HarmsWay.java index ffe1b1d5973..1dee8513c23 100644 --- a/Mage.Sets/src/mage/sets/magic2010/HarmsWay.java +++ b/Mage.Sets/src/mage/sets/magic2010/HarmsWay.java @@ -58,7 +58,7 @@ public class HarmsWay extends CardImpl { // The next 2 damage that a source of your choice would deal to you and/or permanents you control this turn is dealt to target creature or player instead. this.getSpellAbility().addEffect(new HarmsWayPreventDamageTargetEffect()); this.getSpellAbility().addTarget(new TargetSource()); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); } public HarmsWay(final HarmsWay card) { diff --git a/Mage.Sets/src/mage/sets/magic2010/HauntingEchoes.java b/Mage.Sets/src/mage/sets/magic2010/HauntingEchoes.java index db4d5a61a1c..5427bb660d9 100644 --- a/Mage.Sets/src/mage/sets/magic2010/HauntingEchoes.java +++ b/Mage.Sets/src/mage/sets/magic2010/HauntingEchoes.java @@ -56,7 +56,7 @@ public class HauntingEchoes extends CardImpl { super(ownerId, 98, "Haunting Echoes", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{B}{B}"); this.expansionSetCode = "M10"; this.color.setBlack(true); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new HauntingEchoesEffect()); } diff --git a/Mage.Sets/src/mage/sets/magic2010/IceCage.java b/Mage.Sets/src/mage/sets/magic2010/IceCage.java index 07eaeb4ecdb..20c10392edf 100644 --- a/Mage.Sets/src/mage/sets/magic2010/IceCage.java +++ b/Mage.Sets/src/mage/sets/magic2010/IceCage.java @@ -61,7 +61,7 @@ public class IceCage extends CardImpl { this.subtype.add("Aura"); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/magic2010/Indestructibility.java b/Mage.Sets/src/mage/sets/magic2010/Indestructibility.java index b586b40126c..069901f336d 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Indestructibility.java +++ b/Mage.Sets/src/mage/sets/magic2010/Indestructibility.java @@ -57,7 +57,7 @@ public class Indestructibility extends CardImpl { this.color.setWhite(true); // Enchant permanent - TargetPermanent auraTarget = new TargetPermanent(true); + TargetPermanent auraTarget = new TargetPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/magic2010/JaceBeleren.java b/Mage.Sets/src/mage/sets/magic2010/JaceBeleren.java index f73dab60a78..0dd2d23f65d 100644 --- a/Mage.Sets/src/mage/sets/magic2010/JaceBeleren.java +++ b/Mage.Sets/src/mage/sets/magic2010/JaceBeleren.java @@ -58,11 +58,11 @@ public class JaceBeleren extends CardImpl { this.addAbility(new LoyaltyAbility(new DrawCardAllEffect(1), 2)); LoyaltyAbility ability1 = new LoyaltyAbility(new DrawCardTargetEffect(1), -1); - ability1.addTarget(new TargetPlayer(true)); + ability1.addTarget(new TargetPlayer()); this.addAbility(ability1); LoyaltyAbility ability2 = new LoyaltyAbility(new PutLibraryIntoGraveTargetEffect(20), -10); - ability2.addTarget(new TargetPlayer(true)); + ability2.addTarget(new TargetPlayer()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Jump.java b/Mage.Sets/src/mage/sets/magic2010/Jump.java index a288e24613e..ecf5ade5823 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Jump.java +++ b/Mage.Sets/src/mage/sets/magic2010/Jump.java @@ -48,7 +48,7 @@ public class Jump extends CardImpl { this.expansionSetCode = "M10"; this.color.setBlue(true); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public Jump(final Jump card) { diff --git a/Mage.Sets/src/mage/sets/magic2010/KindledFury.java b/Mage.Sets/src/mage/sets/magic2010/KindledFury.java index fcf354417e4..bf008400491 100644 --- a/Mage.Sets/src/mage/sets/magic2010/KindledFury.java +++ b/Mage.Sets/src/mage/sets/magic2010/KindledFury.java @@ -50,7 +50,7 @@ public class KindledFury extends CardImpl { this.color.setRed(true); this.getSpellAbility().addEffect(new BoostTargetEffect(1, 0, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public KindledFury(final KindledFury card) { diff --git a/Mage.Sets/src/mage/sets/magic2010/LightwielderPaladin.java b/Mage.Sets/src/mage/sets/magic2010/LightwielderPaladin.java index 939a63568ae..3169c5ea0ae 100644 --- a/Mage.Sets/src/mage/sets/magic2010/LightwielderPaladin.java +++ b/Mage.Sets/src/mage/sets/magic2010/LightwielderPaladin.java @@ -106,7 +106,7 @@ class LightwielderPaladinTriggeredAbility extends TriggeredAbilityImpl { filter.add(new ControllerIdPredicate(event.getTargetId())); this.getTargets().clear(); - this.addTarget(new TargetPermanent(filter, true)); + this.addTarget(new TargetPermanent(filter)); return true; } } diff --git a/Mage.Sets/src/mage/sets/magic2010/LilianaVess.java b/Mage.Sets/src/mage/sets/magic2010/LilianaVess.java index a9b9ec2bae0..e2242252da4 100644 --- a/Mage.Sets/src/mage/sets/magic2010/LilianaVess.java +++ b/Mage.Sets/src/mage/sets/magic2010/LilianaVess.java @@ -62,7 +62,7 @@ public class LilianaVess extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(5)), false)); LoyaltyAbility ability1 = new LoyaltyAbility(new DiscardTargetEffect(1), 1); - ability1.addTarget(new TargetPlayer(true)); + ability1.addTarget(new TargetPlayer()); this.addAbility(ability1); this.addAbility(new LoyaltyAbility(new SearchLibraryPutOnLibraryEffect(new TargetCardInLibrary()), -2)); diff --git a/Mage.Sets/src/mage/sets/magic2010/MasterOfTheWildHunt.java b/Mage.Sets/src/mage/sets/magic2010/MasterOfTheWildHunt.java index 9586f4d4b78..03e3ae94209 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MasterOfTheWildHunt.java +++ b/Mage.Sets/src/mage/sets/magic2010/MasterOfTheWildHunt.java @@ -74,7 +74,7 @@ public class MasterOfTheWildHunt extends CardImpl { this.addAbility(new OnEventTriggeredAbility(EventType.UPKEEP_STEP_PRE, "beginning of your upkeep", new CreateTokenEffect(wolfToken))); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MasterOfTheWildHuntEffect(), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2010/MightOfOaks.java b/Mage.Sets/src/mage/sets/magic2010/MightOfOaks.java index 62de1884439..f5d2934e47e 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MightOfOaks.java +++ b/Mage.Sets/src/mage/sets/magic2010/MightOfOaks.java @@ -46,7 +46,7 @@ public class MightOfOaks extends CardImpl { super(ownerId, 192, "Might of Oaks", Rarity.RARE, new CardType[]{CardType.INSTANT},"{3}{G}"); this.expansionSetCode = "M10"; this.color.setGreen(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(7, 7, Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/magic2010/MindControl.java b/Mage.Sets/src/mage/sets/magic2010/MindControl.java index d008a2027cb..98b12d0fb07 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MindControl.java +++ b/Mage.Sets/src/mage/sets/magic2010/MindControl.java @@ -54,7 +54,7 @@ public class MindControl extends CardImpl { this.color.setBlue(true); this.subtype.add("Aura"); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/magic2010/MindShatter.java b/Mage.Sets/src/mage/sets/magic2010/MindShatter.java index ec50dafcb9d..9698639da4f 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MindShatter.java +++ b/Mage.Sets/src/mage/sets/magic2010/MindShatter.java @@ -52,7 +52,7 @@ public class MindShatter extends CardImpl { this.color.setBlack(true); // Target player discards X cards at random. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new MindShatterEffect()); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Oakenform.java b/Mage.Sets/src/mage/sets/magic2010/Oakenform.java index 90d89363f9d..da66ea3bcea 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Oakenform.java +++ b/Mage.Sets/src/mage/sets/magic2010/Oakenform.java @@ -59,7 +59,7 @@ public class Oakenform extends CardImpl { this.color.setGreen(true); this.subtype.add("Aura"); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/magic2010/Polymorph.java b/Mage.Sets/src/mage/sets/magic2010/Polymorph.java index a5e442ac1a5..7493c45ea2e 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Polymorph.java +++ b/Mage.Sets/src/mage/sets/magic2010/Polymorph.java @@ -59,7 +59,7 @@ public class Polymorph extends CardImpl { this.color.setBlue(true); // Destroy target creature. It can't be regenerated. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); // Its controller reveals cards from the top of his or her library until he or she reveals a creature card. // The player puts that card onto the battlefield, then shuffles all other cards revealed this way into his or her library. diff --git a/Mage.Sets/src/mage/sets/magic2010/Regenerate.java b/Mage.Sets/src/mage/sets/magic2010/Regenerate.java index 4b14d409270..813c9af6349 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Regenerate.java +++ b/Mage.Sets/src/mage/sets/magic2010/Regenerate.java @@ -45,7 +45,7 @@ public class Regenerate extends CardImpl { this.expansionSetCode = "M10"; this.color.setGreen(true); this.getSpellAbility().addEffect(new RegenerateTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public Regenerate(final Regenerate card) { diff --git a/Mage.Sets/src/mage/sets/magic2010/SanguineBond.java b/Mage.Sets/src/mage/sets/magic2010/SanguineBond.java index f8da07a977f..de85e2c05d0 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SanguineBond.java +++ b/Mage.Sets/src/mage/sets/magic2010/SanguineBond.java @@ -52,7 +52,7 @@ public class SanguineBond extends CardImpl { // Whenever you gain life, target opponent loses that much life. SanguineBondTriggeredAbility ability = new SanguineBondTriggeredAbility(); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2010/SeismicStrike.java b/Mage.Sets/src/mage/sets/magic2010/SeismicStrike.java index c9e31a575fe..c0860f5c63d 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SeismicStrike.java +++ b/Mage.Sets/src/mage/sets/magic2010/SeismicStrike.java @@ -54,7 +54,7 @@ public class SeismicStrike extends CardImpl { this.expansionSetCode = "M10"; this.color.setRed(true); this.getSpellAbility().addEffect(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter))); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public SeismicStrike(final SeismicStrike card) { diff --git a/Mage.Sets/src/mage/sets/magic2010/SignInBlood.java b/Mage.Sets/src/mage/sets/magic2010/SignInBlood.java index f5ed407ced0..aaf4dad7113 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SignInBlood.java +++ b/Mage.Sets/src/mage/sets/magic2010/SignInBlood.java @@ -46,7 +46,7 @@ public class SignInBlood extends CardImpl { super(ownerId, 112, "Sign in Blood", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{B}{B}"); this.expansionSetCode = "M10"; this.color.setBlack(true); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new DrawCardTargetEffect(2)); this.getSpellAbility().addEffect(new LoseLifeTargetEffect(2)); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Sleep.java b/Mage.Sets/src/mage/sets/magic2010/Sleep.java index c53296ad6d7..30138fe8931 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Sleep.java +++ b/Mage.Sets/src/mage/sets/magic2010/Sleep.java @@ -56,7 +56,7 @@ public class Sleep extends CardImpl { super(ownerId, 71, "Sleep", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{U}{U}"); this.expansionSetCode = "M10"; this.color.setBlue(true); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new SleepEffect()); } diff --git a/Mage.Sets/src/mage/sets/magic2010/SolemnOffering.java b/Mage.Sets/src/mage/sets/magic2010/SolemnOffering.java index a84ee8ba049..c0cc2fdc5f8 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SolemnOffering.java +++ b/Mage.Sets/src/mage/sets/magic2010/SolemnOffering.java @@ -57,7 +57,7 @@ public class SolemnOffering extends CardImpl { super(ownerId, 33, "Solemn Offering", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{W}"); this.expansionSetCode = "M10"; this.color.setWhite(true); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new GainLifeEffect(4)); } diff --git a/Mage.Sets/src/mage/sets/magic2010/SoulBleed.java b/Mage.Sets/src/mage/sets/magic2010/SoulBleed.java index 9ea7f9987cb..ebfdcbc9c13 100644 --- a/Mage.Sets/src/mage/sets/magic2010/SoulBleed.java +++ b/Mage.Sets/src/mage/sets/magic2010/SoulBleed.java @@ -56,7 +56,7 @@ public class SoulBleed extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/magic2010/TendrilsOfCorruption.java b/Mage.Sets/src/mage/sets/magic2010/TendrilsOfCorruption.java index 6821346bece..578faaaf3d3 100644 --- a/Mage.Sets/src/mage/sets/magic2010/TendrilsOfCorruption.java +++ b/Mage.Sets/src/mage/sets/magic2010/TendrilsOfCorruption.java @@ -55,7 +55,7 @@ public class TendrilsOfCorruption extends CardImpl { this.expansionSetCode = "M10"; this.color.setBlack(true); this.getSpellAbility().addEffect(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter))); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new GainLifeEffect(new PermanentsOnBattlefieldCount(filter))); } diff --git a/Mage.Sets/src/mage/sets/magic2010/TimeWarp.java b/Mage.Sets/src/mage/sets/magic2010/TimeWarp.java index 24bf2476b17..7e4af9ee057 100644 --- a/Mage.Sets/src/mage/sets/magic2010/TimeWarp.java +++ b/Mage.Sets/src/mage/sets/magic2010/TimeWarp.java @@ -49,7 +49,7 @@ public class TimeWarp extends CardImpl { super(ownerId, 75, "Time Warp", Rarity.MYTHIC, new CardType[]{CardType.SORCERY}, "{3}{U}{U}"); this.expansionSetCode = "M10"; this.color.setBlue(true); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new TimeWarpEffect()); } diff --git a/Mage.Sets/src/mage/sets/magic2010/TomeScour.java b/Mage.Sets/src/mage/sets/magic2010/TomeScour.java index df4b3dab179..c9fd377a7c0 100644 --- a/Mage.Sets/src/mage/sets/magic2010/TomeScour.java +++ b/Mage.Sets/src/mage/sets/magic2010/TomeScour.java @@ -45,7 +45,7 @@ public class TomeScour extends CardImpl { super(ownerId, 76, "Tome Scour", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{U}"); this.expansionSetCode = "M10"; this.color.setBlue(true); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(5)); } diff --git a/Mage.Sets/src/mage/sets/magic2010/UndeadSlayer.java b/Mage.Sets/src/mage/sets/magic2010/UndeadSlayer.java index a570e3e8a23..1d0fbb1184b 100644 --- a/Mage.Sets/src/mage/sets/magic2010/UndeadSlayer.java +++ b/Mage.Sets/src/mage/sets/magic2010/UndeadSlayer.java @@ -70,7 +70,7 @@ public class UndeadSlayer extends CardImpl { this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2010/VampireAristocrat.java b/Mage.Sets/src/mage/sets/magic2010/VampireAristocrat.java index 5837260a8aa..6c65af0fd40 100644 --- a/Mage.Sets/src/mage/sets/magic2010/VampireAristocrat.java +++ b/Mage.Sets/src/mage/sets/magic2010/VampireAristocrat.java @@ -57,7 +57,7 @@ public class VampireAristocrat extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("")); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Weakness.java b/Mage.Sets/src/mage/sets/magic2010/Weakness.java index e0d1d9b42a0..b24191eed80 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Weakness.java +++ b/Mage.Sets/src/mage/sets/magic2010/Weakness.java @@ -58,7 +58,7 @@ public class Weakness extends CardImpl { this.expansionSetCode = "M10"; this.color.setBlack(true); this.subtype.add("Aura"); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/magic2010/XathridDemon.java b/Mage.Sets/src/mage/sets/magic2010/XathridDemon.java index f54490acacd..63837b858cd 100644 --- a/Mage.Sets/src/mage/sets/magic2010/XathridDemon.java +++ b/Mage.Sets/src/mage/sets/magic2010/XathridDemon.java @@ -110,7 +110,7 @@ class XathridDemonEffect extends OneShotEffect { FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creature other than " + sourcePermanent.getName()); filter.add(new AnotherPredicate()); - Target target = new TargetControlledCreaturePermanent(1, 1, filter, true, true); + Target target = new TargetControlledCreaturePermanent(1, 1, filter, true); if (target.canChoose(source.getSourceId(), player.getId(), game)) { player.choose(Outcome.Sacrifice, target, source.getSourceId(), game); Permanent permanent = game.getPermanent(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/sets/magic2011/AetherAdept.java b/Mage.Sets/src/mage/sets/magic2011/AetherAdept.java index 8d34d45d53c..fae2ecddb6e 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AetherAdept.java +++ b/Mage.Sets/src/mage/sets/magic2011/AetherAdept.java @@ -55,7 +55,7 @@ public class AetherAdept extends CardImpl { // When AEther Adept enters the battlefield, return target creature to its owner's hand. Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2011/AirServant.java b/Mage.Sets/src/mage/sets/magic2011/AirServant.java index 64ab6f38209..b5c91b91158 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AirServant.java +++ b/Mage.Sets/src/mage/sets/magic2011/AirServant.java @@ -64,7 +64,7 @@ public class AirServant extends CardImpl { this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{2}{U}")); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java b/Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java index 8a116f2df35..f18fcfce239 100644 --- a/Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java +++ b/Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java @@ -104,7 +104,7 @@ class AncientHellkiteAbility extends ActivatedAbilityImpl { filter.add(new ControllerIdPredicate(defenderId)); this.getTargets().clear(); - TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true); + TargetCreaturePermanent target = new TargetCreaturePermanent(filter); target.setRequired(true); this.addTarget(target); return super.activate(game, noMana); diff --git a/Mage.Sets/src/mage/sets/magic2011/BrittleEffigy.java b/Mage.Sets/src/mage/sets/magic2011/BrittleEffigy.java index 51f924797bc..54111bdbf76 100644 --- a/Mage.Sets/src/mage/sets/magic2011/BrittleEffigy.java +++ b/Mage.Sets/src/mage/sets/magic2011/BrittleEffigy.java @@ -57,7 +57,7 @@ public class BrittleEffigy extends CardImpl { costs.add(new ExileSourceCost()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), costs); ability.addManaCost(new GenericManaCost(4)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2011/CaptivatingVampire.java b/Mage.Sets/src/mage/sets/magic2011/CaptivatingVampire.java index c8ee6f0ed8f..c79763eada0 100644 --- a/Mage.Sets/src/mage/sets/magic2011/CaptivatingVampire.java +++ b/Mage.Sets/src/mage/sets/magic2011/CaptivatingVampire.java @@ -79,7 +79,7 @@ public class CaptivatingVampire extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter1, true))); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CaptivatingVampireEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(5, 5, filter2, true))); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2011/ChandrasOutrage.java b/Mage.Sets/src/mage/sets/magic2011/ChandrasOutrage.java index e151f4b176f..39adfe37125 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ChandrasOutrage.java +++ b/Mage.Sets/src/mage/sets/magic2011/ChandrasOutrage.java @@ -51,7 +51,7 @@ public class ChandrasOutrage extends CardImpl { this.expansionSetCode = "M11"; this.color.setRed(true); this.getSpellAbility().addEffect(new ChandrasOutrageEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public ChandrasOutrage(final ChandrasOutrage card) { diff --git a/Mage.Sets/src/mage/sets/magic2011/Combust.java b/Mage.Sets/src/mage/sets/magic2011/Combust.java index f05b35f5d50..03313773584 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Combust.java +++ b/Mage.Sets/src/mage/sets/magic2011/Combust.java @@ -61,7 +61,7 @@ public class Combust extends CardImpl { this.expansionSetCode = "M11"; this.color.setRed(true); this.getSpellAbility().addEffect(new DamageTargetEffect(5, false)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.addAbility(new SimpleStaticAbility(Zone.STACK, new CantCounterSourceEffect())); } diff --git a/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java b/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java index f79f1d6bf3b..d585d7ce8b3 100644 --- a/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java +++ b/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java @@ -91,7 +91,7 @@ class CyclopsGladiatorEffect extends OneShotEffect { if (defenderId != null) { FilterCreaturePermanent filter = new FilterCreaturePermanent("creature defending player controls"); filter.add(new ControllerIdPredicate(defenderId)); - TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true); + TargetCreaturePermanent target = new TargetCreaturePermanent(filter); Player player = game.getPlayer(source.getControllerId()); if (target.canChoose(source.getSourceId(), source.getControllerId(), game)) { if (player.chooseTarget(Outcome.Detriment, target, source, game)) { diff --git a/Mage.Sets/src/mage/sets/magic2011/Diminish.java b/Mage.Sets/src/mage/sets/magic2011/Diminish.java index 33b280af1cd..53972b169ca 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Diminish.java +++ b/Mage.Sets/src/mage/sets/magic2011/Diminish.java @@ -46,7 +46,7 @@ public class Diminish extends CardImpl { super(ownerId, 52, "Diminish", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "M11"; this.color.setBlue(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new SetPowerToughnessTargetEffect(1, 1, Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/magic2011/DryadsFavor.java b/Mage.Sets/src/mage/sets/magic2011/DryadsFavor.java index 985aea049c2..07de7d14a90 100644 --- a/Mage.Sets/src/mage/sets/magic2011/DryadsFavor.java +++ b/Mage.Sets/src/mage/sets/magic2011/DryadsFavor.java @@ -60,7 +60,7 @@ public class DryadsFavor extends CardImpl { this.color.setGreen(true); this.subtype.add("Aura"); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/magic2011/Fling.java b/Mage.Sets/src/mage/sets/magic2011/Fling.java index f569fba4d73..5a14b67702f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Fling.java +++ b/Mage.Sets/src/mage/sets/magic2011/Fling.java @@ -53,7 +53,7 @@ public class Fling extends CardImpl { super(ownerId, 139, "Fling", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "M11"; this.color.setRed(true); - this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); this.getSpellAbility().addEffect(new FlingEffect()); } diff --git a/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java b/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java index 3e8d8f464de..90f9463ad85 100644 --- a/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java +++ b/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java @@ -113,7 +113,7 @@ class FrostTitanAbility2 extends TriggeredAbilityImpl { public FrostTitanAbility2() { super(Zone.BATTLEFIELD, new TapTargetEffect(), false); this.addEffect(new SkipNextUntapTargetEffect()); - this.addTarget(new TargetPermanent(true)); + this.addTarget(new TargetPermanent()); } public FrostTitanAbility2(final FrostTitanAbility2 ability) { diff --git a/Mage.Sets/src/mage/sets/magic2011/Incite.java b/Mage.Sets/src/mage/sets/magic2011/Incite.java index 69bd646e5a7..dfe7c5f42e7 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Incite.java +++ b/Mage.Sets/src/mage/sets/magic2011/Incite.java @@ -51,7 +51,7 @@ public class Incite extends CardImpl { this.color.setRed(true); // Target creature becomes red until end of turn and attacks this turn if able. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new SetCardColorTargetEffect(ObjectColor.RED, Duration.EndOfTurn, "Target creature becomes red until end of turn")); this.getSpellAbility().addEffect(new AttacksIfAbleTargetEffect(Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/magic2011/JacesErasure.java b/Mage.Sets/src/mage/sets/magic2011/JacesErasure.java index 2926452ab1f..7b125394bb5 100644 --- a/Mage.Sets/src/mage/sets/magic2011/JacesErasure.java +++ b/Mage.Sets/src/mage/sets/magic2011/JacesErasure.java @@ -48,7 +48,7 @@ public class JacesErasure extends CardImpl { this.color.setBlue(true); DrawCardControllerTriggeredAbility ability = new DrawCardControllerTriggeredAbility(new PutLibraryIntoGraveTargetEffect(1), true); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2011/JinxedIdol.java b/Mage.Sets/src/mage/sets/magic2011/JinxedIdol.java index 70503ed2493..9ca81ab7c45 100644 --- a/Mage.Sets/src/mage/sets/magic2011/JinxedIdol.java +++ b/Mage.Sets/src/mage/sets/magic2011/JinxedIdol.java @@ -54,8 +54,8 @@ public class JinxedIdol extends CardImpl { super(ownerId, 208, "Jinxed Idol", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "M11"; this.addAbility(new OnEventTriggeredAbility(EventType.UPKEEP_STEP_PRE, "beginning of your upkeep", new DamageControllerEffect(2))); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new JinxedIdolEffect(), new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); - ability.addTarget(new TargetOpponent(true)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new JinxedIdolEffect(), new SacrificeTargetCost(new TargetControlledCreaturePermanent())); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java b/Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java index 4638cc34ff3..f26a4315485 100644 --- a/Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java +++ b/Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java @@ -82,7 +82,7 @@ class LilianasCaressAbility extends TriggeredAbilityImpl { @Override public boolean checkTrigger(GameEvent event, Game game) { if (event.getType() == EventType.DISCARDED_CARD && game.getOpponents(controllerId).contains(event.getPlayerId())) { - this.addTarget(new TargetPlayer(true)); + this.addTarget(new TargetPlayer()); getTargets().get(0).add(event.getPlayerId(), game); return true; } diff --git a/Mage.Sets/src/mage/sets/magic2011/ManicVandal.java b/Mage.Sets/src/mage/sets/magic2011/ManicVandal.java index fe3fab2e2bd..be0b7ddde30 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ManicVandal.java +++ b/Mage.Sets/src/mage/sets/magic2011/ManicVandal.java @@ -63,7 +63,7 @@ public class ManicVandal extends CardImpl { this.toughness = new MageInt(2); Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false); - Target target = new TargetPermanent(filter, true); + Target target = new TargetPermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/magic2011/MightyLeap.java b/Mage.Sets/src/mage/sets/magic2011/MightyLeap.java index dc174416793..70aa7cf4c0a 100644 --- a/Mage.Sets/src/mage/sets/magic2011/MightyLeap.java +++ b/Mage.Sets/src/mage/sets/magic2011/MightyLeap.java @@ -48,7 +48,7 @@ public class MightyLeap extends CardImpl { super(ownerId, 22, "Mighty Leap", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "M11"; this.color.setWhite(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/magic2011/MystifyingMaze.java b/Mage.Sets/src/mage/sets/magic2011/MystifyingMaze.java index 79c435c4703..e4c3b635e81 100644 --- a/Mage.Sets/src/mage/sets/magic2011/MystifyingMaze.java +++ b/Mage.Sets/src/mage/sets/magic2011/MystifyingMaze.java @@ -67,7 +67,7 @@ public class MystifyingMaze extends CardImpl { this.addAbility(new ColorlessManaAbility()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MystifyingMazeEffect(), new ManaCostsImpl("{4}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java b/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java index 5b2bb2d154f..244b1762762 100644 --- a/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java +++ b/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java @@ -75,7 +75,7 @@ public class NecroticPlague extends CardImpl { this.subtype.add("Aura"); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); @@ -102,7 +102,7 @@ public class NecroticPlague extends CardImpl { if (creatureController != null) { ability.setControllerId(creatureController.getId()); ability.getTargets().clear(); - TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true); + TargetCreaturePermanent target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.getTargets().add(target); } diff --git a/Mage.Sets/src/mage/sets/magic2011/Plummet.java b/Mage.Sets/src/mage/sets/magic2011/Plummet.java index 73a12b01515..b9c51435f21 100644 --- a/Mage.Sets/src/mage/sets/magic2011/Plummet.java +++ b/Mage.Sets/src/mage/sets/magic2011/Plummet.java @@ -55,7 +55,7 @@ public class Plummet extends CardImpl { super(ownerId, 190, "Plummet", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}"); this.expansionSetCode = "M11"; this.color.setGreen(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/magic2011/PrimalCocoon.java b/Mage.Sets/src/mage/sets/magic2011/PrimalCocoon.java index daf88f61568..fd5db83c102 100644 --- a/Mage.Sets/src/mage/sets/magic2011/PrimalCocoon.java +++ b/Mage.Sets/src/mage/sets/magic2011/PrimalCocoon.java @@ -59,7 +59,7 @@ public class PrimalCocoon extends CardImpl { this.color.setGreen(true); this.subtype.add("Aura"); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/magic2011/QuagSickness.java b/Mage.Sets/src/mage/sets/magic2011/QuagSickness.java index f4ec5235da0..b39b61a8088 100644 --- a/Mage.Sets/src/mage/sets/magic2011/QuagSickness.java +++ b/Mage.Sets/src/mage/sets/magic2011/QuagSickness.java @@ -66,7 +66,7 @@ public class QuagSickness extends CardImpl { this.color.setBlack(true); this.subtype.add("Aura"); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/magic2011/ShivsEmbrace.java b/Mage.Sets/src/mage/sets/magic2011/ShivsEmbrace.java index 2d7ae920c68..f718f679954 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ShivsEmbrace.java +++ b/Mage.Sets/src/mage/sets/magic2011/ShivsEmbrace.java @@ -64,7 +64,7 @@ public class ShivsEmbrace extends CardImpl { this.subtype.add("Aura"); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/magic2011/StabbingPain.java b/Mage.Sets/src/mage/sets/magic2011/StabbingPain.java index e9bcd14a5b5..276af3a45d5 100644 --- a/Mage.Sets/src/mage/sets/magic2011/StabbingPain.java +++ b/Mage.Sets/src/mage/sets/magic2011/StabbingPain.java @@ -47,7 +47,7 @@ public class StabbingPain extends CardImpl { super(ownerId, 118, "Stabbing Pain", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}"); this.expansionSetCode = "M11"; this.color.setBlack(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(-1, -1, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new TapTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/magic2011/ThunderStrike.java b/Mage.Sets/src/mage/sets/magic2011/ThunderStrike.java index a8b01312d55..35aea54f718 100644 --- a/Mage.Sets/src/mage/sets/magic2011/ThunderStrike.java +++ b/Mage.Sets/src/mage/sets/magic2011/ThunderStrike.java @@ -48,7 +48,7 @@ public class ThunderStrike extends CardImpl { super(ownerId, 157, "Thunder Strike", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "M11"; this.color.setRed(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(2, 0, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/magic2011/VengefulArchon.java b/Mage.Sets/src/mage/sets/magic2011/VengefulArchon.java index 099c4e2a0cd..644ff170cf1 100644 --- a/Mage.Sets/src/mage/sets/magic2011/VengefulArchon.java +++ b/Mage.Sets/src/mage/sets/magic2011/VengefulArchon.java @@ -61,7 +61,7 @@ public class VengefulArchon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VengefulArchonEffect(), new ManaCostsImpl("{X}")); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2011/VisceraSeer.java b/Mage.Sets/src/mage/sets/magic2011/VisceraSeer.java index 1ce0f720aa1..f0061d56804 100644 --- a/Mage.Sets/src/mage/sets/magic2011/VisceraSeer.java +++ b/Mage.Sets/src/mage/sets/magic2011/VisceraSeer.java @@ -54,7 +54,7 @@ public class VisceraSeer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1), new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); } public VisceraSeer(final VisceraSeer card) { diff --git a/Mage.Sets/src/mage/sets/magic2011/VolcanicStrength.java b/Mage.Sets/src/mage/sets/magic2011/VolcanicStrength.java index a593c0fa5e9..b1942502673 100644 --- a/Mage.Sets/src/mage/sets/magic2011/VolcanicStrength.java +++ b/Mage.Sets/src/mage/sets/magic2011/VolcanicStrength.java @@ -60,7 +60,7 @@ public class VolcanicStrength extends CardImpl { this.color.setRed(true); this.subtype.add("Aura"); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/magic2011/VoltaicKey.java b/Mage.Sets/src/mage/sets/magic2011/VoltaicKey.java index bc1a90d6365..ee7afbed222 100644 --- a/Mage.Sets/src/mage/sets/magic2011/VoltaicKey.java +++ b/Mage.Sets/src/mage/sets/magic2011/VoltaicKey.java @@ -59,7 +59,7 @@ public class VoltaicKey extends CardImpl { this.expansionSetCode = "M11"; Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost()); ability.addManaCost(new GenericManaCost(1)); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2011/WarPriestOfThune.java b/Mage.Sets/src/mage/sets/magic2011/WarPriestOfThune.java index 8d801349a42..17ea2f3fb9f 100644 --- a/Mage.Sets/src/mage/sets/magic2011/WarPriestOfThune.java +++ b/Mage.Sets/src/mage/sets/magic2011/WarPriestOfThune.java @@ -64,7 +64,7 @@ public class WarPriestOfThune extends CardImpl { // When War Priest of Thune enters the battlefield, you may destroy target enchantment. Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), true); - Target target = new TargetPermanent(filter, true); + Target target = new TargetPermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/magic2012/AegisAngel.java b/Mage.Sets/src/mage/sets/magic2012/AegisAngel.java index 4160969b9a0..1295385e12a 100644 --- a/Mage.Sets/src/mage/sets/magic2012/AegisAngel.java +++ b/Mage.Sets/src/mage/sets/magic2012/AegisAngel.java @@ -76,7 +76,7 @@ public class AegisAngel extends CardImpl { new SourceOnBattlefieldControlUnchangedCondition(), "another target permanent is indestructible for as long as you control Aegis Angel"); Ability ability = new EntersBattlefieldTriggeredAbility(effect, false); - Target target = new TargetPermanent(filter, true); + Target target = new TargetPermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/magic2012/AlabasterMage.java b/Mage.Sets/src/mage/sets/magic2012/AlabasterMage.java index 9621d3111e9..923e24c928a 100644 --- a/Mage.Sets/src/mage/sets/magic2012/AlabasterMage.java +++ b/Mage.Sets/src/mage/sets/magic2012/AlabasterMage.java @@ -57,7 +57,7 @@ public class AlabasterMage extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{W}")); - ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2012/AngelicDestiny.java b/Mage.Sets/src/mage/sets/magic2012/AngelicDestiny.java index 7a013386899..d3012b52bbd 100644 --- a/Mage.Sets/src/mage/sets/magic2012/AngelicDestiny.java +++ b/Mage.Sets/src/mage/sets/magic2012/AngelicDestiny.java @@ -58,7 +58,7 @@ public class AngelicDestiny extends CardImpl { this.color.setWhite(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/magic2012/ArachnusSpinner.java b/Mage.Sets/src/mage/sets/magic2012/ArachnusSpinner.java index 5ee5694772c..d0eacdfbf62 100644 --- a/Mage.Sets/src/mage/sets/magic2012/ArachnusSpinner.java +++ b/Mage.Sets/src/mage/sets/magic2012/ArachnusSpinner.java @@ -82,7 +82,7 @@ public class ArachnusSpinner extends CardImpl { SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ArachnusSpinnerEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false))); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2012/ArachnusWeb.java b/Mage.Sets/src/mage/sets/magic2012/ArachnusWeb.java index 66846f4d754..45bdddb0e17 100644 --- a/Mage.Sets/src/mage/sets/magic2012/ArachnusWeb.java +++ b/Mage.Sets/src/mage/sets/magic2012/ArachnusWeb.java @@ -60,7 +60,7 @@ public class ArachnusWeb extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/magic2012/ChasmDrake.java b/Mage.Sets/src/mage/sets/magic2012/ChasmDrake.java index 30e6bb66e3b..d5d21f9bc95 100644 --- a/Mage.Sets/src/mage/sets/magic2012/ChasmDrake.java +++ b/Mage.Sets/src/mage/sets/magic2012/ChasmDrake.java @@ -55,7 +55,7 @@ public class ChasmDrake extends CardImpl { this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); Ability ability = new AttacksTriggeredAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), false); - ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2012/CrimsonMage.java b/Mage.Sets/src/mage/sets/magic2012/CrimsonMage.java index 2258336e41d..327ef80114c 100644 --- a/Mage.Sets/src/mage/sets/magic2012/CrimsonMage.java +++ b/Mage.Sets/src/mage/sets/magic2012/CrimsonMage.java @@ -54,7 +54,7 @@ public class CrimsonMage extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); - ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2012/CrownOfEmpires.java b/Mage.Sets/src/mage/sets/magic2012/CrownOfEmpires.java index ab1656a1025..225d4ae0df7 100644 --- a/Mage.Sets/src/mage/sets/magic2012/CrownOfEmpires.java +++ b/Mage.Sets/src/mage/sets/magic2012/CrownOfEmpires.java @@ -55,7 +55,7 @@ public class CrownOfEmpires extends CardImpl { // {3}, {tap}: Tap target creature. Gain control of that creature instead if you control artifacts named Scepter of Empires and Throne of Empires. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CrownOfEmpiresEffect(), new GenericManaCost(3)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2012/DarkFavor.java b/Mage.Sets/src/mage/sets/magic2012/DarkFavor.java index b937117a3ee..603820118e8 100644 --- a/Mage.Sets/src/mage/sets/magic2012/DarkFavor.java +++ b/Mage.Sets/src/mage/sets/magic2012/DarkFavor.java @@ -52,7 +52,7 @@ public class DarkFavor extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Aura"); this.color.setBlack(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/magic2012/DevouringSwarm.java b/Mage.Sets/src/mage/sets/magic2012/DevouringSwarm.java index de174105a3e..e186a07f8c5 100644 --- a/Mage.Sets/src/mage/sets/magic2012/DevouringSwarm.java +++ b/Mage.Sets/src/mage/sets/magic2012/DevouringSwarm.java @@ -55,7 +55,7 @@ public class DevouringSwarm extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); } public DevouringSwarm(final DevouringSwarm card) { diff --git a/Mage.Sets/src/mage/sets/magic2012/DivineFavor.java b/Mage.Sets/src/mage/sets/magic2012/DivineFavor.java index 971592b8382..d1d9a73c9ff 100644 --- a/Mage.Sets/src/mage/sets/magic2012/DivineFavor.java +++ b/Mage.Sets/src/mage/sets/magic2012/DivineFavor.java @@ -52,7 +52,7 @@ public class DivineFavor extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Aura"); this.color.setWhite(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/magic2012/Firebreathing.java b/Mage.Sets/src/mage/sets/magic2012/Firebreathing.java index 40fd066bc9b..d90de453307 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Firebreathing.java +++ b/Mage.Sets/src/mage/sets/magic2012/Firebreathing.java @@ -52,7 +52,7 @@ public class Firebreathing extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Aura"); this.color.setRed(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/magic2012/Flight.java b/Mage.Sets/src/mage/sets/magic2012/Flight.java index e29e96db763..d75fd07be04 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Flight.java +++ b/Mage.Sets/src/mage/sets/magic2012/Flight.java @@ -52,7 +52,7 @@ public class Flight extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Aura"); this.color.setBlue(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/magic2012/GideonsLawkeeper.java b/Mage.Sets/src/mage/sets/magic2012/GideonsLawkeeper.java index 948592d12f8..528a5cd84b2 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GideonsLawkeeper.java +++ b/Mage.Sets/src/mage/sets/magic2012/GideonsLawkeeper.java @@ -58,7 +58,7 @@ public class GideonsLawkeeper extends CardImpl { this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2012/GoblinFireslinger.java b/Mage.Sets/src/mage/sets/magic2012/GoblinFireslinger.java index b9633a262b9..854d4ea0baa 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GoblinFireslinger.java +++ b/Mage.Sets/src/mage/sets/magic2012/GoblinFireslinger.java @@ -55,7 +55,7 @@ public class GoblinFireslinger extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2012/HuntersInsight.java b/Mage.Sets/src/mage/sets/magic2012/HuntersInsight.java index 19f9ec77efc..2636304b695 100644 --- a/Mage.Sets/src/mage/sets/magic2012/HuntersInsight.java +++ b/Mage.Sets/src/mage/sets/magic2012/HuntersInsight.java @@ -56,7 +56,7 @@ public class HuntersInsight extends CardImpl { // Choose target creature you control. Whenever that creature deals combat damage to a player or planeswalker this turn, draw that many cards. this.getSpellAbility().addEffect(new GainAbilityTargetEffect(new HuntersInsightTriggeredAbility(), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); } public HuntersInsight(final HuntersInsight card) { diff --git a/Mage.Sets/src/mage/sets/magic2012/JaceMemoryAdept.java b/Mage.Sets/src/mage/sets/magic2012/JaceMemoryAdept.java index 8b93b1af558..8b3386f497a 100644 --- a/Mage.Sets/src/mage/sets/magic2012/JaceMemoryAdept.java +++ b/Mage.Sets/src/mage/sets/magic2012/JaceMemoryAdept.java @@ -62,12 +62,12 @@ public class JaceMemoryAdept extends CardImpl { // +1: Draw a card. Target player puts the top card of his or her library into his or her graveyard. LoyaltyAbility ability1 = new LoyaltyAbility(new DrawCardSourceControllerEffect(1), 1); ability1.addEffect(new PutLibraryIntoGraveTargetEffect(1)); - ability1.addTarget(new TargetPlayer(true)); + ability1.addTarget(new TargetPlayer()); this.addAbility(ability1); // 0: Target player puts the top ten cards of his or her library into his or her graveyard. LoyaltyAbility ability2 = new LoyaltyAbility(new PutLibraryIntoGraveTargetEffect(10), 0); - ability2.addTarget(new TargetPlayer(true)); + ability2.addTarget(new TargetPlayer()); this.addAbility(ability2); // -7: Any number of target players each draw twenty cards. diff --git a/Mage.Sets/src/mage/sets/magic2012/Lifelink.java b/Mage.Sets/src/mage/sets/magic2012/Lifelink.java index 0683ee8a044..f154effc544 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Lifelink.java +++ b/Mage.Sets/src/mage/sets/magic2012/Lifelink.java @@ -52,7 +52,7 @@ public class Lifelink extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Aura"); this.color.setWhite(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/magic2012/MasterThief.java b/Mage.Sets/src/mage/sets/magic2012/MasterThief.java index 72ca4a8901c..d1e6edec895 100644 --- a/Mage.Sets/src/mage/sets/magic2012/MasterThief.java +++ b/Mage.Sets/src/mage/sets/magic2012/MasterThief.java @@ -68,7 +68,7 @@ public class MasterThief extends CardImpl { new SourceOnBattlefieldControlUnchangedCondition(), "gain control of target artifact for as long as you control Master Thief"); Ability ability = new EntersBattlefieldTriggeredAbility(effect, false); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2012/MerfolkMesmerist.java b/Mage.Sets/src/mage/sets/magic2012/MerfolkMesmerist.java index ddd528fae00..4d1300f2280 100644 --- a/Mage.Sets/src/mage/sets/magic2012/MerfolkMesmerist.java +++ b/Mage.Sets/src/mage/sets/magic2012/MerfolkMesmerist.java @@ -58,7 +58,7 @@ public class MerfolkMesmerist extends CardImpl { this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(2), new ColoredManaCost(ColoredManaSymbol.U)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2012/Monomania.java b/Mage.Sets/src/mage/sets/magic2012/Monomania.java index 490ba0926ed..df5adc89245 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Monomania.java +++ b/Mage.Sets/src/mage/sets/magic2012/Monomania.java @@ -57,7 +57,7 @@ public class Monomania extends CardImpl { // Target player chooses a card in his or her hand and discards the rest. this.getSpellAbility().addEffect(new MonomaniaEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public Monomania(final Monomania card) { diff --git a/Mage.Sets/src/mage/sets/magic2012/OnyxMage.java b/Mage.Sets/src/mage/sets/magic2012/OnyxMage.java index f839ea68e84..0541aa0fc91 100644 --- a/Mage.Sets/src/mage/sets/magic2012/OnyxMage.java +++ b/Mage.Sets/src/mage/sets/magic2012/OnyxMage.java @@ -57,7 +57,7 @@ public class OnyxMage extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{B}")); - ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2012/ScepterOfEmpires.java b/Mage.Sets/src/mage/sets/magic2012/ScepterOfEmpires.java index d4750bc6b68..a4badbcbc78 100644 --- a/Mage.Sets/src/mage/sets/magic2012/ScepterOfEmpires.java +++ b/Mage.Sets/src/mage/sets/magic2012/ScepterOfEmpires.java @@ -56,7 +56,7 @@ public class ScepterOfEmpires extends CardImpl { // {tap}: Scepter of Empires deals 1 damage to target player. It deals 3 damage to that player instead if you control artifacts named Crown of Empires and Throne of Empires. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScepterOfEmpiresEffect(), new GenericManaCost(0)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2012/SorinsThirst.java b/Mage.Sets/src/mage/sets/magic2012/SorinsThirst.java index e20c43ee5e0..70d605d80b0 100644 --- a/Mage.Sets/src/mage/sets/magic2012/SorinsThirst.java +++ b/Mage.Sets/src/mage/sets/magic2012/SorinsThirst.java @@ -48,7 +48,7 @@ public class SorinsThirst extends CardImpl { this.color.setBlack(true); this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellAbility().addEffect(new GainLifeEffect(2)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public SorinsThirst (final SorinsThirst card) { diff --git a/Mage.Sets/src/mage/sets/magic2012/SorinsVengeance.java b/Mage.Sets/src/mage/sets/magic2012/SorinsVengeance.java index 1f2c1adfc67..8a49ad7610c 100644 --- a/Mage.Sets/src/mage/sets/magic2012/SorinsVengeance.java +++ b/Mage.Sets/src/mage/sets/magic2012/SorinsVengeance.java @@ -48,7 +48,7 @@ public class SorinsVengeance extends CardImpl { this.color.setBlack(true); this.getSpellAbility().addEffect(new DamageTargetEffect(10)); this.getSpellAbility().addEffect(new GainLifeEffect(10)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public SorinsVengeance (final SorinsVengeance card) { diff --git a/Mage.Sets/src/mage/sets/magic2012/SpiritMantle.java b/Mage.Sets/src/mage/sets/magic2012/SpiritMantle.java index e4d7bb35410..a4b485a7832 100644 --- a/Mage.Sets/src/mage/sets/magic2012/SpiritMantle.java +++ b/Mage.Sets/src/mage/sets/magic2012/SpiritMantle.java @@ -55,7 +55,7 @@ public class SpiritMantle extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/magic2012/StaveOff.java b/Mage.Sets/src/mage/sets/magic2012/StaveOff.java index f8e46b2f431..b1c1a8217fd 100644 --- a/Mage.Sets/src/mage/sets/magic2012/StaveOff.java +++ b/Mage.Sets/src/mage/sets/magic2012/StaveOff.java @@ -51,7 +51,7 @@ public class StaveOff extends CardImpl { // Target creature gains protection from the color of your choice until end of turn. this.getSpellAbility().addEffect(new GainProtectionFromColorTargetEffect(Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addChoice(new ChoiceColor()); } diff --git a/Mage.Sets/src/mage/sets/magic2012/StingerflingSpider.java b/Mage.Sets/src/mage/sets/magic2012/StingerflingSpider.java index 2d64284ed73..3fe7515887f 100644 --- a/Mage.Sets/src/mage/sets/magic2012/StingerflingSpider.java +++ b/Mage.Sets/src/mage/sets/magic2012/StingerflingSpider.java @@ -63,7 +63,7 @@ public class StingerflingSpider extends CardImpl { this.toughness = new MageInt(5); this.addAbility(ReachAbility.getInstance()); Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), true); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2012/StonehornDignitary.java b/Mage.Sets/src/mage/sets/magic2012/StonehornDignitary.java index 91c3ba95723..8dd8b1e827e 100644 --- a/Mage.Sets/src/mage/sets/magic2012/StonehornDignitary.java +++ b/Mage.Sets/src/mage/sets/magic2012/StonehornDignitary.java @@ -61,7 +61,7 @@ public class StonehornDignitary extends CardImpl { // When Stonehorn Dignitary enters the battlefield, target opponent skips his or her next combat phase. Ability ability = new EntersBattlefieldTriggeredAbility(new SkipNextCombatEffect()); - Target target = new TargetOpponent(true); + Target target = new TargetOpponent(); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/magic2012/TasteOfBlood.java b/Mage.Sets/src/mage/sets/magic2012/TasteOfBlood.java index f9e549fe9cc..074c40a7ff1 100644 --- a/Mage.Sets/src/mage/sets/magic2012/TasteOfBlood.java +++ b/Mage.Sets/src/mage/sets/magic2012/TasteOfBlood.java @@ -48,7 +48,7 @@ public class TasteOfBlood extends CardImpl { this.color.setBlack(true); this.getSpellAbility().addEffect(new DamageTargetEffect(1)); this.getSpellAbility().addEffect(new GainLifeEffect(1)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public TasteOfBlood (final TasteOfBlood card) { diff --git a/Mage.Sets/src/mage/sets/magic2012/TitanicGrowth.java b/Mage.Sets/src/mage/sets/magic2012/TitanicGrowth.java index dae55b1ab34..53a57eb1bea 100644 --- a/Mage.Sets/src/mage/sets/magic2012/TitanicGrowth.java +++ b/Mage.Sets/src/mage/sets/magic2012/TitanicGrowth.java @@ -47,7 +47,7 @@ public class TitanicGrowth extends CardImpl { this.expansionSetCode = "M12"; this.color.setGreen(true); this.getSpellAbility().addEffect(new BoostTargetEffect(4, 4, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public TitanicGrowth(final TitanicGrowth card) { diff --git a/Mage.Sets/src/mage/sets/magic2012/Trollhide.java b/Mage.Sets/src/mage/sets/magic2012/Trollhide.java index 06e53a02b72..83f4ab00cf6 100644 --- a/Mage.Sets/src/mage/sets/magic2012/Trollhide.java +++ b/Mage.Sets/src/mage/sets/magic2012/Trollhide.java @@ -55,7 +55,7 @@ public class Trollhide extends CardImpl { this.expansionSetCode = "M12"; this.subtype.add("Aura"); this.color.setGreen(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/magic2012/TurnToFrog.java b/Mage.Sets/src/mage/sets/magic2012/TurnToFrog.java index c090c5589d2..0af1145b9f4 100644 --- a/Mage.Sets/src/mage/sets/magic2012/TurnToFrog.java +++ b/Mage.Sets/src/mage/sets/magic2012/TurnToFrog.java @@ -52,7 +52,7 @@ public class TurnToFrog extends CardImpl { // Target creature loses all abilities and becomes a 1/1 blue Frog until end of turn. this.getSpellAbility().addEffect(new LoseAllAbilitiesTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new BecomesCreatureTargetEffect(new FrogToken(), null, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public TurnToFrog(final TurnToFrog card) { diff --git a/Mage.Sets/src/mage/sets/magic2012/WringFlesh.java b/Mage.Sets/src/mage/sets/magic2012/WringFlesh.java index e1eeaeba85d..66c57934e7c 100644 --- a/Mage.Sets/src/mage/sets/magic2012/WringFlesh.java +++ b/Mage.Sets/src/mage/sets/magic2012/WringFlesh.java @@ -47,7 +47,7 @@ public class WringFlesh extends CardImpl { this.expansionSetCode = "M12"; this.color.setBlack(true); this.getSpellAbility().addEffect(new BoostTargetEffect(-3, -1, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public WringFlesh(final WringFlesh card) { diff --git a/Mage.Sets/src/mage/sets/magic2013/AjaniCallerOfThePride.java b/Mage.Sets/src/mage/sets/magic2013/AjaniCallerOfThePride.java index 1d82f2c455d..414f2eae255 100644 --- a/Mage.Sets/src/mage/sets/magic2013/AjaniCallerOfThePride.java +++ b/Mage.Sets/src/mage/sets/magic2013/AjaniCallerOfThePride.java @@ -75,7 +75,7 @@ public class AjaniCallerOfThePride extends CardImpl { effects.add(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); effects.add(new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn)); ability = new LoyaltyAbility(effects, -3); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // -8: Put X 2/2 white Cat creature tokens onto the battlefield, where X is your life total. this.addAbility(new LoyaltyAbility(new CreateTokenEffect(new CatToken(), new ControllerLifeCount()), -8)); diff --git a/Mage.Sets/src/mage/sets/magic2013/ArmsDealer.java b/Mage.Sets/src/mage/sets/magic2013/ArmsDealer.java index b9a2265000f..17445ac32c8 100644 --- a/Mage.Sets/src/mage/sets/magic2013/ArmsDealer.java +++ b/Mage.Sets/src/mage/sets/magic2013/ArmsDealer.java @@ -69,7 +69,7 @@ public class ArmsDealer extends CardImpl { new DamageTargetEffect(4), new ManaCostsImpl("{1}{R}")); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2013/BattleflightEagle.java b/Mage.Sets/src/mage/sets/magic2013/BattleflightEagle.java index f8fe1f80698..1ebd6962a86 100644 --- a/Mage.Sets/src/mage/sets/magic2013/BattleflightEagle.java +++ b/Mage.Sets/src/mage/sets/magic2013/BattleflightEagle.java @@ -64,7 +64,7 @@ public class BattleflightEagle extends CardImpl { // When Battleflight Eagle enters the battlefield, target creature gets +2/+2 and gains flying until end of turn. Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); ability.addEffect(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2013/BloodhunterBat.java b/Mage.Sets/src/mage/sets/magic2013/BloodhunterBat.java index 47ea228a0d6..34c1c6bcbd3 100644 --- a/Mage.Sets/src/mage/sets/magic2013/BloodhunterBat.java +++ b/Mage.Sets/src/mage/sets/magic2013/BloodhunterBat.java @@ -59,7 +59,7 @@ public class BloodhunterBat extends CardImpl { // When Bloodhunter Bat enters the battlefield, target player loses 2 life and you gain 2 life. Ability ability = new EntersBattlefieldTriggeredAbility(new LoseLifeTargetEffect(2)); ability.addEffect(new GainLifeEffect(2)); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2013/BondBeetle.java b/Mage.Sets/src/mage/sets/magic2013/BondBeetle.java index b8e4b3a946c..16304f2b4c6 100644 --- a/Mage.Sets/src/mage/sets/magic2013/BondBeetle.java +++ b/Mage.Sets/src/mage/sets/magic2013/BondBeetle.java @@ -56,7 +56,7 @@ public class BondBeetle extends CardImpl { // When Bond Beetle enters the battlefield, put a +1/+1 counter on target creature. Ability ability = new EntersBattlefieldTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance())); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2013/ChandrasFury.java b/Mage.Sets/src/mage/sets/magic2013/ChandrasFury.java index 38299f82b96..6f6dc488008 100644 --- a/Mage.Sets/src/mage/sets/magic2013/ChandrasFury.java +++ b/Mage.Sets/src/mage/sets/magic2013/ChandrasFury.java @@ -51,7 +51,7 @@ public class ChandrasFury extends CardImpl { // Chandra's Fury deals 4 damage to target player and 1 damage to each creature that player controls. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); this.getSpellAbility().addEffect(new DamageAllControlledTargetEffect(1, new FilterCreaturePermanent())); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public ChandrasFury(final ChandrasFury card) { diff --git a/Mage.Sets/src/mage/sets/magic2013/CourtlyProvocateur.java b/Mage.Sets/src/mage/sets/magic2013/CourtlyProvocateur.java index f8bcba717ff..9ee49bf2a87 100644 --- a/Mage.Sets/src/mage/sets/magic2013/CourtlyProvocateur.java +++ b/Mage.Sets/src/mage/sets/magic2013/CourtlyProvocateur.java @@ -63,13 +63,13 @@ public class CourtlyProvocateur extends CardImpl { // {tap}: Target creature attacks this turn if able. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttacksIfAbleTargetEffect(Duration.EndOfTurn), new TapSourceCost()); ability.addEffect(new GainAbilityTargetEffect(AttacksThisTurnMarkerAbility.getInstance(), Duration.EndOfTurn, null)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {tap}: Target creature blocks this turn if able. Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BlocksIfAbleTargetEffect(Duration.EndOfTurn), new TapSourceCost()); ability2.addEffect(new GainAbilityTargetEffect(BlocksThisTurnMarkerAbility.getInstance(), Duration.EndOfTurn, null)); - ability2.addTarget(new TargetCreaturePermanent(true)); + ability2.addTarget(new TargetCreaturePermanent()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/sets/magic2013/CripplingBlight.java b/Mage.Sets/src/mage/sets/magic2013/CripplingBlight.java index 811e411b419..e893f8e22d5 100644 --- a/Mage.Sets/src/mage/sets/magic2013/CripplingBlight.java +++ b/Mage.Sets/src/mage/sets/magic2013/CripplingBlight.java @@ -57,7 +57,7 @@ public class CripplingBlight extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent target = new TargetCreaturePermanent(true); + TargetPermanent target = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(target); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(target.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/magic2013/DiscipleOfBolas.java b/Mage.Sets/src/mage/sets/magic2013/DiscipleOfBolas.java index b4cc4977291..59802d658ca 100644 --- a/Mage.Sets/src/mage/sets/magic2013/DiscipleOfBolas.java +++ b/Mage.Sets/src/mage/sets/magic2013/DiscipleOfBolas.java @@ -68,7 +68,7 @@ public class DiscipleOfBolas extends CardImpl { // When Disciple of Bolas enters the battlefield, sacrifice another creature. You gain X life and draw X cards, where X is that creature's power. Ability ability = new EntersBattlefieldTriggeredAbility(new DiscipleOfBolasEffect()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2013/Encrust.java b/Mage.Sets/src/mage/sets/magic2013/Encrust.java index 2af22110d05..e88c8c9ccf4 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Encrust.java +++ b/Mage.Sets/src/mage/sets/magic2013/Encrust.java @@ -67,7 +67,7 @@ public class Encrust extends CardImpl { this.color.setBlue(true); // Enchant artifact or creature - TargetPermanent auraTarget = new TargetPermanent(filter, true); + TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/magic2013/GoblinBattleJester.java b/Mage.Sets/src/mage/sets/magic2013/GoblinBattleJester.java index 7b88c871fc8..85577dd6292 100644 --- a/Mage.Sets/src/mage/sets/magic2013/GoblinBattleJester.java +++ b/Mage.Sets/src/mage/sets/magic2013/GoblinBattleJester.java @@ -64,7 +64,7 @@ public class GoblinBattleJester extends CardImpl { // Whenever you cast a red spell, target creature can't block this turn. Ability ability = new SpellCastControllerTriggeredAbility(new CantBlockTargetEffect(Duration.EndOfTurn), filter, false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2013/Hydrosurge.java b/Mage.Sets/src/mage/sets/magic2013/Hydrosurge.java index dc09f89bb13..649a21ac0ff 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Hydrosurge.java +++ b/Mage.Sets/src/mage/sets/magic2013/Hydrosurge.java @@ -49,7 +49,7 @@ public class Hydrosurge extends CardImpl { // Target creature gets -5/-0 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(-5, 0, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public Hydrosurge(final Hydrosurge card) { diff --git a/Mage.Sets/src/mage/sets/magic2013/LilianaOfTheDarkRealms.java b/Mage.Sets/src/mage/sets/magic2013/LilianaOfTheDarkRealms.java index c571aa6377d..eeaca4f1686 100644 --- a/Mage.Sets/src/mage/sets/magic2013/LilianaOfTheDarkRealms.java +++ b/Mage.Sets/src/mage/sets/magic2013/LilianaOfTheDarkRealms.java @@ -86,7 +86,7 @@ public class LilianaOfTheDarkRealms extends CardImpl { this.addAbility(new LoyaltyAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true), 1)); // -3: Target creature gets +X/+X or -X/-X until end of turn, where X is the number of Swamps you control. LoyaltyAbility ability = new LoyaltyAbility(new LilianaOfTheDarkRealmsEffect(), -3); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // -6: You get an emblem with "Swamps you control have '{tap}: Add {B}{B}{B}{B} to your mana pool.'" this.addAbility(new LoyaltyAbility(new GetEmblemEffect(new LilianaOfTheDarkRealmsEmblem()), -6)); diff --git a/Mage.Sets/src/mage/sets/magic2013/MarkOfTheVampire.java b/Mage.Sets/src/mage/sets/magic2013/MarkOfTheVampire.java index dfac1b6f9a8..4a63c19fc72 100644 --- a/Mage.Sets/src/mage/sets/magic2013/MarkOfTheVampire.java +++ b/Mage.Sets/src/mage/sets/magic2013/MarkOfTheVampire.java @@ -58,7 +58,7 @@ public class MarkOfTheVampire extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent target = new TargetCreaturePermanent(true); + TargetPermanent target = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(target); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); this.addAbility(new EnchantAbility(target.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/magic2013/MindSculpt.java b/Mage.Sets/src/mage/sets/magic2013/MindSculpt.java index 55e997ea394..82aefe5e9b1 100644 --- a/Mage.Sets/src/mage/sets/magic2013/MindSculpt.java +++ b/Mage.Sets/src/mage/sets/magic2013/MindSculpt.java @@ -48,7 +48,7 @@ public class MindSculpt extends CardImpl { // Target opponent puts the top seven cards of his or her library into his or her graveyard. this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(7)); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); } public MindSculpt(final MindSculpt card) { diff --git a/Mage.Sets/src/mage/sets/magic2013/MindclawShaman.java b/Mage.Sets/src/mage/sets/magic2013/MindclawShaman.java index 928e2a44d09..bb1c1f5900e 100644 --- a/Mage.Sets/src/mage/sets/magic2013/MindclawShaman.java +++ b/Mage.Sets/src/mage/sets/magic2013/MindclawShaman.java @@ -65,7 +65,7 @@ public class MindclawShaman extends CardImpl { // When Mindclaw Shaman enters the battlefield, target opponent reveals his or her hand. You may cast an instant or sorcery card from it without paying its mana cost. Ability ability = new EntersBattlefieldTriggeredAbility(new MindclawShamanEffect(), false); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2013/Murder.java b/Mage.Sets/src/mage/sets/magic2013/Murder.java index 4429529198c..e9cabd3bf27 100644 --- a/Mage.Sets/src/mage/sets/magic2013/Murder.java +++ b/Mage.Sets/src/mage/sets/magic2013/Murder.java @@ -48,7 +48,7 @@ public class Murder extends CardImpl { // Destroy target creature. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public Murder(final Murder card) { diff --git a/Mage.Sets/src/mage/sets/magic2013/PublicExecution.java b/Mage.Sets/src/mage/sets/magic2013/PublicExecution.java index 4c0bf19fcb7..85b5e541b8c 100644 --- a/Mage.Sets/src/mage/sets/magic2013/PublicExecution.java +++ b/Mage.Sets/src/mage/sets/magic2013/PublicExecution.java @@ -65,7 +65,7 @@ public class PublicExecution extends CardImpl { // Destroy target creature an opponent controls. Each other creature that player controls gets -2/-0 until end of turn. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new PublicExecutionEffect()); } diff --git a/Mage.Sets/src/mage/sets/magic2013/SandsOfDelirium.java b/Mage.Sets/src/mage/sets/magic2013/SandsOfDelirium.java index 66d3aa7cbfb..0b4cf76473f 100644 --- a/Mage.Sets/src/mage/sets/magic2013/SandsOfDelirium.java +++ b/Mage.Sets/src/mage/sets/magic2013/SandsOfDelirium.java @@ -55,7 +55,7 @@ public class SandsOfDelirium extends CardImpl { // {X}, {tap}: Target player puts the top X cards of his or her library into his or her graveyard. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(new ManacostVariableValue()), new VariableManaCost()); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2013/SearingSpear.java b/Mage.Sets/src/mage/sets/magic2013/SearingSpear.java index c6f49d90a13..2a883669b59 100644 --- a/Mage.Sets/src/mage/sets/magic2013/SearingSpear.java +++ b/Mage.Sets/src/mage/sets/magic2013/SearingSpear.java @@ -48,7 +48,7 @@ public class SearingSpear extends CardImpl { // Searing Spear deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); } public SearingSpear(final SearingSpear card) { diff --git a/Mage.Sets/src/mage/sets/magic2013/SerpentsGift.java b/Mage.Sets/src/mage/sets/magic2013/SerpentsGift.java index 6e2a3193fda..44caa9566ac 100644 --- a/Mage.Sets/src/mage/sets/magic2013/SerpentsGift.java +++ b/Mage.Sets/src/mage/sets/magic2013/SerpentsGift.java @@ -50,7 +50,7 @@ public class SerpentsGift extends CardImpl { // Target creature gains deathtouch until end of turn. this.getSpellAbility().addEffect(new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public SerpentsGift(final SerpentsGift card) { diff --git a/Mage.Sets/src/mage/sets/magic2013/ShowOfValor.java b/Mage.Sets/src/mage/sets/magic2013/ShowOfValor.java index af574b04e4c..724be7605c1 100644 --- a/Mage.Sets/src/mage/sets/magic2013/ShowOfValor.java +++ b/Mage.Sets/src/mage/sets/magic2013/ShowOfValor.java @@ -49,7 +49,7 @@ public class ShowOfValor extends CardImpl { // Target creature gets +2/+4 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(2, 4, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public ShowOfValor(final ShowOfValor card) { diff --git a/Mage.Sets/src/mage/sets/magic2013/TricksOfTheTrade.java b/Mage.Sets/src/mage/sets/magic2013/TricksOfTheTrade.java index 156ba889950..ee7e92fcada 100644 --- a/Mage.Sets/src/mage/sets/magic2013/TricksOfTheTrade.java +++ b/Mage.Sets/src/mage/sets/magic2013/TricksOfTheTrade.java @@ -57,7 +57,7 @@ public class TricksOfTheTrade extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent target = new TargetCreaturePermanent(true); + TargetPermanent target = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(target); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); this.addAbility(new EnchantAbility(target.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/magic2013/VoidStalker.java b/Mage.Sets/src/mage/sets/magic2013/VoidStalker.java index 34cdd67dad4..e64efb61285 100644 --- a/Mage.Sets/src/mage/sets/magic2013/VoidStalker.java +++ b/Mage.Sets/src/mage/sets/magic2013/VoidStalker.java @@ -63,7 +63,7 @@ public class VoidStalker extends CardImpl { // {2}{U}, {tap}: Put Void Stalker and target creature on top of their owners' libraries, then those players shuffle their libraries. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VoidStalkerEffect(), new ManaCostsImpl("{2}{U}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2013/WitsEnd.java b/Mage.Sets/src/mage/sets/magic2013/WitsEnd.java index 92936bf5a95..0557d21bb48 100644 --- a/Mage.Sets/src/mage/sets/magic2013/WitsEnd.java +++ b/Mage.Sets/src/mage/sets/magic2013/WitsEnd.java @@ -54,7 +54,7 @@ public class WitsEnd extends CardImpl { // Target player discards his or her hand. this.getSpellAbility().addEffect(new WitsEndEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public WitsEnd(final WitsEnd card) { diff --git a/Mage.Sets/src/mage/sets/magic2013/XathridGorgon.java b/Mage.Sets/src/mage/sets/magic2013/XathridGorgon.java index 28538b9dd4c..7dc330e311e 100644 --- a/Mage.Sets/src/mage/sets/magic2013/XathridGorgon.java +++ b/Mage.Sets/src/mage/sets/magic2013/XathridGorgon.java @@ -75,7 +75,7 @@ public class XathridGorgon extends CardImpl { // {2}{B}, {tap}: Put a petrification counter on target creature. It gains defender and becomes a colorless artifact in addition to its other types. Its activated abilities can't be activated. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.PETRIFICATION.createInstance()), new ManaCostsImpl("{2}{B}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); Effect effect = new GainAbilityTargetEffect(DefenderAbility.getInstance(), Duration.Custom); effect.setText("It gains defender"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/sets/magic2013/YevasForcemage.java b/Mage.Sets/src/mage/sets/magic2013/YevasForcemage.java index cd1bc3b3ce9..50cb7ab4cb0 100644 --- a/Mage.Sets/src/mage/sets/magic2013/YevasForcemage.java +++ b/Mage.Sets/src/mage/sets/magic2013/YevasForcemage.java @@ -56,7 +56,7 @@ public class YevasForcemage extends CardImpl { // When Yeva's Forcemage enters the battlefield, target creature gets +2/+2 until end of turn. Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2014/AdvocateOfTheBeast.java b/Mage.Sets/src/mage/sets/magic2014/AdvocateOfTheBeast.java index 4df30e35e54..7e3cf5cd6dd 100644 --- a/Mage.Sets/src/mage/sets/magic2014/AdvocateOfTheBeast.java +++ b/Mage.Sets/src/mage/sets/magic2014/AdvocateOfTheBeast.java @@ -67,7 +67,7 @@ public class AdvocateOfTheBeast extends CardImpl { // At the beginning of your end step, put a +1/+1 counter on target Beast creature you control. Ability ability = new BeginningOfEndStepTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), TargetController.YOU, false); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/magic2014/ArtificersHex.java b/Mage.Sets/src/mage/sets/magic2014/ArtificersHex.java index 6e9ca52476a..623c97ef5a9 100644 --- a/Mage.Sets/src/mage/sets/magic2014/ArtificersHex.java +++ b/Mage.Sets/src/mage/sets/magic2014/ArtificersHex.java @@ -66,7 +66,7 @@ public class ArtificersHex extends CardImpl { this.color.setBlack(true); // Enchant Equipment - TargetPermanent auraTarget = new TargetPermanent(filter, true); + TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/magic2014/BanisherPriest.java b/Mage.Sets/src/mage/sets/magic2014/BanisherPriest.java index 167645b9a30..535c08658e0 100644 --- a/Mage.Sets/src/mage/sets/magic2014/BanisherPriest.java +++ b/Mage.Sets/src/mage/sets/magic2014/BanisherPriest.java @@ -74,7 +74,7 @@ public class BanisherPriest extends CardImpl { // When Banisher Priest enters the battlefield, exile target creature an opponent controls until Banisher Priest leaves the battlefield. Ability ability = new EntersBattlefieldTriggeredAbility(new BanisherPriestExileEffect()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); // Implemented as triggered effect that doesn't uses the stack (implementation with watcher does not work correctly because if the returned creature // has a DiesTriggeredAll ability it triggers for the dying Banish Priest, what shouldn't happen) diff --git a/Mage.Sets/src/mage/sets/magic2014/BarrageOfExpendables.java b/Mage.Sets/src/mage/sets/magic2014/BarrageOfExpendables.java index 15d26f6c34e..ffe0aadca01 100644 --- a/Mage.Sets/src/mage/sets/magic2014/BarrageOfExpendables.java +++ b/Mage.Sets/src/mage/sets/magic2014/BarrageOfExpendables.java @@ -54,7 +54,7 @@ public class BarrageOfExpendables extends CardImpl { // {R}, Sacrifice a creature: Barrage of Expendables deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{R}")); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/magic2014/Blightcaster.java b/Mage.Sets/src/mage/sets/magic2014/Blightcaster.java index 191cec90b03..066ea1160dd 100644 --- a/Mage.Sets/src/mage/sets/magic2014/Blightcaster.java +++ b/Mage.Sets/src/mage/sets/magic2014/Blightcaster.java @@ -65,7 +65,7 @@ public class Blightcaster extends CardImpl { // Whenever you cast an enchantment spell, you may have target creature get -2/-2 until end of turn. Effect effect = new BoostTargetEffect(-2,-2, Duration.EndOfTurn); Ability ability = new SpellCastControllerTriggeredAbility(effect, filter, true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2014/CelestialFlare.java b/Mage.Sets/src/mage/sets/magic2014/CelestialFlare.java index 79b24f92581..b1bbf3852c2 100644 --- a/Mage.Sets/src/mage/sets/magic2014/CelestialFlare.java +++ b/Mage.Sets/src/mage/sets/magic2014/CelestialFlare.java @@ -51,7 +51,7 @@ public class CelestialFlare extends CardImpl { // Target player sacrifices an attacking or blocking creature. this.getSpellAbility().addEffect(new SacrificeEffect(filter, 1, "Target player")); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } diff --git a/Mage.Sets/src/mage/sets/magic2014/ChandraPyromaster.java b/Mage.Sets/src/mage/sets/magic2014/ChandraPyromaster.java index 5f6f9f150a9..747db7af0c1 100644 --- a/Mage.Sets/src/mage/sets/magic2014/ChandraPyromaster.java +++ b/Mage.Sets/src/mage/sets/magic2014/ChandraPyromaster.java @@ -81,7 +81,7 @@ public class ChandraPyromaster extends CardImpl { // +1: Chandra, Pyromaster deals 1 damage to target player and 1 damage to up to one target creature that player controls. That creature can't block this turn. LoyaltyAbility ability1 = new LoyaltyAbility(new ChandraPyromasterEffect1(), 1); - Target target1 = new TargetPlayer(true); + Target target1 = new TargetPlayer(); ability1.addTarget(target1); ability1.addTarget(new ChandraPyromasterTarget()); this.addAbility(ability1); diff --git a/Mage.Sets/src/mage/sets/magic2014/ColossalWhale.java b/Mage.Sets/src/mage/sets/magic2014/ColossalWhale.java index 38930b4c37a..cbec2ba2ef3 100644 --- a/Mage.Sets/src/mage/sets/magic2014/ColossalWhale.java +++ b/Mage.Sets/src/mage/sets/magic2014/ColossalWhale.java @@ -104,7 +104,7 @@ class ColossalWhaleAbility extends TriggeredAbilityImpl { filter.add(new ControllerIdPredicate(defenderId)); this.getTargets().clear(); - TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true); + TargetCreaturePermanent target = new TargetCreaturePermanent(filter); target.setRequired(true); this.addTarget(target); return true; diff --git a/Mage.Sets/src/mage/sets/magic2014/Enlarge.java b/Mage.Sets/src/mage/sets/magic2014/Enlarge.java index e2926c52ec1..3f4cedcb82d 100644 --- a/Mage.Sets/src/mage/sets/magic2014/Enlarge.java +++ b/Mage.Sets/src/mage/sets/magic2014/Enlarge.java @@ -54,7 +54,7 @@ public class Enlarge extends CardImpl { this.getSpellAbility().addEffect(new BoostTargetEffect(7,7, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addEffect(new MustBeBlockedByAtLeastOneTargetEffect(Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public Enlarge(final Enlarge card) { diff --git a/Mage.Sets/src/mage/sets/magic2014/FleshpulperGiant.java b/Mage.Sets/src/mage/sets/magic2014/FleshpulperGiant.java index 056573c6a4b..f30627e1f2d 100644 --- a/Mage.Sets/src/mage/sets/magic2014/FleshpulperGiant.java +++ b/Mage.Sets/src/mage/sets/magic2014/FleshpulperGiant.java @@ -63,7 +63,7 @@ public class FleshpulperGiant extends CardImpl { // When Fleshpulper Giant enters the battlefield, you may destroy target creature with toughness 2 or less. Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), true); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2014/GnawingZombie.java b/Mage.Sets/src/mage/sets/magic2014/GnawingZombie.java index 3ed25f8b130..ad34e11a4c5 100644 --- a/Mage.Sets/src/mage/sets/magic2014/GnawingZombie.java +++ b/Mage.Sets/src/mage/sets/magic2014/GnawingZombie.java @@ -60,8 +60,8 @@ public class GnawingZombie extends CardImpl { // {1}{B}, Sacrifice a creature: Target player loses 1 life and you gain 1 life. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl("{1}{B}")); ability.addEffect(new GainLifeEffect(1)); - ability.addTarget(new TargetPlayer(true)); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addTarget(new TargetPlayer()); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2014/HuntTheWeak.java b/Mage.Sets/src/mage/sets/magic2014/HuntTheWeak.java index 2c1f9aa0365..7b7c0777047 100644 --- a/Mage.Sets/src/mage/sets/magic2014/HuntTheWeak.java +++ b/Mage.Sets/src/mage/sets/magic2014/HuntTheWeak.java @@ -66,8 +66,8 @@ public class HuntTheWeak extends CardImpl { effect = new FightTargetsEffect(); effect.setText("Then that creature fights target creature you don't control"); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); - Target target = new TargetCreaturePermanent(filter, true); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); this.getSpellAbility().addTarget(target); diff --git a/Mage.Sets/src/mage/sets/magic2014/IllusionaryArmor.java b/Mage.Sets/src/mage/sets/magic2014/IllusionaryArmor.java index 3d3d00b6cf8..bf8b5542f95 100644 --- a/Mage.Sets/src/mage/sets/magic2014/IllusionaryArmor.java +++ b/Mage.Sets/src/mage/sets/magic2014/IllusionaryArmor.java @@ -60,7 +60,7 @@ public class IllusionaryArmor extends CardImpl { this.color.setBlue(true); // Enchant Creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/magic2014/JacesMindseeker.java b/Mage.Sets/src/mage/sets/magic2014/JacesMindseeker.java index cfd2d69f5d8..5d574edc744 100644 --- a/Mage.Sets/src/mage/sets/magic2014/JacesMindseeker.java +++ b/Mage.Sets/src/mage/sets/magic2014/JacesMindseeker.java @@ -69,7 +69,7 @@ public class JacesMindseeker extends CardImpl { // When Jace's Mindseeker enters the battlefield, target opponent puts the top five cards of his or her library into his or her graveyard. // You may cast an instant or sorcery card from among them without paying its mana cost. Ability ability = new EntersBattlefieldTriggeredAbility(new JaceMindseekerEffect()); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2014/LifebaneZombie.java b/Mage.Sets/src/mage/sets/magic2014/LifebaneZombie.java index b18ba5d02c0..17be7c74b91 100644 --- a/Mage.Sets/src/mage/sets/magic2014/LifebaneZombie.java +++ b/Mage.Sets/src/mage/sets/magic2014/LifebaneZombie.java @@ -69,7 +69,7 @@ public class LifebaneZombie extends CardImpl { this.addAbility(IntimidateAbility.getInstance()); // When Lifebane Zombie enters the battlefield, target opponent reveals his or her hand. You choose a green or white creature card from it and exile that card. Ability ability = new EntersBattlefieldTriggeredAbility(new ExileCardYouChooseTargetOpponentEffect(filter)); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2014/LiturgyOfBlood.java b/Mage.Sets/src/mage/sets/magic2014/LiturgyOfBlood.java index b035eb971bf..394d9545c5a 100644 --- a/Mage.Sets/src/mage/sets/magic2014/LiturgyOfBlood.java +++ b/Mage.Sets/src/mage/sets/magic2014/LiturgyOfBlood.java @@ -50,7 +50,7 @@ public class LiturgyOfBlood extends CardImpl { // Destroy target creature. Add {B}{B}{B} to your mana pool. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BasicManaEffect(new Mana(0, 0, 0, 0, 3, 0, 0))); } diff --git a/Mage.Sets/src/mage/sets/magic2014/MasterOfDiversion.java b/Mage.Sets/src/mage/sets/magic2014/MasterOfDiversion.java index 9c63e8df0d5..a796d8b27e0 100644 --- a/Mage.Sets/src/mage/sets/magic2014/MasterOfDiversion.java +++ b/Mage.Sets/src/mage/sets/magic2014/MasterOfDiversion.java @@ -75,7 +75,7 @@ public class MasterOfDiversion extends CardImpl { FilterCreaturePermanent filter = new FilterCreaturePermanent("creature defending player controls"); UUID defenderId = game.getCombat().getDefenderId(ability.getSourceId()); filter.add(new ControllerIdPredicate(defenderId)); - TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true); + TargetCreaturePermanent target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); } diff --git a/Mage.Sets/src/mage/sets/magic2014/OathOfTheAncientWood.java b/Mage.Sets/src/mage/sets/magic2014/OathOfTheAncientWood.java index 17a0b5d452c..16ae7014c27 100644 --- a/Mage.Sets/src/mage/sets/magic2014/OathOfTheAncientWood.java +++ b/Mage.Sets/src/mage/sets/magic2014/OathOfTheAncientWood.java @@ -62,7 +62,7 @@ public class OathOfTheAncientWood extends CardImpl { // Whenever Oath of the Ancient Wood or another enchantment enters the battlefield under your control, you may put a +1/+1 counter on target creature. Effect effect = new AddCountersTargetEffect(CounterType.P1P1.createInstance()); Ability ability = new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, effect, filter, true, false, null, true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2014/PrimevalBounty.java b/Mage.Sets/src/mage/sets/magic2014/PrimevalBounty.java index 89e584e9019..200250464c8 100644 --- a/Mage.Sets/src/mage/sets/magic2014/PrimevalBounty.java +++ b/Mage.Sets/src/mage/sets/magic2014/PrimevalBounty.java @@ -71,7 +71,7 @@ public class PrimevalBounty extends CardImpl { // Whenever you cast a noncreature spell, put three +1/+1 counters on target creature you control. Effect effect = new AddCountersTargetEffect(CounterType.P1P1.createInstance(3)); Ability ability = new SpellCastControllerTriggeredAbility(effect, filterNonCreature, false); - ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); // Whenever a land enters the battlefield under your control, you gain 3 life. diff --git a/Mage.Sets/src/mage/sets/magic2014/ShadowbornDemon.java b/Mage.Sets/src/mage/sets/magic2014/ShadowbornDemon.java index 7bd8f67e90c..448f518d434 100644 --- a/Mage.Sets/src/mage/sets/magic2014/ShadowbornDemon.java +++ b/Mage.Sets/src/mage/sets/magic2014/ShadowbornDemon.java @@ -77,13 +77,13 @@ public class ShadowbornDemon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Shadowborn Demon enters the battlefield, destroy target non-Demon creature. Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(),false); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); // At the beginning of your upkeep, if there are fewer than six creature cards in your graveyard, sacrifice a creature. TriggeredAbility triggeredAbility = new BeginningOfUpkeepTriggeredAbility(new SacrificeTargetEffect(), TargetController.YOU, false); - target = new TargetControlledCreaturePermanent(true); + target = new TargetControlledCreaturePermanent(); target.setNotTarget(false); triggeredAbility.addTarget(target); this.addAbility(new ConditionalTriggeredAbility( diff --git a/Mage.Sets/src/mage/sets/magic2014/ThorncasterSliver.java b/Mage.Sets/src/mage/sets/magic2014/ThorncasterSliver.java index 792a6470cf9..60d61ad183a 100644 --- a/Mage.Sets/src/mage/sets/magic2014/ThorncasterSliver.java +++ b/Mage.Sets/src/mage/sets/magic2014/ThorncasterSliver.java @@ -59,7 +59,7 @@ public class ThorncasterSliver extends CardImpl { // Sliver creatures you control have "Whenever this creature attacks, it deals 1 damage to target creature or player." Ability ability = new AttacksTriggeredAbility(new DamageTargetEffect(1), false); - ability.addTarget(new TargetCreatureOrPlayer(true)); + ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Sliver","Sliver creatures"), diff --git a/Mage.Sets/src/mage/sets/magic2014/TidebinderMage.java b/Mage.Sets/src/mage/sets/magic2014/TidebinderMage.java index a7110c5d2a0..382100de98d 100644 --- a/Mage.Sets/src/mage/sets/magic2014/TidebinderMage.java +++ b/Mage.Sets/src/mage/sets/magic2014/TidebinderMage.java @@ -81,7 +81,7 @@ public class TidebinderMage extends CardImpl { // That creature doesn't untap during its controller's untap step for as long as you control Tidebinder Mage. Ability ability = new EntersBattlefieldTriggeredAbility(new TapTargetEffect(), false); ability.addEffect(new TidebinderMageEffect()); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/magic2014/VialOfPoison.java b/Mage.Sets/src/mage/sets/magic2014/VialOfPoison.java index 0ab38eccc61..64c0341d9d4 100644 --- a/Mage.Sets/src/mage/sets/magic2014/VialOfPoison.java +++ b/Mage.Sets/src/mage/sets/magic2014/VialOfPoison.java @@ -54,7 +54,7 @@ public class VialOfPoison extends CardImpl { // {1}, Sacrifice Vial of Poison: Target creature gains deathtouch until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}")); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2014/ZephyrCharge.java b/Mage.Sets/src/mage/sets/magic2014/ZephyrCharge.java index 0f3034deb9d..fe4634f1c7d 100644 --- a/Mage.Sets/src/mage/sets/magic2014/ZephyrCharge.java +++ b/Mage.Sets/src/mage/sets/magic2014/ZephyrCharge.java @@ -54,7 +54,7 @@ public class ZephyrCharge extends CardImpl { // {1}{U}: Target creature gains flying until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{U}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Bribery.java b/Mage.Sets/src/mage/sets/mercadianmasques/Bribery.java index 07fa1bb5883..c87313689ce 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/Bribery.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/Bribery.java @@ -57,7 +57,7 @@ public class Bribery extends CardImpl { // Search target opponent's library for a creature card and put that card onto the battlefield under your control. Then that player shuffles his or her library. this.getSpellAbility().addEffect(new BriberyEffect()); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); } diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/CateranOverlord.java b/Mage.Sets/src/mage/sets/mercadianmasques/CateranOverlord.java index 7fcd38dabc1..4b069675667 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/CateranOverlord.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/CateranOverlord.java @@ -72,7 +72,7 @@ public class CateranOverlord extends CardImpl { this.toughness = new MageInt(5); // Sacrifice a creature: Regenerate Cateran Overlord. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); // {6}, {T}: Search your library for a Mercenary permanent card with converted mana cost 6 or less and put it onto the battlefield. Then shuffle your library. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); ability.addManaCost(new GenericManaCost(6)); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/HighMarket.java b/Mage.Sets/src/mage/sets/mercadianmasques/HighMarket.java index 70075d4e446..a43cf187fa9 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/HighMarket.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/HighMarket.java @@ -54,7 +54,7 @@ public class HighMarket extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {tap}, Sacrifice a creature: You gain 1 life. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new TapSourceCost()); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Lunge.java b/Mage.Sets/src/mage/sets/mercadianmasques/Lunge.java index e2b94fdfbe0..85139507c71 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/Lunge.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/Lunge.java @@ -51,13 +51,13 @@ public class Lunge extends CardImpl { // Lunge deals 2 damage to target creature and 2 damage to target player. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); Effect effect = new DamageTargetEffect(1); effect.setTargetPointer(new SecondTargetPointer()); effect.setText("and 2 damage to target player"); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public Lunge(final Lunge card) { diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Muzzle.java b/Mage.Sets/src/mage/sets/mercadianmasques/Muzzle.java index f41297f50a3..e95f93e4ad1 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/Muzzle.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/Muzzle.java @@ -56,7 +56,7 @@ public class Muzzle extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/SnuffOut.java b/Mage.Sets/src/mage/sets/mercadianmasques/SnuffOut.java index b36859e18f6..486fc568896 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/SnuffOut.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/SnuffOut.java @@ -71,7 +71,7 @@ public class SnuffOut extends CardImpl { // // Destroy target nonblack creature. It can't be regenerated. this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); } public SnuffOut(final SnuffOut card) { diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Unmask.java b/Mage.Sets/src/mage/sets/mercadianmasques/Unmask.java index d2dc7bb7138..e9d1691e221 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/Unmask.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/Unmask.java @@ -67,7 +67,7 @@ public class Unmask extends CardImpl { this.addAbility(new AlternativeCostSourceAbility(new ExileFromHandCost(new TargetCardInHand(filter)))); // Target player reveals his or her hand. You choose a nonland card from it. That player discards that card. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(filterNonLand, TargetController.ANY)); } diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/WaterfrontBouncer.java b/Mage.Sets/src/mage/sets/mercadianmasques/WaterfrontBouncer.java index 5924ae3577b..616a168ff29 100644 --- a/Mage.Sets/src/mage/sets/mercadianmasques/WaterfrontBouncer.java +++ b/Mage.Sets/src/mage/sets/mercadianmasques/WaterfrontBouncer.java @@ -64,7 +64,7 @@ public class WaterfrontBouncer extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ColoredManaCost(ColoredManaSymbol.U)); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardTargetCost(new TargetCardInHand())); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirage/AbyssalHunter.java b/Mage.Sets/src/mage/sets/mirage/AbyssalHunter.java index ec471d7021f..3aa0387e69d 100644 --- a/Mage.Sets/src/mage/sets/mirage/AbyssalHunter.java +++ b/Mage.Sets/src/mage/sets/mirage/AbyssalHunter.java @@ -62,7 +62,7 @@ public class AbyssalHunter extends CardImpl { // {B}, {tap}: Tap target creature. Abyssal Hunter deals damage equal to Abyssal Hunter's power to that creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AbyssalHunterEffect(), new ManaCostsImpl("{B}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirage/Afterlife.java b/Mage.Sets/src/mage/sets/mirage/Afterlife.java index 49329f94bf6..e39f109d4fd 100644 --- a/Mage.Sets/src/mage/sets/mirage/Afterlife.java +++ b/Mage.Sets/src/mage/sets/mirage/Afterlife.java @@ -56,7 +56,7 @@ public class Afterlife extends CardImpl { // Destroy target creature. It can't be regenerated. Its controller puts a // 1/1 white Spirit creature token with flying onto the battlefield. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); this.getSpellAbility().addEffect(new AfterlifeEffect()); } diff --git a/Mage.Sets/src/mage/sets/mirage/Agility.java b/Mage.Sets/src/mage/sets/mirage/Agility.java index 77c8118001b..419d5ecd894 100644 --- a/Mage.Sets/src/mage/sets/mirage/Agility.java +++ b/Mage.Sets/src/mage/sets/mirage/Agility.java @@ -55,7 +55,7 @@ public class Agility extends CardImpl { this.color.setRed(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/mirage/AmberPrison.java b/Mage.Sets/src/mage/sets/mirage/AmberPrison.java index 17f34ccbed7..2654cf216a5 100644 --- a/Mage.Sets/src/mage/sets/mirage/AmberPrison.java +++ b/Mage.Sets/src/mage/sets/mirage/AmberPrison.java @@ -76,7 +76,7 @@ public class AmberPrison extends CardImpl { // {4}, {tap}: Tap target artifact, creature, or land. That permanent doesn't untap during its controller's untap step for as long as Amber Prison remains tapped. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AmberPrisonTapTargetEffect(), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); this.addAbility(new AmberPrisonUntapTriggeredAbility()); diff --git a/Mage.Sets/src/mage/sets/mirage/BlightedShaman.java b/Mage.Sets/src/mage/sets/mirage/BlightedShaman.java index 833d4d01b1a..1bc06820b19 100644 --- a/Mage.Sets/src/mage/sets/mirage/BlightedShaman.java +++ b/Mage.Sets/src/mage/sets/mirage/BlightedShaman.java @@ -72,13 +72,13 @@ public class BlightedShaman extends CardImpl { // {tap}, Sacrifice a Swamp: Target creature gets +1/+1 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filterSwamp))); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {tap}, Sacrifice a creature: Target creature gets +2/+2 until end of turn. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new TapSourceCost()); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirage/ForbiddenCrypt.java b/Mage.Sets/src/mage/sets/mirage/ForbiddenCrypt.java index 1c030b68693..d9f33e72705 100644 --- a/Mage.Sets/src/mage/sets/mirage/ForbiddenCrypt.java +++ b/Mage.Sets/src/mage/sets/mirage/ForbiddenCrypt.java @@ -101,7 +101,7 @@ class ForbiddenCryptDrawCardReplacementEffect extends ReplacementEffectImpl { Player player = game.getPlayer(source.getControllerId()); if (player != null) { boolean cardReturned = false; - TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(true); + TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(); if (target.canChoose(source.getSourceId(), player.getId(), game)) { if (target.choose(Outcome.ReturnToHand, player.getId(), source.getSourceId(), game)) { Card card = game.getCard(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/sets/mirage/HarmattanEfreet.java b/Mage.Sets/src/mage/sets/mirage/HarmattanEfreet.java index 6df92b86e88..6c302b88190 100644 --- a/Mage.Sets/src/mage/sets/mirage/HarmattanEfreet.java +++ b/Mage.Sets/src/mage/sets/mirage/HarmattanEfreet.java @@ -60,7 +60,7 @@ public class HarmattanEfreet extends CardImpl { // // {1}{U}{U}: Target creature gains flying until end of turn. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{U}{U}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirage/IllicitAuction.java b/Mage.Sets/src/mage/sets/mirage/IllicitAuction.java index bfe8409cd94..6ba4e180bc9 100644 --- a/Mage.Sets/src/mage/sets/mirage/IllicitAuction.java +++ b/Mage.Sets/src/mage/sets/mirage/IllicitAuction.java @@ -55,7 +55,7 @@ public class IllicitAuction extends CardImpl { // Each player may bid life for control of target creature. You start the bidding with a bid of 0. In turn order, each player may top the high bid. The bidding ends if the high bid stands. The high bidder loses life equal to the high bid and gains control of the creature. this.getSpellAbility().addEffect(new IllicitAuctionEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public IllicitAuction(final IllicitAuction card) { diff --git a/Mage.Sets/src/mage/sets/mirage/PainfulMemories.java b/Mage.Sets/src/mage/sets/mirage/PainfulMemories.java index 2e604ac3f81..1b195845403 100644 --- a/Mage.Sets/src/mage/sets/mirage/PainfulMemories.java +++ b/Mage.Sets/src/mage/sets/mirage/PainfulMemories.java @@ -56,7 +56,7 @@ public class PainfulMemories extends CardImpl { // Look at target opponent's hand and choose a card from it. Put that card on top of that player's library. this.getSpellAbility().addEffect(new PainfulMemoriesEffect()); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); } public PainfulMemories(final PainfulMemories card) { diff --git a/Mage.Sets/src/mage/sets/mirage/PhyrexianDreadnought.java b/Mage.Sets/src/mage/sets/mirage/PhyrexianDreadnought.java index e56bc4567fa..9fb4fc860f5 100644 --- a/Mage.Sets/src/mage/sets/mirage/PhyrexianDreadnought.java +++ b/Mage.Sets/src/mage/sets/mirage/PhyrexianDreadnought.java @@ -85,7 +85,7 @@ class PhyrexianDreadnoughtSacrificeCost extends CostImpl { } public PhyrexianDreadnoughtSacrificeCost() { - this.addTarget(new TargetControlledCreaturePermanent(0, Integer.MAX_VALUE, filter, true, false)); + this.addTarget(new TargetControlledCreaturePermanent(0, Integer.MAX_VALUE, filter, true)); this.text = "sacrifice any number of creatures with total power 12 or greater"; } diff --git a/Mage.Sets/src/mage/sets/mirage/PsychicTransfer.java b/Mage.Sets/src/mage/sets/mirage/PsychicTransfer.java index ad775b4e0be..b0635938307 100644 --- a/Mage.Sets/src/mage/sets/mirage/PsychicTransfer.java +++ b/Mage.Sets/src/mage/sets/mirage/PsychicTransfer.java @@ -52,7 +52,7 @@ public class PsychicTransfer extends CardImpl { // If the difference between your life total and target player's life total is 5 or less, exchange life totals with that player. this.getSpellAbility().addEffect(new PsychicTransferEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public PsychicTransfer(final PsychicTransfer card) { diff --git a/Mage.Sets/src/mage/sets/mirage/UnseenWalker.java b/Mage.Sets/src/mage/sets/mirage/UnseenWalker.java index 16c34908c32..94c118b03cb 100644 --- a/Mage.Sets/src/mage/sets/mirage/UnseenWalker.java +++ b/Mage.Sets/src/mage/sets/mirage/UnseenWalker.java @@ -61,7 +61,7 @@ public class UnseenWalker extends CardImpl { // {1}{G}{G}: Target creature gains forestwalk until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new ForestwalkAbility(), Duration.EndOfTurn), new ManaCostsImpl("{1}{G}{G}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/AltarsLight.java b/Mage.Sets/src/mage/sets/mirrodin/AltarsLight.java index a674d6f0992..ec8a86843a3 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/AltarsLight.java +++ b/Mage.Sets/src/mage/sets/mirrodin/AltarsLight.java @@ -56,7 +56,7 @@ public class AltarsLight extends CardImpl { this.expansionSetCode = "MRD"; this.color.setWhite(true); this.getSpellAbility().addEffect(new ExileTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); } public AltarsLight(final AltarsLight card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/Arrest.java b/Mage.Sets/src/mage/sets/mirrodin/Arrest.java index 2b871613dc3..6144910054e 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Arrest.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Arrest.java @@ -56,7 +56,7 @@ public class Arrest extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/mirrodin/AuriokBladewarden.java b/Mage.Sets/src/mage/sets/mirrodin/AuriokBladewarden.java index 42c9956695f..89c88ab9a6e 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/AuriokBladewarden.java +++ b/Mage.Sets/src/mage/sets/mirrodin/AuriokBladewarden.java @@ -60,7 +60,7 @@ public class AuriokBladewarden extends CardImpl { // {tap}: Target creature gets +X/+X until end of turn, where X is Auriok Bladewarden's power. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(new SourcePermanentPowerCount(), new SourcePermanentPowerCount(), Duration.EndOfTurn), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/AuriokTransfixer.java b/Mage.Sets/src/mage/sets/mirrodin/AuriokTransfixer.java index 9ec12cd1272..dc348c95cd9 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/AuriokTransfixer.java +++ b/Mage.Sets/src/mage/sets/mirrodin/AuriokTransfixer.java @@ -65,7 +65,7 @@ public class AuriokTransfixer extends CardImpl { this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/Battlegrowth.java b/Mage.Sets/src/mage/sets/mirrodin/Battlegrowth.java index 3788881ad2e..9cb96788ef7 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Battlegrowth.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Battlegrowth.java @@ -46,7 +46,7 @@ public class Battlegrowth extends CardImpl { this.expansionSetCode = "MRD"; this.color.setGreen(true); this.getSpellAbility().addEffect(new AddCountersTargetEffect(CounterType.P1P1.createInstance())); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public Battlegrowth(final Battlegrowth card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/Bloodscent.java b/Mage.Sets/src/mage/sets/mirrodin/Bloodscent.java index d20ed7a73ff..f30be6e6bf0 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Bloodscent.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Bloodscent.java @@ -48,7 +48,7 @@ public class Bloodscent extends CardImpl { // All creatures able to block target creature this turn do so. this.getSpellAbility().addEffect(new MustBeBlockedByAllTargetEffect(Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public Bloodscent(final Bloodscent card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/Deconstruct.java b/Mage.Sets/src/mage/sets/mirrodin/Deconstruct.java index 076eaa7c6f6..14dc277f9a0 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Deconstruct.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Deconstruct.java @@ -55,7 +55,7 @@ public class Deconstruct extends CardImpl { this.expansionSetCode = "MRD"; this.color.setGreen(true); this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new BasicManaEffect(new Mana(0, 3, 0, 0, 0, 0, 0))); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/DragonBlood.java b/Mage.Sets/src/mage/sets/mirrodin/DragonBlood.java index 412bdae340e..e3c6c1015c2 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/DragonBlood.java +++ b/Mage.Sets/src/mage/sets/mirrodin/DragonBlood.java @@ -52,7 +52,7 @@ public class DragonBlood extends CardImpl { this.expansionSetCode = "MRD"; Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance(1)), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/Duplicant.java b/Mage.Sets/src/mage/sets/mirrodin/Duplicant.java index b818f109196..012ff4a1d9c 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Duplicant.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Duplicant.java @@ -71,7 +71,7 @@ public class Duplicant extends CardImpl { // Imprint - When Duplicant enters the battlefield, you may exile target nontoken creature. Ability ability = new EntersBattlefieldTriggeredAbility(new ExileTargetEffect(), true, "Imprint - "); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); // As long as the exiled card is a creature card, Duplicant has that card's power, toughness, and creature types. It's still a Shapeshifter. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DuplicantContinuousEffect())); diff --git a/Mage.Sets/src/mage/sets/mirrodin/ElfReplica.java b/Mage.Sets/src/mage/sets/mirrodin/ElfReplica.java index 668a056b6e3..13842387642 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/ElfReplica.java +++ b/Mage.Sets/src/mage/sets/mirrodin/ElfReplica.java @@ -63,7 +63,7 @@ public class ElfReplica extends CardImpl { this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{G}")); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/FieryGambit.java b/Mage.Sets/src/mage/sets/mirrodin/FieryGambit.java index 8658afd7e92..187f6e7e61e 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/FieryGambit.java +++ b/Mage.Sets/src/mage/sets/mirrodin/FieryGambit.java @@ -57,7 +57,7 @@ public class FieryGambit extends CardImpl { // Flip a coin until you lose a flip or choose to stop flipping. If you lose a flip, Fiery Gambit has no effect. If you win one or more flips, Fiery Gambit deals 3 damage to target creature. If you win two or more flips, Fiery Gambit deals 6 damage to each opponent. If you win three or more flips, draw nine cards and untap all lands you control. this.getSpellAbility().addEffect(new FieryGambitEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public FieryGambit(final FieryGambit card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/GalvanicKey.java b/Mage.Sets/src/mage/sets/mirrodin/GalvanicKey.java index 02f831d60b5..57fba23da17 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/GalvanicKey.java +++ b/Mage.Sets/src/mage/sets/mirrodin/GalvanicKey.java @@ -61,7 +61,7 @@ public class GalvanicKey extends CardImpl { this.addAbility(FlashAbility.getInstance()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/GoblinReplica.java b/Mage.Sets/src/mage/sets/mirrodin/GoblinReplica.java index 9dea81090e9..d5b315d609b 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/GoblinReplica.java +++ b/Mage.Sets/src/mage/sets/mirrodin/GoblinReplica.java @@ -63,7 +63,7 @@ public class GoblinReplica extends CardImpl { this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{3}{R}")); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/LoomingHoverguard.java b/Mage.Sets/src/mage/sets/mirrodin/LoomingHoverguard.java index ff667fdaca0..033a57cffc7 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/LoomingHoverguard.java +++ b/Mage.Sets/src/mage/sets/mirrodin/LoomingHoverguard.java @@ -61,7 +61,7 @@ public class LoomingHoverguard extends CardImpl { this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); Ability ability = new EntersBattlefieldTriggeredAbility(new PutOnLibraryTargetEffect(true), false); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/LoxodonMender.java b/Mage.Sets/src/mage/sets/mirrodin/LoxodonMender.java index c331541944c..6d2dcd65345 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/LoxodonMender.java +++ b/Mage.Sets/src/mage/sets/mirrodin/LoxodonMender.java @@ -65,7 +65,7 @@ public class LoxodonMender extends CardImpl { this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/NecrogenSpellbomb.java b/Mage.Sets/src/mage/sets/mirrodin/NecrogenSpellbomb.java index 2f8cd45fcd1..fcb16b0875d 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/NecrogenSpellbomb.java +++ b/Mage.Sets/src/mage/sets/mirrodin/NecrogenSpellbomb.java @@ -54,7 +54,7 @@ public class NecrogenSpellbomb extends CardImpl { this.expansionSetCode = "MRD"; Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ColoredManaCost(ColoredManaSymbol.B)); firstAbility.addCost(new SacrificeSourceCost()); - firstAbility.addTarget(new TargetPlayer(true)); + firstAbility.addTarget(new TargetPlayer()); this.addAbility(firstAbility); Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); secondAbility.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/sets/mirrodin/NimReplica.java b/Mage.Sets/src/mage/sets/mirrodin/NimReplica.java index 4ffc40625f6..873e948861b 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/NimReplica.java +++ b/Mage.Sets/src/mage/sets/mirrodin/NimReplica.java @@ -56,7 +56,7 @@ public class NimReplica extends CardImpl { this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new ManaCostsImpl("{2}{B}")); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/NimShambler.java b/Mage.Sets/src/mage/sets/mirrodin/NimShambler.java index a0d88f8b394..687b4303d33 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/NimShambler.java +++ b/Mage.Sets/src/mage/sets/mirrodin/NimShambler.java @@ -66,7 +66,7 @@ public class NimShambler extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), new StaticValue(0), Duration.WhileOnBattlefield))); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); } public NimShambler(final NimShambler card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/OblivionStone.java b/Mage.Sets/src/mage/sets/mirrodin/OblivionStone.java index 34439008c71..184dcc1ab32 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/OblivionStone.java +++ b/Mage.Sets/src/mage/sets/mirrodin/OblivionStone.java @@ -58,7 +58,7 @@ public class OblivionStone extends CardImpl { // {4}, {tap}: Put a fate counter on target permanent. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.FATE.createInstance()), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); this.addAbility(ability); // {5}, {tap}, Sacrifice Oblivion Stone: Destroy each nonland permanent without a fate counter on it, then remove all fate counters from all permanents. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new OblivionStoneEffect(), new GenericManaCost(5)); diff --git a/Mage.Sets/src/mage/sets/mirrodin/PredatorsStrike.java b/Mage.Sets/src/mage/sets/mirrodin/PredatorsStrike.java index a3f567aefdb..7835f1c835b 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/PredatorsStrike.java +++ b/Mage.Sets/src/mage/sets/mirrodin/PredatorsStrike.java @@ -50,7 +50,7 @@ public class PredatorsStrike extends CardImpl { this.color.setGreen(true); this.getSpellAbility().addEffect(new BoostTargetEffect(3, 3, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public PredatorsStrike(final PredatorsStrike card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/Regress.java b/Mage.Sets/src/mage/sets/mirrodin/Regress.java index 0d6e1875b17..13ce1b6bb82 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Regress.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Regress.java @@ -46,7 +46,7 @@ public class Regress extends CardImpl { this.expansionSetCode = "MRD"; this.color.setBlue(true); this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(true)); + this.getSpellAbility().addTarget(new TargetPermanent()); } public Regress (final Regress card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/RustsporeRam.java b/Mage.Sets/src/mage/sets/mirrodin/RustsporeRam.java index 019556c560c..ea823b712e3 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/RustsporeRam.java +++ b/Mage.Sets/src/mage/sets/mirrodin/RustsporeRam.java @@ -58,7 +58,7 @@ public class RustsporeRam extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(3); Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/ScaleOfChissGoria.java b/Mage.Sets/src/mage/sets/mirrodin/ScaleOfChissGoria.java index 22454d15eb9..91db3241e50 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/ScaleOfChissGoria.java +++ b/Mage.Sets/src/mage/sets/mirrodin/ScaleOfChissGoria.java @@ -57,7 +57,7 @@ public class ScaleOfChissGoria extends CardImpl { this.addAbility(new AffinityForArtifactsAbility()); // {tap}: Target creature gets +0/+1 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(0, 1, Duration.EndOfTurn), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/Shatter.java b/Mage.Sets/src/mage/sets/mirrodin/Shatter.java index 446e8db9dd4..6d7f66fcf38 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/Shatter.java +++ b/Mage.Sets/src/mage/sets/mirrodin/Shatter.java @@ -53,7 +53,7 @@ public class Shatter extends CardImpl { this.expansionSetCode = "MRD"; this.color.setRed(true); this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); } public Shatter (final Shatter card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/ToothOfChissGoria.java b/Mage.Sets/src/mage/sets/mirrodin/ToothOfChissGoria.java index 1e5aa3dfeb5..74841a781d3 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/ToothOfChissGoria.java +++ b/Mage.Sets/src/mage/sets/mirrodin/ToothOfChissGoria.java @@ -57,7 +57,7 @@ public class ToothOfChissGoria extends CardImpl { this.addAbility(new AffinityForArtifactsAbility()); // {tap}: Target creature gets +1/+0 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Duration.EndOfTurn), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/TowerOfChampions.java b/Mage.Sets/src/mage/sets/mirrodin/TowerOfChampions.java index 9c2ca6728c4..f6593dfd27b 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TowerOfChampions.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TowerOfChampions.java @@ -53,7 +53,7 @@ public class TowerOfChampions extends CardImpl { this.expansionSetCode = "MRD"; Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(6, 6, Duration.EndOfTurn), new GenericManaCost(8)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/TowerOfMurmurs.java b/Mage.Sets/src/mage/sets/mirrodin/TowerOfMurmurs.java index ef6dd19f931..74cbf64bce8 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TowerOfMurmurs.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TowerOfMurmurs.java @@ -52,7 +52,7 @@ public class TowerOfMurmurs extends CardImpl { this.expansionSetCode = "MRD"; Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(8), new GenericManaCost(8)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/TrollsOfTelJilad.java b/Mage.Sets/src/mage/sets/mirrodin/TrollsOfTelJilad.java index 422ef61d61f..7afb8b64482 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TrollsOfTelJilad.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TrollsOfTelJilad.java @@ -64,7 +64,7 @@ public class TrollsOfTelJilad extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(6); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{1}{G}")); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/TurnToDust.java b/Mage.Sets/src/mage/sets/mirrodin/TurnToDust.java index e3d14ca51cf..cc3b19889c3 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TurnToDust.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TurnToDust.java @@ -55,7 +55,7 @@ public class TurnToDust extends CardImpl { this.expansionSetCode = "MRD"; this.color.setGreen(true); this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new BasicManaEffect(new Mana(0, 1, 0, 0, 0, 0, 0))); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/WrenchMind.java b/Mage.Sets/src/mage/sets/mirrodin/WrenchMind.java index f0625f7ef3d..1f8c07f0f6a 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/WrenchMind.java +++ b/Mage.Sets/src/mage/sets/mirrodin/WrenchMind.java @@ -56,7 +56,7 @@ public class WrenchMind extends CardImpl { this.color.setBlack(true); // Target player discards two cards unless he or she discards an artifact card. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new WrenchMindEffect()); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/BanishmentDecree.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/BanishmentDecree.java index 7cea88ebbdc..50870a6cdc5 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/BanishmentDecree.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/BanishmentDecree.java @@ -57,7 +57,7 @@ public class BanishmentDecree extends CardImpl { this.expansionSetCode = "MBS"; this.color.setWhite(true); this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true)); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); } public BanishmentDecree (final BanishmentDecree card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/BlueSunsZenith.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/BlueSunsZenith.java index 66b9080e6c4..55905c84baf 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/BlueSunsZenith.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/BlueSunsZenith.java @@ -49,7 +49,7 @@ public class BlueSunsZenith extends CardImpl { this.color.setBlue(true); this.getSpellAbility().addEffect(new DrawCardTargetEffect(new ManacostVariableValue())); this.getSpellAbility().addEffect(ShuffleSpellEffect.getInstance()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public BlueSunsZenith (final BlueSunsZenith card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/BrassSquire.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/BrassSquire.java index d6021d7ac67..840ad8fc7c0 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/BrassSquire.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/BrassSquire.java @@ -68,7 +68,7 @@ public class BrassSquire extends CardImpl { // {tap}: Attach target Equipment you control to target creature you control. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new EquipEffect(), new TapSourceCost()); ability.addTarget(new TargetControlledPermanent(filter)); - ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/BurntheImpure.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/BurntheImpure.java index 456678c13aa..4b067caa1b1 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/BurntheImpure.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/BurntheImpure.java @@ -50,7 +50,7 @@ public class BurntheImpure extends CardImpl { super(ownerId, 59, "Burn the Impure", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{R}"); this.expansionSetCode = "MBS"; this.color.setRed(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BurntheImpureEffect()); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/ConcussiveBolt.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/ConcussiveBolt.java index 28daa2b283a..404c235c00e 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/ConcussiveBolt.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/ConcussiveBolt.java @@ -55,7 +55,7 @@ public class ConcussiveBolt extends CardImpl { this.color.setRed(true); // Concussive Bolt deals 4 damage to target player. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new DamageTargetEffect(4)); // Metalcraft - If you control three or more artifacts, creatures that player controls can't block this turn. this.getSpellAbility().addEffect(new ConcussiveBoltEffect()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/CorruptedConscience.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/CorruptedConscience.java index a3dc58cfdf0..3590fbd064a 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/CorruptedConscience.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/CorruptedConscience.java @@ -53,7 +53,7 @@ public class CorruptedConscience extends CardImpl { this.expansionSetCode = "MBS"; this.subtype.add("Aura"); this.color.setBlue(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Cryptoplasm.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Cryptoplasm.java index 4b539759eeb..802e5009669 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Cryptoplasm.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Cryptoplasm.java @@ -65,7 +65,7 @@ public class Cryptoplasm extends CardImpl { // At the beginning of your upkeep, you may have Cryptoplasm become a copy of another target creature. If you do, Cryptoplasm gains this ability. Ability ability = new BeginningOfUpkeepTriggeredAbility(new CryptoplasmTransformEffect(), TargetController.YOU, true); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } @@ -104,7 +104,7 @@ class CryptoplasmTransformEffect extends ContinuousEffectImpl { @Override public Boolean apply(Game game, Permanent permanent) { Ability upkeepAbility = new BeginningOfUpkeepTriggeredAbility(new CryptoplasmTransformEffect(), TargetController.YOU, true); - upkeepAbility.addTarget(new TargetCreaturePermanent(true)); + upkeepAbility.addTarget(new TargetCreaturePermanent()); permanent.addAbility(upkeepAbility, source.getSourceId(), game); return true; } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/DecimatorWeb.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/DecimatorWeb.java index 94311776958..ca96120c0a0 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/DecimatorWeb.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/DecimatorWeb.java @@ -57,7 +57,7 @@ public class DecimatorWeb extends CardImpl { ability.addCost(new TapSourceCost()); ability.addEffect(new AddCountersTargetEffect(CounterType.POISON.createInstance())); ability.addEffect(new PutLibraryIntoGraveTargetEffect(6)); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/DivineOffering.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/DivineOffering.java index b04fd6639d1..b01ad9e54e4 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/DivineOffering.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/DivineOffering.java @@ -61,7 +61,7 @@ public class DivineOffering extends CardImpl { this.color.setWhite(true); // Destroy target artifact. You gain life equal to its converted mana cost. - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new DivineOfferingEffect()); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/FleshEaterImp.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/FleshEaterImp.java index e77ca5f3503..d3a396c022e 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/FleshEaterImp.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/FleshEaterImp.java @@ -58,7 +58,7 @@ public class FleshEaterImp extends CardImpl { this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); this.addAbility(InfectAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); } public FleshEaterImp (final FleshEaterImp card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/GoForTheThroat.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/GoForTheThroat.java index 9ca9a0d8fd5..9bf43fb3c32 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/GoForTheThroat.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/GoForTheThroat.java @@ -55,7 +55,7 @@ public class GoForTheThroat extends CardImpl { this.expansionSetCode = "MBS"; this.color.setBlack(true); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setTargetName("nonartifact creature"); this.getSpellAbility().addTarget(target); this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/GoreVassal.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/GoreVassal.java index 35b879923c7..5ed79b2f346 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/GoreVassal.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/GoreVassal.java @@ -59,7 +59,7 @@ public class GoreVassal extends CardImpl { SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); ability.addEffect(new RegenerateTargetEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/HorrifyingRevelation.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/HorrifyingRevelation.java index 67f8c58942b..4839c91ac67 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/HorrifyingRevelation.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/HorrifyingRevelation.java @@ -46,7 +46,7 @@ public class HorrifyingRevelation extends CardImpl { this.expansionSetCode = "MBS"; this.color.setBlack(true); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new DiscardTargetEffect(1)); this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/IntoTheCore.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/IntoTheCore.java index 9d9a2a8264c..ace62d94dbf 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/IntoTheCore.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/IntoTheCore.java @@ -54,8 +54,8 @@ public class IntoTheCore extends CardImpl { this.color.setRed(true); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new ExileTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/LeoninRelicWarder.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/LeoninRelicWarder.java index bb910a23439..91d1148337b 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/LeoninRelicWarder.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/LeoninRelicWarder.java @@ -69,7 +69,7 @@ public class LeoninRelicWarder extends CardImpl { this.toughness = new MageInt(2); Ability ability = new EntersBattlefieldTriggeredAbility(new ExileTargetForSourceEffect("Leonin Relic-Warder exile"), true); - Target target = new TargetPermanent(filter, true); + Target target = new TargetPermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/MagneticMine.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/MagneticMine.java index 3f8da7212e1..b84b9b7c1ee 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/MagneticMine.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/MagneticMine.java @@ -52,7 +52,7 @@ public class MagneticMine extends CardImpl { this.expansionSetCode = "MBS"; MagneticMineTriggeredAbility ability = new MagneticMineTriggeredAbility(new DamageTargetEffect(2)); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/MetallicMastery.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/MetallicMastery.java index 375129e3cc6..4a55713bca8 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/MetallicMastery.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/MetallicMastery.java @@ -58,7 +58,7 @@ public class MetallicMastery extends CardImpl { this.color.setRed(true); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addEffect(new UntapTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/MirranMettle.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/MirranMettle.java index 4aca1eddcc0..4a9990ff44a 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/MirranMettle.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/MirranMettle.java @@ -50,7 +50,7 @@ public class MirranMettle extends CardImpl { this.expansionSetCode = "MBS"; this.color.setGreen(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new ConditionalContinousEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn), MetalcraftCondition.getInstance(), effectText, true)); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/MirranSpy.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/MirranSpy.java index bbeb2757f25..889ed6c9045 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/MirranSpy.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/MirranSpy.java @@ -60,7 +60,7 @@ public class MirranSpy extends CardImpl { // Whenever you cast an artifact spell, you may untap target creature. SpellCastControllerTriggeredAbility ability = new SpellCastControllerTriggeredAbility(new UntapTargetEffect(), filter, true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Phyresis.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Phyresis.java index 452ebebf71a..76a2d0b3479 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Phyresis.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Phyresis.java @@ -57,7 +57,7 @@ public class Phyresis extends CardImpl { this.subtype.add("Aura"); this.color.setBlack(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/PierceStrider.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PierceStrider.java index 73e057639fe..96775f45e1c 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/PierceStrider.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/PierceStrider.java @@ -51,7 +51,7 @@ public class PierceStrider extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); Ability ability = new EntersBattlefieldTriggeredAbility(new LoseLifeTargetEffect(3)); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/PistonSledge.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PistonSledge.java index 840038f8376..bdf5808877c 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/PistonSledge.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/PistonSledge.java @@ -60,7 +60,7 @@ public class PistonSledge extends CardImpl { this.subtype.add("Equipment"); Ability ability = new EntersBattlefieldTriggeredAbility(new AttachEffect(Outcome.BoostCreature, "attach it to target creature you control"), false); - ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 1))); this.addAbility(new EquipAbility(Outcome.AddAbility, new SacrificeTargetCost(new TargetControlledPermanent(filter)))); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/PistusStrike.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PistusStrike.java index 1b61cf8cf94..1df4d87cf4f 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/PistusStrike.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/PistusStrike.java @@ -63,7 +63,7 @@ public class PistusStrike extends CardImpl { this.expansionSetCode = "MBS"; this.color.setGreen(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new PoisonControllerTargetCreatureEffect()); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/PlaguemawBeast.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PlaguemawBeast.java index 5319491f5f7..ee01e81aeeb 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/PlaguemawBeast.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/PlaguemawBeast.java @@ -56,7 +56,7 @@ public class PlaguemawBeast extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ProliferateEffect(), new TapSourceCost()); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Shriekhorn.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Shriekhorn.java index b95e00b582f..f00327d6472 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Shriekhorn.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Shriekhorn.java @@ -56,7 +56,7 @@ public class Shriekhorn extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(3)), "Shriekhorn enters the battlefield with three charge counters on it")); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(2), new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance())); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpinEngine.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpinEngine.java index e543316f57f..603b89c8938 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpinEngine.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpinEngine.java @@ -57,7 +57,7 @@ public class SpinEngine extends CardImpl { // {R}: Target creature can't block Spin Engine this turn Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SpinEngineEffect(), new ManaCostsImpl("{R}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpineOfIshSah.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpineOfIshSah.java index 214edd19a4a..b1e7fade349 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpineOfIshSah.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpineOfIshSah.java @@ -48,7 +48,7 @@ public class SpineOfIshSah extends CardImpl { this.expansionSetCode = "MBS"; EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect()); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); this.addAbility(ability); this.addAbility(new DiesTriggeredAbility(new ReturnToHandSourceEffect())); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpreadTheSickness.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpreadTheSickness.java index b7eb0638b2c..3ab6ece6d80 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpreadTheSickness.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpreadTheSickness.java @@ -48,7 +48,7 @@ public class SpreadTheSickness extends CardImpl { this.color.setBlack(true); this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new ProliferateEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public SpreadTheSickness (final SpreadTheSickness card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/TezzeretAgentOfBolas.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/TezzeretAgentOfBolas.java index c049035e10e..963a20d8050 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/TezzeretAgentOfBolas.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/TezzeretAgentOfBolas.java @@ -82,12 +82,12 @@ public class TezzeretAgentOfBolas extends CardImpl { effect = new SetPowerToughnessTargetEffect(5,5, Duration.EndOfGame); effect.setText("Target artifact becomes a 5/5 artifact creature"); ability1.addEffect(effect); - ability1.addTarget(new TargetArtifactPermanent(true)); + ability1.addTarget(new TargetArtifactPermanent()); this.addAbility(ability1); // -4: Target player loses X life and you gain X life, where X is twice the number of artifacts you control. LoyaltyAbility ability2 = new LoyaltyAbility(new TezzeretAgentOfBolasEffect2(), -4); - ability2.addTarget(new TargetPlayer(true)); + ability2.addTarget(new TargetPlayer()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/UnnaturalPredation.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/UnnaturalPredation.java index a971e1b8317..83251c146dd 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/UnnaturalPredation.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/UnnaturalPredation.java @@ -51,7 +51,7 @@ public class UnnaturalPredation extends CardImpl { this.color.setGreen(true); this.getSpellAbility().addEffect(new BoostTargetEffect(1, 1, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public UnnaturalPredation (final UnnaturalPredation card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/VedalkenAnatomist.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/VedalkenAnatomist.java index 27859b9d71f..215b826cd3c 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/VedalkenAnatomist.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/VedalkenAnatomist.java @@ -62,7 +62,7 @@ public class VedalkenAnatomist extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new ManaCostsImpl("{2}{U}")); ability.addEffect(new MayTapOrUntapTargetEffect()); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianCorrupter.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianCorrupter.java index 207bd94a68f..2dceff0a8fa 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianCorrupter.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianCorrupter.java @@ -65,7 +65,7 @@ public class ViridianCorrupter extends CardImpl { this.addAbility(InfectAbility.getInstance()); Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false); - Target target = new TargetPermanent(filter, true); + Target target = new TargetPermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/VirulentWound.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/VirulentWound.java index c80f168c2fe..7a844caf73b 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/VirulentWound.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/VirulentWound.java @@ -61,7 +61,7 @@ public class VirulentWound extends CardImpl { // Put a -1/-1 counter on target creature. this.getSpellAbility().addEffect(new AddCountersTargetEffect(CounterType.M1M1.createInstance(), Outcome.UnboostCreature)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // When that creature dies this turn, its controller gets a poison counter. this.getSpellAbility().addEffect(new VirulentWoundEffect()); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Vivisection.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Vivisection.java index 55d1a04efa1..0bcb1ff9dc3 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Vivisection.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Vivisection.java @@ -47,7 +47,7 @@ public class Vivisection extends CardImpl { this.expansionSetCode = "MBS"; this.color.setBlue(true); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(3)); - this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); } public Vivisection (final Vivisection card) { diff --git a/Mage.Sets/src/mage/sets/modernmasters/BoundInSilence.java b/Mage.Sets/src/mage/sets/modernmasters/BoundInSilence.java index 95d4c7a82f2..4e29641ed60 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/BoundInSilence.java +++ b/Mage.Sets/src/mage/sets/modernmasters/BoundInSilence.java @@ -54,7 +54,7 @@ public class BoundInSilence extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Removal)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/modernmasters/DampenThought.java b/Mage.Sets/src/mage/sets/modernmasters/DampenThought.java index 92e78ae369d..4f57f9f24ee 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/DampenThought.java +++ b/Mage.Sets/src/mage/sets/modernmasters/DampenThought.java @@ -50,7 +50,7 @@ public class DampenThought extends CardImpl { // Target player puts the top four cards of his or her library into his or her graveyard. this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(4)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); // Splice onto Arcane {1}{U} this.addAbility(new SpliceOntoArcaneAbility("{1}{U}")); } diff --git a/Mage.Sets/src/mage/sets/modernmasters/DeathRattle.java b/Mage.Sets/src/mage/sets/modernmasters/DeathRattle.java index ad3add1b1ea..7800f6323cc 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/DeathRattle.java +++ b/Mage.Sets/src/mage/sets/modernmasters/DeathRattle.java @@ -61,7 +61,7 @@ public class DeathRattle extends CardImpl { // Destroy target nongreen creature. It can't be regenerated. this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/modernmasters/DreamspoilerWitches.java b/Mage.Sets/src/mage/sets/modernmasters/DreamspoilerWitches.java index 82d50b4681b..f0c63dd9a8a 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/DreamspoilerWitches.java +++ b/Mage.Sets/src/mage/sets/modernmasters/DreamspoilerWitches.java @@ -77,7 +77,7 @@ public class DreamspoilerWitches extends CardImpl { class DreamspoilerWitchesTriggeredAbility extends TriggeredAbilityImpl { DreamspoilerWitchesTriggeredAbility() { super(Zone.BATTLEFIELD, new BoostTargetEffect(-1,-1, Duration.EndOfTurn), true); - this.addTarget(new TargetCreaturePermanent(true)); + this.addTarget(new TargetCreaturePermanent()); } DreamspoilerWitchesTriggeredAbility(final DreamspoilerWitchesTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/modernmasters/EarwigSquad.java b/Mage.Sets/src/mage/sets/modernmasters/EarwigSquad.java index 87edcbbb009..99af9949f93 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/EarwigSquad.java +++ b/Mage.Sets/src/mage/sets/modernmasters/EarwigSquad.java @@ -68,7 +68,7 @@ public class EarwigSquad extends CardImpl { this.addAbility(new ProwlAbility(this, "{2}{B}")); // When Earwig Squad enters the battlefield, if its prowl cost was paid, search target opponent's library for three cards and exile them. Then that player shuffles his or her library. EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new EarwigSquadEffect(), false); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(new ConditionalTriggeredAbility(ability, ProwlCondition.getInstance(), "When {this} enters the battlefield, if its prowl cost was paid, search target opponent's library for three cards and exile them. Then that player shuffles his or her library.")); diff --git a/Mage.Sets/src/mage/sets/modernmasters/EchoingCourage.java b/Mage.Sets/src/mage/sets/modernmasters/EchoingCourage.java index d210a8ea308..c62ba9df7bd 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/EchoingCourage.java +++ b/Mage.Sets/src/mage/sets/modernmasters/EchoingCourage.java @@ -57,7 +57,7 @@ public class EchoingCourage extends CardImpl { // Target creature and all other creatures with the same name as that creature get +2/+2 until end of turn. this.getSpellAbility().addEffect(new EchoingCourageEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public EchoingCourage(final EchoingCourage card) { diff --git a/Mage.Sets/src/mage/sets/modernmasters/GlacialRay.java b/Mage.Sets/src/mage/sets/modernmasters/GlacialRay.java index 4f390c05e7f..8d322303219 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/GlacialRay.java +++ b/Mage.Sets/src/mage/sets/modernmasters/GlacialRay.java @@ -50,7 +50,7 @@ public class GlacialRay extends CardImpl { // Glacial Ray deals 2 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); // Splice onto Arcane {1}{R} this.addAbility(new SpliceOntoArcaneAbility("{1}{R}")); } diff --git a/Mage.Sets/src/mage/sets/modernmasters/Peppersmoke.java b/Mage.Sets/src/mage/sets/modernmasters/Peppersmoke.java index 033bede928f..109546973d2 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/Peppersmoke.java +++ b/Mage.Sets/src/mage/sets/modernmasters/Peppersmoke.java @@ -60,7 +60,7 @@ public class Peppersmoke extends CardImpl { // Target creature gets -1/-1 until end of turn. If you control a Faerie, draw a card. this.getSpellAbility().addEffect(new BoostTargetEffect(-1,-1,Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect( new ConditionalOneShotEffect(new DrawCardSourceControllerEffect(1), new ControlsPermanentCondition(filter, ControlsPermanentCondition.CountType.MORE_THAN, 0), diff --git a/Mage.Sets/src/mage/sets/modernmasters/RiftElemental.java b/Mage.Sets/src/mage/sets/modernmasters/RiftElemental.java index 5b658673fd5..cac5f234db5 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/RiftElemental.java +++ b/Mage.Sets/src/mage/sets/modernmasters/RiftElemental.java @@ -102,7 +102,7 @@ public class RiftElemental extends CardImpl { ability.getCosts().clear(); Choice targetChoice = ability.getChoices().get(0); if (targetChoice.getChoice().equals("Permanent")) { - ability.addCost(new RemoveCounterCost(new TargetControlledCreaturePermanent(true), CounterType.TIME)); + ability.addCost(new RemoveCounterCost(new TargetControlledCreaturePermanent(), CounterType.TIME)); } if (targetChoice.getChoice().equals("Suspended Card")) { ability.addCost(new RemoveCounterFromCardCost(new TargetCardInExile(1,1,filter, null, true), CounterType.TIME)); diff --git a/Mage.Sets/src/mage/sets/modernmasters/StonehewerGiant.java b/Mage.Sets/src/mage/sets/modernmasters/StonehewerGiant.java index da6fede1ac7..1475350bd5f 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/StonehewerGiant.java +++ b/Mage.Sets/src/mage/sets/modernmasters/StonehewerGiant.java @@ -117,7 +117,7 @@ class StonehewerGiantEffect extends OneShotEffect { card.putOntoBattlefield(game, Zone.LIBRARY, source.getId(), source.getControllerId()); Permanent equipment = game.getPermanent(card.getId()); - Target targetCreature = new TargetControlledCreaturePermanent(true); + Target targetCreature = new TargetControlledCreaturePermanent(); if (equipment != null && player.choose(Outcome.BoostCreature, targetCreature, source.getSourceId(), game)) { Permanent permanent = game.getPermanent(targetCreature.getFirstTarget()); permanent.addAttachment(equipment.getId(), game); diff --git a/Mage.Sets/src/mage/sets/modernmasters/TakePossession.java b/Mage.Sets/src/mage/sets/modernmasters/TakePossession.java index 5d28f92dbe1..0475362f013 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/TakePossession.java +++ b/Mage.Sets/src/mage/sets/modernmasters/TakePossession.java @@ -58,7 +58,7 @@ public class TakePossession extends CardImpl { // Split second this.addAbility(new SplitSecondAbility()); // Enchant permanent - TargetPermanent auraTarget = new TargetPermanent(true); + TargetPermanent auraTarget = new TargetPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/modernmasters/TestOfFaith.java b/Mage.Sets/src/mage/sets/modernmasters/TestOfFaith.java index c943ce39a2e..a3901eb5595 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/TestOfFaith.java +++ b/Mage.Sets/src/mage/sets/modernmasters/TestOfFaith.java @@ -54,7 +54,7 @@ public class TestOfFaith extends CardImpl { // Prevent the next 3 damage that would be dealt to target creature this turn, and put a +1/+1 counter on that creature for each 1 damage prevented this way. this.getSpellAbility().addEffect(new TestOfFaithPreventDamageTargetEffect(Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/modernmasters/ThievingSprite.java b/Mage.Sets/src/mage/sets/modernmasters/ThievingSprite.java index 90e683adcc9..a78526eee27 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/ThievingSprite.java +++ b/Mage.Sets/src/mage/sets/modernmasters/ThievingSprite.java @@ -70,7 +70,7 @@ public class ThievingSprite extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Thieving Sprite enters the battlefield, target player reveals X cards from his or her hand, where X is the number of Faeries you control. You choose one of those cards. That player discards that card. Ability ability = new EntersBattlefieldTriggeredAbility(new ThievingSpriteEffect(), false); - TargetPlayer target = new TargetPlayer(true); + TargetPlayer target = new TargetPlayer(); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/modernmasters/TrygonPredator.java b/Mage.Sets/src/mage/sets/modernmasters/TrygonPredator.java index 33076570d2b..acd44721d52 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/TrygonPredator.java +++ b/Mage.Sets/src/mage/sets/modernmasters/TrygonPredator.java @@ -107,7 +107,7 @@ class TrygonPredatorTriggeredAbility extends TriggeredAbilityImpl { filter.add(new ControllerIdPredicate(event.getTargetId())); this.getTargets().clear(); - this.addTarget(new TargetPermanent(filter, true)); + this.addTarget(new TargetPermanent(filter)); return true; } } diff --git a/Mage.Sets/src/mage/sets/modernmasters/WarrenWeirding.java b/Mage.Sets/src/mage/sets/modernmasters/WarrenWeirding.java index 4d8b319ff8b..499b417f9a2 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/WarrenWeirding.java +++ b/Mage.Sets/src/mage/sets/modernmasters/WarrenWeirding.java @@ -71,7 +71,7 @@ public class WarrenWeirding extends CardImpl { // Target player sacrifices a creature. If a Goblin is sacrificed this way, that player puts two 1/1 black Goblin Rogue creature tokens onto the battlefield, and those tokens gain haste until end of turn. this.getSpellAbility().addEffect(new WarrenWeirdingEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public WarrenWeirding(final WarrenWeirding card) { diff --git a/Mage.Sets/src/mage/sets/morningtide/BurrentonShieldBearers.java b/Mage.Sets/src/mage/sets/morningtide/BurrentonShieldBearers.java index eb7d7583c15..78d9036e05e 100644 --- a/Mage.Sets/src/mage/sets/morningtide/BurrentonShieldBearers.java +++ b/Mage.Sets/src/mage/sets/morningtide/BurrentonShieldBearers.java @@ -54,7 +54,7 @@ public class BurrentonShieldBearers extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); Ability ability = new AttacksTriggeredAbility(new BoostTargetEffect(0, 3, Duration.EndOfTurn), false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/morningtide/DailyRegimen.java b/Mage.Sets/src/mage/sets/morningtide/DailyRegimen.java index b645fae6cee..f5d69cd8d39 100644 --- a/Mage.Sets/src/mage/sets/morningtide/DailyRegimen.java +++ b/Mage.Sets/src/mage/sets/morningtide/DailyRegimen.java @@ -57,7 +57,7 @@ public class DailyRegimen extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/morningtide/Earthbrawn.java b/Mage.Sets/src/mage/sets/morningtide/Earthbrawn.java index 40dae3aa095..9d382a82885 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Earthbrawn.java +++ b/Mage.Sets/src/mage/sets/morningtide/Earthbrawn.java @@ -49,7 +49,7 @@ public class Earthbrawn extends CardImpl { this.expansionSetCode = "MOR"; this.color.setGreen(true); this.getSpellAbility().addEffect(new BoostTargetEffect(3, 3, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.addAbility(new ReinforceAbility(1, new ManaCostsImpl("{1}{G}"))); } diff --git a/Mage.Sets/src/mage/sets/morningtide/GiltLeafArchdruid.java b/Mage.Sets/src/mage/sets/morningtide/GiltLeafArchdruid.java index db74a8fb0da..e951b02d6a7 100644 --- a/Mage.Sets/src/mage/sets/morningtide/GiltLeafArchdruid.java +++ b/Mage.Sets/src/mage/sets/morningtide/GiltLeafArchdruid.java @@ -79,7 +79,7 @@ public class GiltLeafArchdruid extends CardImpl { this.addAbility(new SpellCastControllerTriggeredAbility(new DrawCardSourceControllerEffect(1), filterSpell, true)); // Tap seven untapped Druids you control: Gain control of all lands target player controls. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainControlAllLandsEffect(Duration.EndOfGame), new TapTargetCost(new TargetControlledCreaturePermanent(7, 7, new FilterControlledCreaturePermanent("Druid", "Druids you control"), true))); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/morningtide/Meadowboon.java b/Mage.Sets/src/mage/sets/morningtide/Meadowboon.java index bba368d06d5..8f7b03353ff 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Meadowboon.java +++ b/Mage.Sets/src/mage/sets/morningtide/Meadowboon.java @@ -62,7 +62,7 @@ public class Meadowboon extends CardImpl { // When Meadowboon leaves the battlefield, put a +1/+1 counter on each creature target player controls. Ability ability = new LeavesBattlefieldTriggeredAbility(new MeadowboonEffect(), false); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); // Evoke {3}{W} this.addAbility(new EvokeAbility(this, "{3}{W}")); diff --git a/Mage.Sets/src/mage/sets/morningtide/NogginWhack.java b/Mage.Sets/src/mage/sets/morningtide/NogginWhack.java index 2034111ba56..7ddb757293c 100644 --- a/Mage.Sets/src/mage/sets/morningtide/NogginWhack.java +++ b/Mage.Sets/src/mage/sets/morningtide/NogginWhack.java @@ -65,7 +65,7 @@ public class NogginWhack extends CardImpl { this.addAbility(new ProwlAbility(this, "{1}{B}")); // Target player reveals three cards from his or her hand. You choose two of them. That player discards those cards. this.getSpellAbility().addEffect(new NogginWhackEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } diff --git a/Mage.Sets/src/mage/sets/morningtide/RageForger.java b/Mage.Sets/src/mage/sets/morningtide/RageForger.java index b45ea42f5fa..769eb869399 100644 --- a/Mage.Sets/src/mage/sets/morningtide/RageForger.java +++ b/Mage.Sets/src/mage/sets/morningtide/RageForger.java @@ -81,7 +81,7 @@ public class RageForger extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter), false)); // Whenever a creature you control with a +1/+1 counter on it attacks, you may have that creature deal 1 damage to target player. Ability ability = new AttacksCreatureYourControlTriggeredAbility(new RageForgerDamageEffect(), true, filterAttack, true); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/morningtide/ScarbladeElite.java b/Mage.Sets/src/mage/sets/morningtide/ScarbladeElite.java index 77f61e3962e..02914a7b27b 100644 --- a/Mage.Sets/src/mage/sets/morningtide/ScarbladeElite.java +++ b/Mage.Sets/src/mage/sets/morningtide/ScarbladeElite.java @@ -66,7 +66,7 @@ public class ScarbladeElite extends CardImpl { this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(filter))); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/morningtide/Shinewend.java b/Mage.Sets/src/mage/sets/morningtide/Shinewend.java index 4515508b8a2..517df9d5968 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Shinewend.java +++ b/Mage.Sets/src/mage/sets/morningtide/Shinewend.java @@ -76,7 +76,7 @@ public class Shinewend extends CardImpl { // {1}{W}, Remove a +1/+1 counter from Shinewend: Destroy target enchantment. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{W}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/morningtide/Slithermuse.java b/Mage.Sets/src/mage/sets/morningtide/Slithermuse.java index 5e331d8ad13..a3266b28967 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Slithermuse.java +++ b/Mage.Sets/src/mage/sets/morningtide/Slithermuse.java @@ -102,7 +102,7 @@ class SlithermuseEffect extends OneShotEffect { Player player = game.getPlayer(source.getControllerId()); Permanent permanent = (Permanent)game.getLastKnownInformation(source.getSourceId(), Zone.BATTLEFIELD); if (player != null && permanent != null) { - TargetOpponent target = new TargetOpponent(true); + TargetOpponent target = new TargetOpponent(); target.setRequired(true); target.setNotTarget(true); if (player.choose(this.outcome, target, source.getSourceId(), game)) { diff --git a/Mage.Sets/src/mage/sets/morningtide/Stingmoggie.java b/Mage.Sets/src/mage/sets/morningtide/Stingmoggie.java index eea41897605..f4b7c88efc1 100644 --- a/Mage.Sets/src/mage/sets/morningtide/Stingmoggie.java +++ b/Mage.Sets/src/mage/sets/morningtide/Stingmoggie.java @@ -71,7 +71,7 @@ public class Stingmoggie extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), false)); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{3}{R}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/morningtide/VendilionClique.java b/Mage.Sets/src/mage/sets/morningtide/VendilionClique.java index a6e5715a66d..3b9baa80d52 100644 --- a/Mage.Sets/src/mage/sets/morningtide/VendilionClique.java +++ b/Mage.Sets/src/mage/sets/morningtide/VendilionClique.java @@ -71,7 +71,7 @@ public class VendilionClique extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Vendilion Clique enters the battlefield, look at target player's hand. You may choose a nonland card from it. If you do, that player reveals the chosen card, puts it on the bottom of his or her library, then draws a card. Ability ability = new EntersBattlefieldTriggeredAbility(new VendilionCliqueEffect()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/morningtide/VioletPall.java b/Mage.Sets/src/mage/sets/morningtide/VioletPall.java index 3c18e6accd2..19aff854bc9 100644 --- a/Mage.Sets/src/mage/sets/morningtide/VioletPall.java +++ b/Mage.Sets/src/mage/sets/morningtide/VioletPall.java @@ -57,7 +57,7 @@ public class VioletPall extends CardImpl { this.subtype.add("Faerie"); this.color.setBlack(true); this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new CreateTokenEffect(new FaerieToken(), 1)); } diff --git a/Mage.Sets/src/mage/sets/nemesis/SealOfCleansing.java b/Mage.Sets/src/mage/sets/nemesis/SealOfCleansing.java index 85bf6a49382..ee6a4bb5a80 100644 --- a/Mage.Sets/src/mage/sets/nemesis/SealOfCleansing.java +++ b/Mage.Sets/src/mage/sets/nemesis/SealOfCleansing.java @@ -64,7 +64,7 @@ public class SealOfCleansing extends CardImpl { // Sacrifice Seal of Cleansing: Destroy target artifact or enchantment. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/nemesis/SealOfRemoval.java b/Mage.Sets/src/mage/sets/nemesis/SealOfRemoval.java index ea67ceb2dee..cbe1e1e0cd0 100644 --- a/Mage.Sets/src/mage/sets/nemesis/SealOfRemoval.java +++ b/Mage.Sets/src/mage/sets/nemesis/SealOfRemoval.java @@ -54,7 +54,7 @@ public class SealOfRemoval extends CardImpl { // Sacrifice Seal of Removal: Return target creature to its owner's hand. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/nemesis/SealOfStrength.java b/Mage.Sets/src/mage/sets/nemesis/SealOfStrength.java index 26907b04b46..57884dc01ac 100644 --- a/Mage.Sets/src/mage/sets/nemesis/SealOfStrength.java +++ b/Mage.Sets/src/mage/sets/nemesis/SealOfStrength.java @@ -54,7 +54,7 @@ public class SealOfStrength extends CardImpl { // Sacrifice Seal of Strength: Target creature gets +3/+3 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(3, 3, Duration.EndOfTurn), new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/nemesis/Submerge.java b/Mage.Sets/src/mage/sets/nemesis/Submerge.java index cce3ca96e2c..8ef5f6a34af 100644 --- a/Mage.Sets/src/mage/sets/nemesis/Submerge.java +++ b/Mage.Sets/src/mage/sets/nemesis/Submerge.java @@ -68,7 +68,7 @@ public class Submerge extends CardImpl { this.addAbility(new AlternativeCostSourceAbility(null, condition)); // Put target creature on top of its owner's library. this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/nemesis/ViciousHunger.java b/Mage.Sets/src/mage/sets/nemesis/ViciousHunger.java index 976574828d8..5430ce69ac4 100644 --- a/Mage.Sets/src/mage/sets/nemesis/ViciousHunger.java +++ b/Mage.Sets/src/mage/sets/nemesis/ViciousHunger.java @@ -48,7 +48,7 @@ public class ViciousHunger extends CardImpl { this.color.setBlack(true); // Vicious Hunger deals 2 damage to target creature and you gain 2 life. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellAbility().addEffect(new GainLifeEffect(2)); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ActOfAggression.java b/Mage.Sets/src/mage/sets/newphyrexia/ActOfAggression.java index 33d085ece37..3bc272d4b75 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ActOfAggression.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ActOfAggression.java @@ -50,7 +50,7 @@ public class ActOfAggression extends CardImpl { this.color.setRed(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new UntapTargetEffect()); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ArgentMutation.java b/Mage.Sets/src/mage/sets/newphyrexia/ArgentMutation.java index 4cf0c907dd9..23f53d6bb8b 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ArgentMutation.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ArgentMutation.java @@ -49,7 +49,7 @@ public class ArgentMutation extends CardImpl { this.color.setBlue(true); this.getSpellAbility().addEffect(new AddCardTypeTargetEffect(CardType.ARTIFACT, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetPermanent(true)); + this.getSpellAbility().addTarget(new TargetPermanent()); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java b/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java index 3db76ed8ec7..f2471017fc1 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java @@ -95,7 +95,7 @@ class ArmWithAEtherTriggeredAbility extends TriggeredAbilityImpl { filter.add(new ControllerIdPredicate(opponent.getId())); this.getTargets().clear(); - this.addTarget(new TargetCreaturePermanent(filter, true)); + this.addTarget(new TargetCreaturePermanent(filter)); return true; } return false; diff --git a/Mage.Sets/src/mage/sets/newphyrexia/BeastWithin.java b/Mage.Sets/src/mage/sets/newphyrexia/BeastWithin.java index 3ad38d65a90..ebb01375cc9 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/BeastWithin.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/BeastWithin.java @@ -54,7 +54,7 @@ public class BeastWithin extends CardImpl { this.color.setGreen(true); - this.getSpellAbility().addTarget(new TargetPermanent(true)); + this.getSpellAbility().addTarget(new TargetPermanent()); this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new BeastWithinEffect()); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/BirthingPod.java b/Mage.Sets/src/mage/sets/newphyrexia/BirthingPod.java index 35b42f84448..d9740b4895f 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/BirthingPod.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/BirthingPod.java @@ -66,7 +66,7 @@ public class BirthingPod extends CardImpl { // {1}{GP}, {tap}, Sacrifice a creature: Search your library for a creature card with converted mana cost equal to 1 plus the sacrificed creature's converted mana cost, put that card onto the battlefield, then shuffle your library. Activate this ability only any time you could cast a sorcery. Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new BirthingPodEffect(), new ManaCostsImpl("{1}{GP}")); ability.addCost(new TapSourceCost()); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/BlindZealot.java b/Mage.Sets/src/mage/sets/newphyrexia/BlindZealot.java index 3b2997f191b..67204257797 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/BlindZealot.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/BlindZealot.java @@ -113,7 +113,7 @@ class BlindZealotTriggeredAbility extends TriggeredAbilityImpl { filter.setMessage("creature controlled by " + game.getPlayer(event.getTargetId()).getName()); this.getTargets().clear(); - this.addTarget(new TargetCreaturePermanent(filter, true)); + this.addTarget(new TargetCreaturePermanent(filter)); return true; } } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/BlindingSouleater.java b/Mage.Sets/src/mage/sets/newphyrexia/BlindingSouleater.java index 915e8c276b7..34cd7866f8d 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/BlindingSouleater.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/BlindingSouleater.java @@ -58,7 +58,7 @@ public class BlindingSouleater extends CardImpl { new TapTargetEffect(), new PhyrexianManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/BrutalizerExarch.java b/Mage.Sets/src/mage/sets/newphyrexia/BrutalizerExarch.java index 39b0c9a1dfb..fc62b32bd21 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/BrutalizerExarch.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/BrutalizerExarch.java @@ -75,7 +75,7 @@ public class BrutalizerExarch extends CardImpl { Ability ability = new EntersBattlefieldTriggeredAbility(new BrutalizerExarchEffect1()); Mode mode = new Mode(); mode.getEffects().add(new BrutalizerExarchEffect2()); - mode.getTargets().add(new TargetPermanent(filter, true)); + mode.getTargets().add(new TargetPermanent(filter)); ability.addMode(mode); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/CaressOfPhyrexia.java b/Mage.Sets/src/mage/sets/newphyrexia/CaressOfPhyrexia.java index daf3f50f41f..eccae4934d3 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/CaressOfPhyrexia.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/CaressOfPhyrexia.java @@ -51,7 +51,7 @@ public class CaressOfPhyrexia extends CardImpl { this.getSpellAbility().addEffect(new DrawCardTargetEffect(3)); this.getSpellAbility().addEffect(new LoseLifeTargetEffect(3)); this.getSpellAbility().addEffect(new AddPoisonCounterTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public CaressOfPhyrexia(final CaressOfPhyrexia card) { diff --git a/Mage.Sets/src/mage/sets/newphyrexia/DeceiverExarch.java b/Mage.Sets/src/mage/sets/newphyrexia/DeceiverExarch.java index 11fe0bb3998..98a6a462fec 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/DeceiverExarch.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/DeceiverExarch.java @@ -68,10 +68,10 @@ public class DeceiverExarch extends CardImpl { this.addAbility(FlashAbility.getInstance()); // When Deceiver Exarch enters the battlefield, choose one - Untap target permanent you control; or tap target permanent an opponent controls. Ability ability = new EntersBattlefieldTriggeredAbility(new UntapTargetEffect()); - ability.addTarget(new TargetControlledPermanent(true)); + ability.addTarget(new TargetControlledPermanent()); Mode mode = new Mode(); mode.getEffects().add(new TapTargetEffect()); - mode.getTargets().add(new TargetPermanent(filter, true)); + mode.getTargets().add(new TargetPermanent(filter)); ability.addMode(mode); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/DefensiveStance.java b/Mage.Sets/src/mage/sets/newphyrexia/DefensiveStance.java index fd55a64540c..08dfd643463 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/DefensiveStance.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/DefensiveStance.java @@ -54,7 +54,7 @@ public class DefensiveStance extends CardImpl { this.color.setBlue(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/DementiaBat.java b/Mage.Sets/src/mage/sets/newphyrexia/DementiaBat.java index 9b6b075ade1..c6a532f13c9 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/DementiaBat.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/DementiaBat.java @@ -58,7 +58,7 @@ public class DementiaBat extends CardImpl { this.addAbility(FlyingAbility.getInstance()); SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(2), new ManaCostsImpl("{4}{B}")); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Despise.java b/Mage.Sets/src/mage/sets/newphyrexia/Despise.java index 3096b3e6c9e..2e5ccce5684 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Despise.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Despise.java @@ -58,7 +58,7 @@ public class Despise extends CardImpl { this.color.setBlack(true); // Target opponent reveals his or her hand. You choose a creature or planeswalker card from it. That player discards that card. - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(filter)); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Dismember.java b/Mage.Sets/src/mage/sets/newphyrexia/Dismember.java index 28e705d3cc9..bff9f1178c6 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Dismember.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Dismember.java @@ -50,7 +50,7 @@ public class Dismember extends CardImpl { // Target creature gets -5/-5 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(-5, -5, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public Dismember (final Dismember card) { diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Dispatch.java b/Mage.Sets/src/mage/sets/newphyrexia/Dispatch.java index 725fe4ba6fe..2ff620c2b5a 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Dispatch.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Dispatch.java @@ -50,7 +50,7 @@ public class Dispatch extends CardImpl { this.color.setWhite(true); this.getSpellAbility().addEffect(new TapTargetEffect()); this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new ExileTargetEffect(), MetalcraftCondition.getInstance(), "Metalcraft - If you control three or more artifacts, exile that creature")); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public Dispatch (final Dispatch card) { diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Enslave.java b/Mage.Sets/src/mage/sets/newphyrexia/Enslave.java index 1c0b18d3e94..792cf1d45f3 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Enslave.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Enslave.java @@ -56,7 +56,7 @@ public class Enslave extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Aura"); this.color.setBlack(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/EntomberExarch.java b/Mage.Sets/src/mage/sets/newphyrexia/EntomberExarch.java index ba042046310..1ab3cffbd75 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/EntomberExarch.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/EntomberExarch.java @@ -71,7 +71,7 @@ public class EntomberExarch extends CardImpl { ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard"))); Mode mode = new Mode(); mode.getEffects().add(new EntomberExarchEffect()); - mode.getTargets().add(new TargetOpponent(true)); + mode.getTargets().add(new TargetOpponent()); ability.addMode(mode); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/EtchedMonstrosity.java b/Mage.Sets/src/mage/sets/newphyrexia/EtchedMonstrosity.java index 868bb5e8fc2..dc59c0b44a5 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/EtchedMonstrosity.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/EtchedMonstrosity.java @@ -60,7 +60,7 @@ public class EtchedMonstrosity extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.M1M1.createInstance(5)), "{this} gets five -1/-1 counters")); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardTargetEffect(3), new ManaCostsImpl("{W}{U}{B}{R}{G}")); ability.addCost(new RemoveCountersSourceCost(CounterType.M1M1.createInstance(5))); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ExclusionRitual.java b/Mage.Sets/src/mage/sets/newphyrexia/ExclusionRitual.java index 1ae2a886fcc..036dddac295 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ExclusionRitual.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ExclusionRitual.java @@ -63,7 +63,7 @@ public class ExclusionRitual extends CardImpl { // Imprint - When Exclusion Ritual enters the battlefield, exile target nonland permanent. Ability ability = new EntersBattlefieldTriggeredAbility(new ExclusionRitualImprintEffect(), false); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); // Players can't cast spells with the same name as the exiled card. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ExclusionRitualReplacementEffect())); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ForcedWorship.java b/Mage.Sets/src/mage/sets/newphyrexia/ForcedWorship.java index 6dd4dc82898..beea6560be0 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ForcedWorship.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ForcedWorship.java @@ -59,7 +59,7 @@ public class ForcedWorship extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/GethsVerdict.java b/Mage.Sets/src/mage/sets/newphyrexia/GethsVerdict.java index 59c0c58b38d..7411a6e11a0 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/GethsVerdict.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/GethsVerdict.java @@ -49,7 +49,7 @@ public class GethsVerdict extends CardImpl { this.color.setBlack(true); this.getSpellAbility().addEffect(new SacrificeEffect(new FilterCreaturePermanent(), 1, "Target player")); this.getSpellAbility().addEffect(new LoseLifeTargetEffect(1)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public GethsVerdict (final GethsVerdict card) { diff --git a/Mage.Sets/src/mage/sets/newphyrexia/GitaxianProbe.java b/Mage.Sets/src/mage/sets/newphyrexia/GitaxianProbe.java index a3b30dd64c6..c4f4f69d3fd 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/GitaxianProbe.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/GitaxianProbe.java @@ -53,7 +53,7 @@ public class GitaxianProbe extends CardImpl { // Look at target player's hand. this.getSpellAbility().addEffect(new GitaxianProbeEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/GlisteningOil.java b/Mage.Sets/src/mage/sets/newphyrexia/GlisteningOil.java index 031e76fb251..e41c09ea171 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/GlisteningOil.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/GlisteningOil.java @@ -58,7 +58,7 @@ public class GlisteningOil extends CardImpl { this.expansionSetCode = "NPH"; this.subtype.add("Aura"); this.color.setBlack(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/GreenhiltTrainee.java b/Mage.Sets/src/mage/sets/newphyrexia/GreenhiltTrainee.java index 2820c4f1e04..2be41b2e032 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/GreenhiltTrainee.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/GreenhiltTrainee.java @@ -60,7 +60,7 @@ public class GreenhiltTrainee extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(4, 4, Duration.EndOfTurn), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new GreenhiltTraineeCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/GrimAffliction.java b/Mage.Sets/src/mage/sets/newphyrexia/GrimAffliction.java index b186633bceb..3165f8f1c19 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/GrimAffliction.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/GrimAffliction.java @@ -48,7 +48,7 @@ public class GrimAffliction extends CardImpl { this.color.setBlack(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new AddCountersTargetEffect(CounterType.M1M1.createInstance())); this.getSpellAbility().addEffect(new ProliferateEffect()); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/HexParasite.java b/Mage.Sets/src/mage/sets/newphyrexia/HexParasite.java index c8a65058b63..b2d5753aeaa 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/HexParasite.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/HexParasite.java @@ -61,7 +61,7 @@ public class HexParasite extends CardImpl { // {X}{BP}: Remove up to X counters from target permanent. For each counter removed this way, Hex Parasite gets +1/+0 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HexParasiteEffect(), new ManaCostsImpl("{X}{BP}")); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/IchorExplosion.java b/Mage.Sets/src/mage/sets/newphyrexia/IchorExplosion.java index d789a18da3c..d5ae15680d2 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/IchorExplosion.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/IchorExplosion.java @@ -56,7 +56,7 @@ public class IchorExplosion extends CardImpl { this.color.setBlack(true); // As an additional cost to cast Ichor Explosion, sacrifice a creature. - this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); // All creatures get -X/-X until end of turn, where X is the sacrificed creature's power. DynamicValue xValue = new IchorExplosionDynamicValue(); this.getSpellAbility().addEffect(new BoostAllEffect(xValue, xValue, Duration.EndOfTurn, new FilterCreaturePermanent(), false, null, true)); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/InquisitorExarch.java b/Mage.Sets/src/mage/sets/newphyrexia/InquisitorExarch.java index 429326ba026..bddef69470c 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/InquisitorExarch.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/InquisitorExarch.java @@ -56,7 +56,7 @@ public class InquisitorExarch extends CardImpl { Ability ability = new EntersBattlefieldTriggeredAbility(new GainLifeEffect(2)); Mode mode = new Mode(); mode.getEffects().add(new LoseLifeTargetEffect(2)); - mode.getTargets().add(new TargetPlayer(true)); + mode.getTargets().add(new TargetPlayer()); ability.addMode(mode); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/KarnLiberated.java b/Mage.Sets/src/mage/sets/newphyrexia/KarnLiberated.java index 13a607232ac..f2b3f75b28c 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/KarnLiberated.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/KarnLiberated.java @@ -73,12 +73,12 @@ public class KarnLiberated extends CardImpl { // +4: Target player exiles a card from his or her hand. LoyaltyAbility ability1 = new LoyaltyAbility(new ExileFromZoneTargetEffect(Zone.HAND, exileId, "Karn Liberated", new FilterCard()), 4); - ability1.addTarget(new TargetPlayer(true)); + ability1.addTarget(new TargetPlayer()); this.addAbility(ability1); // -3: Exile target permanent. LoyaltyAbility ability2 = new LoyaltyAbility(new ExileTargetEffect(exileId, "Karn Liberated"), -3); - ability2.addTarget(new TargetPermanent(true)); + ability2.addTarget(new TargetPermanent()); this.addAbility(ability2); // -14: Restart the game, leaving in exile all non-Aura permanent cards exiled with Karn Liberated. Then put those cards onto the battlefield under your control. diff --git a/Mage.Sets/src/mage/sets/newphyrexia/LifesFinale.java b/Mage.Sets/src/mage/sets/newphyrexia/LifesFinale.java index d0c4699ef16..4b15ccfb93f 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/LifesFinale.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/LifesFinale.java @@ -58,7 +58,7 @@ public class LifesFinale extends CardImpl { this.color.setBlack(true); this.getSpellAbility().addEffect(new LifesFinaleEffect()); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); } public LifesFinale(final LifesFinale card) { diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Mindculling.java b/Mage.Sets/src/mage/sets/newphyrexia/Mindculling.java index 503f92e24da..52e832b8737 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Mindculling.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Mindculling.java @@ -48,7 +48,7 @@ public class Mindculling extends CardImpl { this.color.setBlue(true); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(2)); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); this.getSpellAbility().addEffect(new DiscardTargetEffect(2)); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/MortisDogs.java b/Mage.Sets/src/mage/sets/newphyrexia/MortisDogs.java index b7926e38f9e..0827741d89f 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/MortisDogs.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/MortisDogs.java @@ -61,7 +61,7 @@ public class MortisDogs extends CardImpl { this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), false)); Ability ability = new DiesTriggeredAbility(new MortisDogsEffect()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/MutagenicGrowth.java b/Mage.Sets/src/mage/sets/newphyrexia/MutagenicGrowth.java index fc8ac4f2af5..83028869855 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/MutagenicGrowth.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/MutagenicGrowth.java @@ -46,7 +46,7 @@ public class MutagenicGrowth extends CardImpl { super(ownerId, 116, "Mutagenic Growth", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{GP}"); this.expansionSetCode = "NPH"; this.color.setGreen(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/NumbingDose.java b/Mage.Sets/src/mage/sets/newphyrexia/NumbingDose.java index df435ae7743..99fd3c8d181 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/NumbingDose.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/NumbingDose.java @@ -68,7 +68,7 @@ public class NumbingDose extends CardImpl { this.color.setBlue(true); - TargetPermanent auraTarget = new TargetPermanent(filter, true); + TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); EnchantAbility ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ParasiticImplant.java b/Mage.Sets/src/mage/sets/newphyrexia/ParasiticImplant.java index a8eb6985af6..38de176613a 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ParasiticImplant.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ParasiticImplant.java @@ -59,7 +59,7 @@ public class ParasiticImplant extends CardImpl { this.color.setBlack(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Sacrifice)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianIngester.java b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianIngester.java index d05976d5c53..cdede6ba209 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianIngester.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianIngester.java @@ -73,7 +73,7 @@ public class PhyrexianIngester extends CardImpl { // Imprint - When Phyrexian Ingester enters the battlefield, you may exile target nontoken creature. Ability ability = new EntersBattlefieldTriggeredAbility(new PhyrexianIngesterImprintEffect(), true); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); // Phyrexian Ingester gets +X/+Y, where X is the exiled creature card's power and Y is its toughness. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PhyrexianIngesterBoostEffect())); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianMetamorph.java b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianMetamorph.java index 3de6ab24a88..c09c0b6d6c8 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianMetamorph.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianMetamorph.java @@ -104,7 +104,7 @@ class PhyrexianMetamorphEffect extends OneShotEffect { Player player = game.getPlayer(source.getControllerId()); Permanent sourcePermanent = game.getPermanent(source.getSourceId()); if (player != null && sourcePermanent != null) { - Target target = new TargetPermanent(filter, true); + Target target = new TargetPermanent(filter); if (target.canChoose(source.getControllerId(), game)) { player.choose(Outcome.Copy, target, source.getSourceId(), game); Permanent copyFromPermanent = game.getPermanent(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PithDriller.java b/Mage.Sets/src/mage/sets/newphyrexia/PithDriller.java index d274a0f6649..4ed93a0acd1 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PithDriller.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PithDriller.java @@ -53,7 +53,7 @@ public class PithDriller extends CardImpl { this.toughness = new MageInt(4); EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new AddCountersTargetEffect(CounterType.M1M1.createInstance())); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PraetorsGrasp.java b/Mage.Sets/src/mage/sets/newphyrexia/PraetorsGrasp.java index 078f50bb5e4..2a97b40ba62 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PraetorsGrasp.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PraetorsGrasp.java @@ -57,7 +57,7 @@ public class PraetorsGrasp extends CardImpl { // Search target opponent's library for a card and exile it face down. Then that player shuffles his or her library. You may look at and play that card for as long as it remains exiled. this.getSpellAbility().addEffect(new PraetorsGraspEffect()); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ScrapyardSalvo.java b/Mage.Sets/src/mage/sets/newphyrexia/ScrapyardSalvo.java index 5273c550ad3..1e94cc2978b 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ScrapyardSalvo.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ScrapyardSalvo.java @@ -50,7 +50,7 @@ public class ScrapyardSalvo extends CardImpl { this.color.setRed(true); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new DamageTargetEffect(new CardsInControllerGraveyardCount(filter))); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfLimitlessPower.java b/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfLimitlessPower.java index b957e8da9d3..33996080b20 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfLimitlessPower.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfLimitlessPower.java @@ -71,7 +71,7 @@ public class ShrineOfLimitlessPower extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(new CountersCount(CounterType.CHARGE)), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/SoulConduit.java b/Mage.Sets/src/mage/sets/newphyrexia/SoulConduit.java index 1322fcff678..7e8db7de5d8 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/SoulConduit.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/SoulConduit.java @@ -55,8 +55,8 @@ public class SoulConduit extends CardImpl { // {6}, {tap}: Two target players exchange life totals. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SoulConduitEffect(), new GenericManaCost(6)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/SwordOfWarAndPeace.java b/Mage.Sets/src/mage/sets/newphyrexia/SwordOfWarAndPeace.java index 66de0ab1589..916322cc5a2 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/SwordOfWarAndPeace.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/SwordOfWarAndPeace.java @@ -97,7 +97,7 @@ class SwordOfWarAndPeaceAbility extends TriggeredAbilityImpl { public SwordOfWarAndPeaceAbility() { super(Zone.BATTLEFIELD, new SwordOfWarAndPeaceDamageEffect()); this.addEffect(new GainLifeEffect(new CardsInControllerHandCount())); - this.addTarget(new TargetPlayer(true)); + this.addTarget(new TargetPlayer()); } public SwordOfWarAndPeaceAbility(final SwordOfWarAndPeaceAbility ability) { diff --git a/Mage.Sets/src/mage/sets/newphyrexia/TormentorExarch.java b/Mage.Sets/src/mage/sets/newphyrexia/TormentorExarch.java index a36c0db7500..cd67c3ccd4c 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/TormentorExarch.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/TormentorExarch.java @@ -55,10 +55,10 @@ public class TormentorExarch extends CardImpl { this.toughness = new MageInt(2); Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(2, 0, Duration.EndOfTurn), false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); Mode mode = new Mode(); mode.getEffects().add(new BoostTargetEffect(0, -2, Duration.EndOfTurn)); - mode.getTargets().add(new TargetCreaturePermanent(true)); + mode.getTargets().add(new TargetCreaturePermanent()); ability.addMode(mode); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/VaporSnag.java b/Mage.Sets/src/mage/sets/newphyrexia/VaporSnag.java index c9ef4f3436b..190bfdfae45 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/VaporSnag.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/VaporSnag.java @@ -51,7 +51,7 @@ public class VaporSnag extends CardImpl { // Return target creature to its owner's hand. Its controller loses 1 life. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); this.getSpellAbility().addEffect(new LoseLifeTargetControllerEffect(1)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public VaporSnag (final VaporSnag card) { diff --git a/Mage.Sets/src/mage/sets/newphyrexia/VictoriousDestruction.java b/Mage.Sets/src/mage/sets/newphyrexia/VictoriousDestruction.java index 8e74cce5adf..dddc9ffcb7e 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/VictoriousDestruction.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/VictoriousDestruction.java @@ -59,7 +59,7 @@ public class VictoriousDestruction extends CardImpl { this.color.setRed(true); // Destroy target artifact or land. Its controller loses 1 life. - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new LoseLifeTargetControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/VitalSplicer.java b/Mage.Sets/src/mage/sets/newphyrexia/VitalSplicer.java index 0eae9908efb..4350eb594b8 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/VitalSplicer.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/VitalSplicer.java @@ -76,7 +76,7 @@ public class VitalSplicer extends CardImpl { // {1}: Regenerate target Golem you control. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{1}")); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ninthedition/AvenWindreader.java b/Mage.Sets/src/mage/sets/ninthedition/AvenWindreader.java index ced68c34655..68ec9f0be92 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/AvenWindreader.java +++ b/Mage.Sets/src/mage/sets/ninthedition/AvenWindreader.java @@ -65,7 +65,7 @@ public class AvenWindreader extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {1}{U}: Target player reveals the top card of his or her library. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RevealTopCardTargetPlayerEffect(), new ManaCostsImpl("{1}{U}")); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ninthedition/ContaminatedBond.java b/Mage.Sets/src/mage/sets/ninthedition/ContaminatedBond.java index af43fec935b..7a1849f03f7 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/ContaminatedBond.java +++ b/Mage.Sets/src/mage/sets/ninthedition/ContaminatedBond.java @@ -56,7 +56,7 @@ public class ContaminatedBond extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/ninthedition/EarlyHarvest.java b/Mage.Sets/src/mage/sets/ninthedition/EarlyHarvest.java index 70bcce09c8e..89cfdfd664e 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/EarlyHarvest.java +++ b/Mage.Sets/src/mage/sets/ninthedition/EarlyHarvest.java @@ -54,7 +54,7 @@ public class EarlyHarvest extends CardImpl { // Target player untaps all basic lands he or she controls. this.getSpellAbility().addEffect(new UntapAllLandsTargetEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public EarlyHarvest(final EarlyHarvest card) { diff --git a/Mage.Sets/src/mage/sets/ninthedition/Enrage.java b/Mage.Sets/src/mage/sets/ninthedition/Enrage.java index 22de623a55b..f2356c2c740 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/Enrage.java +++ b/Mage.Sets/src/mage/sets/ninthedition/Enrage.java @@ -52,7 +52,7 @@ public class Enrage extends CardImpl { // Target creature gets +X/+0 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(new ManacostVariableValue(), new StaticValue(0), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public Enrage(final Enrage card) { diff --git a/Mage.Sets/src/mage/sets/ninthedition/Execute.java b/Mage.Sets/src/mage/sets/ninthedition/Execute.java index cefe44e61c8..7cdd5c21bf8 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/Execute.java +++ b/Mage.Sets/src/mage/sets/ninthedition/Execute.java @@ -56,7 +56,7 @@ public class Execute extends CardImpl { this.color.setBlack(true); // Destroy target white creature. It can't be regenerated. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/ninthedition/GravePact.java b/Mage.Sets/src/mage/sets/ninthedition/GravePact.java index 063ef52af36..962db273c30 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/GravePact.java +++ b/Mage.Sets/src/mage/sets/ninthedition/GravePact.java @@ -125,7 +125,7 @@ class GravePactEffect extends OneShotEffect { for (UUID playerId : game.getPlayerList()) { if (!playerId.equals(source.getControllerId())) { Player player = game.getPlayer(playerId); - Target target = new TargetControlledCreaturePermanent(true); + Target target = new TargetControlledCreaturePermanent(); if (player != null && player.choose(Outcome.Sacrifice, target, source.getSourceId(), game)) { Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent != null) { diff --git a/Mage.Sets/src/mage/sets/ninthedition/Nekrataal.java b/Mage.Sets/src/mage/sets/ninthedition/Nekrataal.java index 1db35aa1800..b517da06487 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/Nekrataal.java +++ b/Mage.Sets/src/mage/sets/ninthedition/Nekrataal.java @@ -72,7 +72,7 @@ public class Nekrataal extends CardImpl { // When Nekrataal enters the battlefield, destroy target nonartifact, nonblack creature. That creature can't be regenerated. Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(true)); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ninthedition/Slay.java b/Mage.Sets/src/mage/sets/ninthedition/Slay.java index 5d9fb0f7e65..3558775ba37 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/Slay.java +++ b/Mage.Sets/src/mage/sets/ninthedition/Slay.java @@ -56,7 +56,7 @@ public class Slay extends CardImpl { this.color.setBlack(true); // Destroy target green creature. It can't be regenerated. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/ninthedition/TemporalAdept.java b/Mage.Sets/src/mage/sets/ninthedition/TemporalAdept.java index b695c8e3065..b870d35314e 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/TemporalAdept.java +++ b/Mage.Sets/src/mage/sets/ninthedition/TemporalAdept.java @@ -60,7 +60,7 @@ public class TemporalAdept extends CardImpl { // {U}{U}{U}, {tap}: Return target permanent to its owner's hand. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{U}{U}{U}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/odyssey/AboshanCephalidEmperor.java b/Mage.Sets/src/mage/sets/odyssey/AboshanCephalidEmperor.java index bd21a3f73d5..85cf250c777 100644 --- a/Mage.Sets/src/mage/sets/odyssey/AboshanCephalidEmperor.java +++ b/Mage.Sets/src/mage/sets/odyssey/AboshanCephalidEmperor.java @@ -73,8 +73,8 @@ static { this.toughness = new MageInt(3); // Tap an untapped Cephalid you control: Tap target permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter1, true, true))); - ability.addTarget(new TargetPermanent(true)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter1, true))); + ability.addTarget(new TargetPermanent()); this.addAbility(ability); // {U}{U}{U}: Tap all creatures without flying. diff --git a/Mage.Sets/src/mage/sets/odyssey/AboshansDesire.java b/Mage.Sets/src/mage/sets/odyssey/AboshansDesire.java index f2f155c55ca..257b8bdbf9b 100644 --- a/Mage.Sets/src/mage/sets/odyssey/AboshansDesire.java +++ b/Mage.Sets/src/mage/sets/odyssey/AboshansDesire.java @@ -61,7 +61,7 @@ public class AboshansDesire extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/odyssey/AcceptableLosses.java b/Mage.Sets/src/mage/sets/odyssey/AcceptableLosses.java index b574e396985..5596c2730b7 100644 --- a/Mage.Sets/src/mage/sets/odyssey/AcceptableLosses.java +++ b/Mage.Sets/src/mage/sets/odyssey/AcceptableLosses.java @@ -52,7 +52,7 @@ public class AcceptableLosses extends CardImpl { this.getSpellAbility().addCost(new DiscardTargetCost(new TargetCardInHand(), true)); // Acceptable Losses deals 5 damage to target creature. this.getSpellAbility().addEffect(new DamageTargetEffect(5)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public AcceptableLosses(final AcceptableLosses card) { diff --git a/Mage.Sets/src/mage/sets/odyssey/AegisOfHonor.java b/Mage.Sets/src/mage/sets/odyssey/AegisOfHonor.java index 77bf02f8288..a0adf6d86ff 100644 --- a/Mage.Sets/src/mage/sets/odyssey/AegisOfHonor.java +++ b/Mage.Sets/src/mage/sets/odyssey/AegisOfHonor.java @@ -113,7 +113,7 @@ class AegisOfHonorEffect extends RedirectionEffect { } //Checks if damage is from a sorcery or instants if (spell != null && instantOrSorceryfilter.match(spell.getCard(), game)) { - TargetPermanent target = new TargetPermanent(true); + TargetPermanent target = new TargetPermanent(); target.add(spell.getControllerId(), game); redirectTarget = target; return true; diff --git a/Mage.Sets/src/mage/sets/odyssey/BarbarianLunatic.java b/Mage.Sets/src/mage/sets/odyssey/BarbarianLunatic.java index e902746a752..8f5a6dae15b 100644 --- a/Mage.Sets/src/mage/sets/odyssey/BarbarianLunatic.java +++ b/Mage.Sets/src/mage/sets/odyssey/BarbarianLunatic.java @@ -59,7 +59,7 @@ public class BarbarianLunatic extends CardImpl { // {2}{R}, Sacrifice Barbarian Lunatic: Barbarian Lunatic deals 2 damage to target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{2}{R}")); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/odyssey/BarbarianRing.java b/Mage.Sets/src/mage/sets/odyssey/BarbarianRing.java index 45b7ccf2406..d8db1ef94a1 100644 --- a/Mage.Sets/src/mage/sets/odyssey/BarbarianRing.java +++ b/Mage.Sets/src/mage/sets/odyssey/BarbarianRing.java @@ -66,7 +66,7 @@ public class BarbarianRing extends CardImpl { "Threshold - {R}, {T}, Sacrifice {this}: {this} deals 2 damage to target creature or player. Activate this ability only if seven or more cards are in your graveyard."); thresholdAbility.addCost(new TapSourceCost()); thresholdAbility.addCost(new SacrificeSourceCost()); - thresholdAbility.addTarget(new TargetCreatureOrPlayer(true)); + thresholdAbility.addTarget(new TargetCreatureOrPlayer()); this.addAbility(thresholdAbility); } diff --git a/Mage.Sets/src/mage/sets/odyssey/BlazingSalvo.java b/Mage.Sets/src/mage/sets/odyssey/BlazingSalvo.java index df4cee3a5e4..6f26020dafa 100644 --- a/Mage.Sets/src/mage/sets/odyssey/BlazingSalvo.java +++ b/Mage.Sets/src/mage/sets/odyssey/BlazingSalvo.java @@ -52,7 +52,7 @@ public class BlazingSalvo extends CardImpl { this.color.setRed(true); // Blazing Salvo deals 3 damage to target creature unless that creature's controller has Blazing Salvo deal 5 damage to him or her. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BlazingSalvoEffect()); } diff --git a/Mage.Sets/src/mage/sets/odyssey/BombSquad.java b/Mage.Sets/src/mage/sets/odyssey/BombSquad.java index 00f5719c7f0..ab2e3ff8e79 100644 --- a/Mage.Sets/src/mage/sets/odyssey/BombSquad.java +++ b/Mage.Sets/src/mage/sets/odyssey/BombSquad.java @@ -78,7 +78,7 @@ public class BombSquad extends CardImpl { // {tap}: Put a fuse counter on target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.FUSE.createInstance()), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // At the beginning of your upkeep, put a fuse counter on each creature with a fuse counter on it. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new BombSquadBeginningEffect(), TargetController.YOU, false)); diff --git a/Mage.Sets/src/mage/sets/odyssey/CabalInquisitor.java b/Mage.Sets/src/mage/sets/odyssey/CabalInquisitor.java index da973d15892..c47f1f383ac 100644 --- a/Mage.Sets/src/mage/sets/odyssey/CabalInquisitor.java +++ b/Mage.Sets/src/mage/sets/odyssey/CabalInquisitor.java @@ -70,7 +70,7 @@ public class CabalInquisitor extends CardImpl { // Threshold - {1}{B}, {tap}, Exile two cards from your graveyard: Target player discards a card. Activate this ability only any time you could cast a sorcery, and only if seven or more cards are in your graveyard. Ability ability = new ActivateAsSorceryConditionalActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl("{1}{B}"), new CardsInControllerGraveCondition(7), "

Threshold - {1}{B}, {tap}, Exile two cards from your graveyard: Target player discards a card. Activate this ability only any time you could cast a sorcery, and only if seven or more cards are in your graveyard."); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); ability.addCost(new TapSourceCost()); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(2, new FilterCard("cards from your graveyard")))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/odyssey/CabalPatriarch.java b/Mage.Sets/src/mage/sets/odyssey/CabalPatriarch.java index e15fb17f739..9bbd1a8bd39 100644 --- a/Mage.Sets/src/mage/sets/odyssey/CabalPatriarch.java +++ b/Mage.Sets/src/mage/sets/odyssey/CabalPatriarch.java @@ -68,13 +68,13 @@ public class CabalPatriarch extends CardImpl { TargetControlledPermanent target = new TargetControlledPermanent(new FilterControlledCreaturePermanent("a creature")); target.setRequired(true); ability1.addCost(new SacrificeTargetCost(target)); - ability1.addTarget(new TargetCreaturePermanent(true)); + ability1.addTarget(new TargetCreaturePermanent()); this.addAbility(ability1); // {2}{B}, Exile a creature card from your graveyard: Target creature gets -2/-2 until end of turn. Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl("{2}{B}")); ability2.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(new FilterCreatureCard("a creature card")))); - ability2.addTarget(new TargetCreaturePermanent(true)); + ability2.addTarget(new TargetCreaturePermanent()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/sets/odyssey/CabalPit.java b/Mage.Sets/src/mage/sets/odyssey/CabalPit.java index 99562060b2f..7b93c64ca33 100644 --- a/Mage.Sets/src/mage/sets/odyssey/CabalPit.java +++ b/Mage.Sets/src/mage/sets/odyssey/CabalPit.java @@ -67,7 +67,7 @@ public class CabalPit extends CardImpl { "Threshold - {B}, {T}, Sacrifice {this}: Target creature gets -2/-2 until end of turn. Activate this ability only if seven or more cards are in your graveyard."); thresholdAbility.addCost(new TapSourceCost()); thresholdAbility.addCost(new SacrificeSourceCost()); - thresholdAbility.addTarget(new TargetCreaturePermanent(true)); + thresholdAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(thresholdAbility); } diff --git a/Mage.Sets/src/mage/sets/odyssey/CausticTar.java b/Mage.Sets/src/mage/sets/odyssey/CausticTar.java index eb9540723f5..8e92c4fe7d0 100644 --- a/Mage.Sets/src/mage/sets/odyssey/CausticTar.java +++ b/Mage.Sets/src/mage/sets/odyssey/CausticTar.java @@ -69,7 +69,7 @@ public class CausticTar extends CardImpl { // Enchanted land has "{tap}: Target player loses 3 life." Ability tarAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(3), new TapSourceCost()); - tarAbility.addTarget(new TargetPlayer(true)); + tarAbility.addTarget(new TargetPlayer()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(tarAbility, AttachmentType.AURA, Duration.WhileOnBattlefield,"Enchanted land has \"{t}: Target player loses 3 life.\""))); diff --git a/Mage.Sets/src/mage/sets/odyssey/CeaseFire.java b/Mage.Sets/src/mage/sets/odyssey/CeaseFire.java index 8ba349e5301..af4f43c94ea 100644 --- a/Mage.Sets/src/mage/sets/odyssey/CeaseFire.java +++ b/Mage.Sets/src/mage/sets/odyssey/CeaseFire.java @@ -58,7 +58,7 @@ public class CeaseFire extends CardImpl { // Target player can't cast creature spells this turn. this.getSpellAbility().addEffect(new CeaseFireEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/odyssey/CentaurGarden.java b/Mage.Sets/src/mage/sets/odyssey/CentaurGarden.java index c641ec586df..3fa8e83af76 100644 --- a/Mage.Sets/src/mage/sets/odyssey/CentaurGarden.java +++ b/Mage.Sets/src/mage/sets/odyssey/CentaurGarden.java @@ -67,7 +67,7 @@ public class CentaurGarden extends CardImpl { "Threshold - {G}, {T}, Sacrifice {this}: Target creature gets +3/+3 until end of turn. Activate this ability only if seven or more cards are in your graveyard."); thresholdAbility.addCost(new TapSourceCost()); thresholdAbility.addCost(new SacrificeSourceCost()); - thresholdAbility.addTarget(new TargetCreaturePermanent(true)); + thresholdAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(thresholdAbility); } diff --git a/Mage.Sets/src/mage/sets/odyssey/CephalidBroker.java b/Mage.Sets/src/mage/sets/odyssey/CephalidBroker.java index cb4af5d0ea2..6a01fa787ec 100644 --- a/Mage.Sets/src/mage/sets/odyssey/CephalidBroker.java +++ b/Mage.Sets/src/mage/sets/odyssey/CephalidBroker.java @@ -62,7 +62,7 @@ public class CephalidBroker extends CardImpl { // {tap}: Target player draws two cards, then discards two cards. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardTargetEffect(2), new TapSourceCost()); ability.addEffect(new DiscardTargetEffect(2)); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/odyssey/CephalidColiseum.java b/Mage.Sets/src/mage/sets/odyssey/CephalidColiseum.java index ec9ffeeda93..a725b3a0493 100644 --- a/Mage.Sets/src/mage/sets/odyssey/CephalidColiseum.java +++ b/Mage.Sets/src/mage/sets/odyssey/CephalidColiseum.java @@ -68,7 +68,7 @@ public class CephalidColiseum extends CardImpl { thresholdAbility.addEffect(new DiscardTargetEffect(3)); thresholdAbility.addCost(new TapSourceCost()); thresholdAbility.addCost(new SacrificeSourceCost()); - thresholdAbility.addTarget(new TargetPlayer(true)); + thresholdAbility.addTarget(new TargetPlayer()); this.addAbility(thresholdAbility); } diff --git a/Mage.Sets/src/mage/sets/odyssey/CephalidLooter.java b/Mage.Sets/src/mage/sets/odyssey/CephalidLooter.java index e3f2add15bd..475012e07ed 100644 --- a/Mage.Sets/src/mage/sets/odyssey/CephalidLooter.java +++ b/Mage.Sets/src/mage/sets/odyssey/CephalidLooter.java @@ -57,7 +57,7 @@ public class CephalidLooter extends CardImpl { // {tap}: Target player draws a card, then discards a card. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardTargetEffect(), new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/odyssey/CephalidRetainer.java b/Mage.Sets/src/mage/sets/odyssey/CephalidRetainer.java index f5df51bbc0a..acdb5f8bec8 100644 --- a/Mage.Sets/src/mage/sets/odyssey/CephalidRetainer.java +++ b/Mage.Sets/src/mage/sets/odyssey/CephalidRetainer.java @@ -66,7 +66,7 @@ public class CephalidRetainer extends CardImpl { // {U}{U}: Tap target creature without flying. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{U}{U}")); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/odyssey/Chainflinger.java b/Mage.Sets/src/mage/sets/odyssey/Chainflinger.java index 031bddf157e..336ab0efc6b 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Chainflinger.java +++ b/Mage.Sets/src/mage/sets/odyssey/Chainflinger.java @@ -60,7 +60,7 @@ public class Chainflinger extends CardImpl { // {1}{R}, {tap}: Chainflinger deals 1 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1),new ManaCostsImpl("{1}{R}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer(true)); + ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); // Threshold - {2}{R}, {tap}: Chainflinger deals 2 damage to target creature or player. Activate this ability only if seven or more cards are in your graveyard. Ability thresholdAbility = new ConditionalGainActivatedAbility(Zone.BATTLEFIELD, @@ -69,7 +69,7 @@ public class Chainflinger extends CardImpl { new CardsInControllerGraveCondition(7), "Threshold - {2}{R}, {t}: {this} deals 2 damage to target creature or player. Activate this ability only if seven or more cards are in your graveyard."); thresholdAbility.addCost(new TapSourceCost()); - thresholdAbility.addTarget(new TargetCreatureOrPlayer(true)); + thresholdAbility.addTarget(new TargetCreatureOrPlayer()); this.addAbility(thresholdAbility); } diff --git a/Mage.Sets/src/mage/sets/odyssey/ChamberOfManipulation.java b/Mage.Sets/src/mage/sets/odyssey/ChamberOfManipulation.java index 3824b3ba679..bd004f1d3b4 100644 --- a/Mage.Sets/src/mage/sets/odyssey/ChamberOfManipulation.java +++ b/Mage.Sets/src/mage/sets/odyssey/ChamberOfManipulation.java @@ -72,7 +72,7 @@ public class ChamberOfManipulation extends CardImpl { // Enchanted land has "{tap}, Discard a card: Gain control of target creature until end of turn." Ability controlAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainControlTargetEffect(Duration.EndOfTurn), new TapSourceCost()); - controlAbility.addTarget(new TargetCreaturePermanent(true)); + controlAbility.addTarget(new TargetCreaturePermanent()); controlAbility.addCost(new DiscardTargetCost(new TargetCardInHand())); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(controlAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{t}, Discard a card: Gain control of target creature until end of turn.\""))); diff --git a/Mage.Sets/src/mage/sets/odyssey/CoffinPurge.java b/Mage.Sets/src/mage/sets/odyssey/CoffinPurge.java index 24ee4b08543..ab0e9a22f65 100644 --- a/Mage.Sets/src/mage/sets/odyssey/CoffinPurge.java +++ b/Mage.Sets/src/mage/sets/odyssey/CoffinPurge.java @@ -53,7 +53,7 @@ public class CoffinPurge extends CardImpl { // Exile target card from a graveyard. this.getSpellAbility().addEffect(new ExileTargetEffect()); - this.getSpellAbility().addTarget(new TargetCardInGraveyard(true)); + this.getSpellAbility().addTarget(new TargetCardInGraveyard()); // Flashback {B} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{B}"), TimingRule.INSTANT)); } diff --git a/Mage.Sets/src/mage/sets/odyssey/Dematerialize.java b/Mage.Sets/src/mage/sets/odyssey/Dematerialize.java index b96e5ece7eb..7cb3c9edb94 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Dematerialize.java +++ b/Mage.Sets/src/mage/sets/odyssey/Dematerialize.java @@ -51,7 +51,7 @@ public class Dematerialize extends CardImpl { // Return target permanent to its owner's hand. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(true)); + this.getSpellAbility().addTarget(new TargetPermanent()); // Flashback {5}{U}{U} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{5}{U}{U}"), TimingRule.SORCERY)); } diff --git a/Mage.Sets/src/mage/sets/odyssey/DevotedCaretaker.java b/Mage.Sets/src/mage/sets/odyssey/DevotedCaretaker.java index 68c11f3d81d..0ff7d4d63ff 100644 --- a/Mage.Sets/src/mage/sets/odyssey/DevotedCaretaker.java +++ b/Mage.Sets/src/mage/sets/odyssey/DevotedCaretaker.java @@ -71,7 +71,7 @@ public class DevotedCaretaker extends CardImpl { // {W}, {tap}: Target permanent you control gains protection from instant spells and from sorcery spells until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new ProtectionAbility(filter), Duration.EndOfTurn), new ManaCostsImpl("{W}")); ability.addCost(new TapSourceCost()); - Target target = new TargetControlledPermanent(true); + Target target = new TargetControlledPermanent(); ability.addTarget(target); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/odyssey/DoggedHunter.java b/Mage.Sets/src/mage/sets/odyssey/DoggedHunter.java index 81209c24eb2..bfc70a24864 100644 --- a/Mage.Sets/src/mage/sets/odyssey/DoggedHunter.java +++ b/Mage.Sets/src/mage/sets/odyssey/DoggedHunter.java @@ -64,7 +64,7 @@ public class DoggedHunter extends CardImpl { // {tap}: Destroy target creature token. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/odyssey/DruidsCall.java b/Mage.Sets/src/mage/sets/odyssey/DruidsCall.java index e73f4b55bc8..c8eab25cb05 100644 --- a/Mage.Sets/src/mage/sets/odyssey/DruidsCall.java +++ b/Mage.Sets/src/mage/sets/odyssey/DruidsCall.java @@ -62,7 +62,7 @@ public class DruidsCall extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/odyssey/EngulfingFlames.java b/Mage.Sets/src/mage/sets/odyssey/EngulfingFlames.java index 2edd101f5a7..0dde32b8a66 100644 --- a/Mage.Sets/src/mage/sets/odyssey/EngulfingFlames.java +++ b/Mage.Sets/src/mage/sets/odyssey/EngulfingFlames.java @@ -58,7 +58,7 @@ public class EngulfingFlames extends CardImpl { // Engulfing Flames deals 1 damage to target creature. It can't be regenerated this turn. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new EngulfingFlamesEffect()); this.addWatcher(new DamagedByWatcher()); // Flashback {3}{R} diff --git a/Mage.Sets/src/mage/sets/odyssey/Extract.java b/Mage.Sets/src/mage/sets/odyssey/Extract.java index 3fe3b4143a6..de89b62a74c 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Extract.java +++ b/Mage.Sets/src/mage/sets/odyssey/Extract.java @@ -56,7 +56,7 @@ public class Extract extends CardImpl { // Search target player's library for a card and exile it. Then that player shuffles his or her library. this.getSpellAbility().addEffect(new ExtractEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } diff --git a/Mage.Sets/src/mage/sets/odyssey/Firebolt.java b/Mage.Sets/src/mage/sets/odyssey/Firebolt.java index 9b618e6c309..925f9722575 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Firebolt.java +++ b/Mage.Sets/src/mage/sets/odyssey/Firebolt.java @@ -51,7 +51,7 @@ public class Firebolt extends CardImpl { // Firebolt deals 2 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); // Flashback {4}{R} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{4}{R}"), TimingRule.SORCERY)); } diff --git a/Mage.Sets/src/mage/sets/odyssey/GhastlyDemise.java b/Mage.Sets/src/mage/sets/odyssey/GhastlyDemise.java index f6702690dbb..ef3facdb45d 100644 --- a/Mage.Sets/src/mage/sets/odyssey/GhastlyDemise.java +++ b/Mage.Sets/src/mage/sets/odyssey/GhastlyDemise.java @@ -62,7 +62,7 @@ public class GhastlyDemise extends CardImpl { this.color.setBlack(true); // Destroy target nonblack creature if its toughness is less than or equal to the number of cards in your graveyard. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new GhastlyDemiseEffect(false)); } diff --git a/Mage.Sets/src/mage/sets/odyssey/HallowedHealer.java b/Mage.Sets/src/mage/sets/odyssey/HallowedHealer.java index 9d8cb597b35..b413cd393dc 100644 --- a/Mage.Sets/src/mage/sets/odyssey/HallowedHealer.java +++ b/Mage.Sets/src/mage/sets/odyssey/HallowedHealer.java @@ -61,7 +61,7 @@ public class HallowedHealer extends CardImpl { // {tap}: Prevent the next 2 damage that would be dealt to target creature or player this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn,2), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer(true)); + ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); // Threshold - {tap}: Prevent the next 4 damage that would be dealt to target creature or player this turn. Activate this ability only if seven or more cards are in your graveyard. Ability thresholdAbility = new ConditionalGainActivatedAbility(Zone.BATTLEFIELD, @@ -69,7 +69,7 @@ public class HallowedHealer extends CardImpl { new TapSourceCost(), new CardsInControllerGraveCondition(7), "Threshold - {T}: Prevent the next 4 damage that would be dealt to target creature or player this turn. Activate this ability only if seven or more cards are in your graveyard."); - thresholdAbility.addTarget(new TargetCreatureOrPlayer(true)); + thresholdAbility.addTarget(new TargetCreatureOrPlayer()); this.addAbility(thresholdAbility); } diff --git a/Mage.Sets/src/mage/sets/odyssey/ImmobilizingInk.java b/Mage.Sets/src/mage/sets/odyssey/ImmobilizingInk.java index 49a86257107..c3365bca867 100644 --- a/Mage.Sets/src/mage/sets/odyssey/ImmobilizingInk.java +++ b/Mage.Sets/src/mage/sets/odyssey/ImmobilizingInk.java @@ -64,7 +64,7 @@ public class ImmobilizingInk extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/odyssey/KamahlsDesire.java b/Mage.Sets/src/mage/sets/odyssey/KamahlsDesire.java index bbf2c96e21a..fdeb01927e5 100644 --- a/Mage.Sets/src/mage/sets/odyssey/KamahlsDesire.java +++ b/Mage.Sets/src/mage/sets/odyssey/KamahlsDesire.java @@ -61,7 +61,7 @@ public class KamahlsDesire extends CardImpl { this.color.setRed(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/odyssey/LaquatussCreativity.java b/Mage.Sets/src/mage/sets/odyssey/LaquatussCreativity.java index 0b33a091383..7db6b8c9780 100644 --- a/Mage.Sets/src/mage/sets/odyssey/LaquatussCreativity.java +++ b/Mage.Sets/src/mage/sets/odyssey/LaquatussCreativity.java @@ -53,7 +53,7 @@ public class LaquatussCreativity extends CardImpl { // Target player draws cards equal to the number of cards in his or her hand, then discards that many cards. this.getSpellAbility().addEffect(new LaquatussCreativityEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public LaquatussCreativity(final LaquatussCreativity card) { diff --git a/Mage.Sets/src/mage/sets/odyssey/MalevolentAwakening.java b/Mage.Sets/src/mage/sets/odyssey/MalevolentAwakening.java index e28865e4313..12a4803a519 100644 --- a/Mage.Sets/src/mage/sets/odyssey/MalevolentAwakening.java +++ b/Mage.Sets/src/mage/sets/odyssey/MalevolentAwakening.java @@ -63,7 +63,7 @@ public class MalevolentAwakening extends CardImpl { // {1}{B}{B}, Sacrifice a creature: Return target creature card from your graveyard to your hand. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl("{1}{B}{B}")); ability.addTarget(new TargetCardInYourGraveyard(filter)); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/odyssey/MasterApothecary.java b/Mage.Sets/src/mage/sets/odyssey/MasterApothecary.java index 21132205073..d5e958bdc48 100644 --- a/Mage.Sets/src/mage/sets/odyssey/MasterApothecary.java +++ b/Mage.Sets/src/mage/sets/odyssey/MasterApothecary.java @@ -71,8 +71,8 @@ public class MasterApothecary extends CardImpl { // Tap an untapped Cleric you control: Prevent the next 2 damage that would be dealt to target creature or player this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), - new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true, true))); - ability.addTarget(new TargetCreatureOrPlayer(true)); + new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true))); + ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/odyssey/MorbidHunger.java b/Mage.Sets/src/mage/sets/odyssey/MorbidHunger.java index c9155c6209c..a74181425bf 100644 --- a/Mage.Sets/src/mage/sets/odyssey/MorbidHunger.java +++ b/Mage.Sets/src/mage/sets/odyssey/MorbidHunger.java @@ -52,7 +52,7 @@ public class MorbidHunger extends CardImpl { // Morbid Hunger deals 3 damage to target creature or player. You gain 3 life. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); this.getSpellAbility().addEffect(new GainLifeEffect(3)); // Flashback {7}{B}{B} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{7}{B}{B}"), TimingRule.SORCERY)); diff --git a/Mage.Sets/src/mage/sets/odyssey/Mudhole.java b/Mage.Sets/src/mage/sets/odyssey/Mudhole.java index 7b30bafa100..bfd047e923a 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Mudhole.java +++ b/Mage.Sets/src/mage/sets/odyssey/Mudhole.java @@ -54,7 +54,7 @@ public class Mudhole extends CardImpl { this.color.setRed(true); // Target player exiles all land cards from his or her graveyard. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new MudholeEffect()); } diff --git a/Mage.Sets/src/mage/sets/odyssey/NantukoDisciple.java b/Mage.Sets/src/mage/sets/odyssey/NantukoDisciple.java index 68b6ba24734..10613b75b50 100644 --- a/Mage.Sets/src/mage/sets/odyssey/NantukoDisciple.java +++ b/Mage.Sets/src/mage/sets/odyssey/NantukoDisciple.java @@ -61,7 +61,7 @@ public class NantukoDisciple extends CardImpl { // {G}, {tap}: Target creature gets +2/+2 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("{G}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/odyssey/NantukoMentor.java b/Mage.Sets/src/mage/sets/odyssey/NantukoMentor.java index 2ead6bac420..e42177a3c6e 100644 --- a/Mage.Sets/src/mage/sets/odyssey/NantukoMentor.java +++ b/Mage.Sets/src/mage/sets/odyssey/NantukoMentor.java @@ -63,7 +63,7 @@ public class NantukoMentor extends CardImpl { // {2}{G}, {tap}: Target creature gets +X/+X until end of turn, where X is that creature's power. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new NantukoMentorBoostTargetEffect(), new ManaCostsImpl("{2}{G}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/odyssey/NeedForSpeed.java b/Mage.Sets/src/mage/sets/odyssey/NeedForSpeed.java index c7c07d7e841..92d072554b4 100644 --- a/Mage.Sets/src/mage/sets/odyssey/NeedForSpeed.java +++ b/Mage.Sets/src/mage/sets/odyssey/NeedForSpeed.java @@ -61,7 +61,7 @@ public class NeedForSpeed extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledPermanent(new FilterControlledPermanent("land")))); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/odyssey/NomadDecoy.java b/Mage.Sets/src/mage/sets/odyssey/NomadDecoy.java index 8d8c285b962..44c481744c8 100644 --- a/Mage.Sets/src/mage/sets/odyssey/NomadDecoy.java +++ b/Mage.Sets/src/mage/sets/odyssey/NomadDecoy.java @@ -62,13 +62,13 @@ public class NomadDecoy extends CardImpl { // {W}, {tap}: Tap target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{W}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); this.addAbility(ability); // Threshold - {W}{W}, {tap}: Tap two target creatures. Activate this ability only if seven or more cards are in your graveyard. Ability thresholdAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{W}{W}")); - thresholdAbility.addTarget(new TargetCreaturePermanent(2, true)); + thresholdAbility.addTarget(new TargetCreaturePermanent(2)); thresholdAbility.addCost(new TapSourceCost()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new GainAbilitySourceEffect(thresholdAbility), new CardsInControllerGraveCondition(7), diff --git a/Mage.Sets/src/mage/sets/odyssey/PardicMiner.java b/Mage.Sets/src/mage/sets/odyssey/PardicMiner.java index bc1aa34a678..d168232283e 100644 --- a/Mage.Sets/src/mage/sets/odyssey/PardicMiner.java +++ b/Mage.Sets/src/mage/sets/odyssey/PardicMiner.java @@ -61,7 +61,7 @@ public class PardicMiner extends CardImpl { // Sacrifice Pardic Miner: Target player can't play lands this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PardicMinerEffect(), new SacrificeSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/odyssey/PatriarchsDesire.java b/Mage.Sets/src/mage/sets/odyssey/PatriarchsDesire.java index 760b6018476..f7627229771 100644 --- a/Mage.Sets/src/mage/sets/odyssey/PatriarchsDesire.java +++ b/Mage.Sets/src/mage/sets/odyssey/PatriarchsDesire.java @@ -56,7 +56,7 @@ public class PatriarchsDesire extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/odyssey/PrimalFrenzy.java b/Mage.Sets/src/mage/sets/odyssey/PrimalFrenzy.java index f64ffe05722..6422cac131f 100644 --- a/Mage.Sets/src/mage/sets/odyssey/PrimalFrenzy.java +++ b/Mage.Sets/src/mage/sets/odyssey/PrimalFrenzy.java @@ -57,7 +57,7 @@ public class PrimalFrenzy extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/odyssey/PsionicGift.java b/Mage.Sets/src/mage/sets/odyssey/PsionicGift.java index 80e53cc91ac..96b70e0ef67 100644 --- a/Mage.Sets/src/mage/sets/odyssey/PsionicGift.java +++ b/Mage.Sets/src/mage/sets/odyssey/PsionicGift.java @@ -61,7 +61,7 @@ public class PsionicGift extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); @@ -69,7 +69,7 @@ public class PsionicGift extends CardImpl { // Enchanted creature has "{tap}: This creature deals 1 damage to target creature or player." Ability psiAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - psiAbility.addTarget(new TargetCreatureOrPlayer(true)); + psiAbility.addTarget(new TargetCreatureOrPlayer()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(psiAbility, AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/sets/odyssey/RayOfDistortion.java b/Mage.Sets/src/mage/sets/odyssey/RayOfDistortion.java index 0dad6b47b27..e01a5e788ca 100644 --- a/Mage.Sets/src/mage/sets/odyssey/RayOfDistortion.java +++ b/Mage.Sets/src/mage/sets/odyssey/RayOfDistortion.java @@ -60,7 +60,7 @@ public class RayOfDistortion extends CardImpl { // Destroy target artifact or enchantment. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); // Flashback {4}{W}{W} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{4}{W}{W}"), TimingRule.INSTANT)); } diff --git a/Mage.Sets/src/mage/sets/odyssey/Refresh.java b/Mage.Sets/src/mage/sets/odyssey/Refresh.java index a5a12a98508..300bc11b9dc 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Refresh.java +++ b/Mage.Sets/src/mage/sets/odyssey/Refresh.java @@ -49,7 +49,7 @@ public class Refresh extends CardImpl { // Regenerate target creature. this.getSpellAbility().addEffect(new RegenerateTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/odyssey/Repel.java b/Mage.Sets/src/mage/sets/odyssey/Repel.java index bd454c1ea9f..066e380be08 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Repel.java +++ b/Mage.Sets/src/mage/sets/odyssey/Repel.java @@ -47,7 +47,7 @@ public class Repel extends CardImpl { this.color.setBlue(true); // Put target creature on top of its owner's library. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true)); } diff --git a/Mage.Sets/src/mage/sets/odyssey/RepentantVampire.java b/Mage.Sets/src/mage/sets/odyssey/RepentantVampire.java index 8c2e203982c..29516ea002e 100644 --- a/Mage.Sets/src/mage/sets/odyssey/RepentantVampire.java +++ b/Mage.Sets/src/mage/sets/odyssey/RepentantVampire.java @@ -83,7 +83,7 @@ public class RepentantVampire extends CardImpl { "Threshold - As long as seven or more cards are in your graveyard, {this} is white", false)); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); - gainedAbility.addTarget(new TargetCreaturePermanent(filter, true)); + gainedAbility.addTarget(new TargetCreaturePermanent(filter)); ability.addEffect(new ConditionalContinousEffect( new GainAbilitySourceEffect(gainedAbility, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), diff --git a/Mage.Sets/src/mage/sets/odyssey/SadisticHypnotist.java b/Mage.Sets/src/mage/sets/odyssey/SadisticHypnotist.java index 11738d9c8b9..2df44d12ce8 100644 --- a/Mage.Sets/src/mage/sets/odyssey/SadisticHypnotist.java +++ b/Mage.Sets/src/mage/sets/odyssey/SadisticHypnotist.java @@ -62,7 +62,7 @@ public class SadisticHypnotist extends CardImpl { TargetControlledPermanent target = new TargetControlledCreaturePermanent(1,1, new FilterControlledCreaturePermanent("a creature"), true); target.setRequired(true); Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(2), new SacrificeTargetCost(target)); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/odyssey/Shelter.java b/Mage.Sets/src/mage/sets/odyssey/Shelter.java index f50168dc4df..46569d4855e 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Shelter.java +++ b/Mage.Sets/src/mage/sets/odyssey/Shelter.java @@ -50,7 +50,7 @@ public class Shelter extends CardImpl { this.color.setWhite(true); // Target creature you control gains protection from the color of your choice until end of turn. - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); this.getSpellAbility().addChoice(new ChoiceColor()); this.getSpellAbility().addEffect(new GainProtectionFromColorTargetEffect(Duration.EndOfTurn)); // diff --git a/Mage.Sets/src/mage/sets/odyssey/SkullFracture.java b/Mage.Sets/src/mage/sets/odyssey/SkullFracture.java index 97720c67a2f..9365eb65cd2 100644 --- a/Mage.Sets/src/mage/sets/odyssey/SkullFracture.java +++ b/Mage.Sets/src/mage/sets/odyssey/SkullFracture.java @@ -52,7 +52,7 @@ public class SkullFracture extends CardImpl { // Target player discards a card. this.getSpellAbility().addEffect(new DiscardTargetEffect(1)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); // Flashback {3}{B} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{3}{B}"), TimingRule.SORCERY)); } diff --git a/Mage.Sets/src/mage/sets/odyssey/SparkMage.java b/Mage.Sets/src/mage/sets/odyssey/SparkMage.java index e3ecd18b2b8..d55aab04dd3 100644 --- a/Mage.Sets/src/mage/sets/odyssey/SparkMage.java +++ b/Mage.Sets/src/mage/sets/odyssey/SparkMage.java @@ -77,7 +77,7 @@ class SparkMageTriggeredAbility extends TriggeredAbilityImpl { public SparkMageTriggeredAbility(){ super(Zone.BATTLEFIELD, new DamageTargetEffect(1)); - this.addTarget(new TargetCreaturePermanent(true)); + this.addTarget(new TargetCreaturePermanent()); } public SparkMageTriggeredAbility(final SparkMageTriggeredAbility ability) { @@ -99,7 +99,7 @@ class SparkMageTriggeredAbility extends TriggeredAbilityImpl { FilterCreaturePermanent filter = new FilterCreaturePermanent("creature " + opponent.getName() + " controls"); filter.add(new ControllerIdPredicate(opponent.getId())); this.getTargets().clear(); - this.getTargets().add(new TargetCreaturePermanent(filter, true)); + this.getTargets().add(new TargetCreaturePermanent(filter)); return true; } } diff --git a/Mage.Sets/src/mage/sets/odyssey/Spiritualize.java b/Mage.Sets/src/mage/sets/odyssey/Spiritualize.java index 13635608a29..feca1c541e0 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Spiritualize.java +++ b/Mage.Sets/src/mage/sets/odyssey/Spiritualize.java @@ -59,7 +59,7 @@ public class Spiritualize extends CardImpl { // Until end of turn, whenever target creature deals damage, you gain that much life. this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new SpiritualizeTriggeredAbility())); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/odyssey/ThermalBlast.java b/Mage.Sets/src/mage/sets/odyssey/ThermalBlast.java index 5ceafe8677e..cf04e6fdb1b 100644 --- a/Mage.Sets/src/mage/sets/odyssey/ThermalBlast.java +++ b/Mage.Sets/src/mage/sets/odyssey/ThermalBlast.java @@ -55,7 +55,7 @@ public class ThermalBlast extends CardImpl { new DamageTargetEffect(3), new CardsInControllerGraveCondition(7), "{this} deals 3 damage to target creature.

Threshold - {this} deals 5 damage to that creature instead if seven or more cards are in your graveyard."); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/sets/odyssey/Tombfire.java b/Mage.Sets/src/mage/sets/odyssey/Tombfire.java index 3970fb5c100..bb5c7df9c65 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Tombfire.java +++ b/Mage.Sets/src/mage/sets/odyssey/Tombfire.java @@ -55,7 +55,7 @@ public class Tombfire extends CardImpl { this.color.setBlack(true); // Target player exiles all cards with flashback from his or her graveyard. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new TombfireEffect()); } diff --git a/Mage.Sets/src/mage/sets/odyssey/TouchOfInvisibility.java b/Mage.Sets/src/mage/sets/odyssey/TouchOfInvisibility.java index d5659dfd93f..c674718d632 100644 --- a/Mage.Sets/src/mage/sets/odyssey/TouchOfInvisibility.java +++ b/Mage.Sets/src/mage/sets/odyssey/TouchOfInvisibility.java @@ -50,7 +50,7 @@ public class TouchOfInvisibility extends CardImpl { // Target creature is unblockable this turn. this.getSpellAbility().addEffect(new CantBeBlockedTargetEffect(Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/sets/odyssey/Whipkeeper.java b/Mage.Sets/src/mage/sets/odyssey/Whipkeeper.java index 125af47d1b0..9d49fdff6be 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Whipkeeper.java +++ b/Mage.Sets/src/mage/sets/odyssey/Whipkeeper.java @@ -59,7 +59,7 @@ public class Whipkeeper extends CardImpl { // {tap}: Whipkeeper deals damage to target creature equal to the damage already dealt to it this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WhipkeeperEffect(), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/odyssey/ZombieAssassin.java b/Mage.Sets/src/mage/sets/odyssey/ZombieAssassin.java index e20ed54ce9f..749ca423bc5 100644 --- a/Mage.Sets/src/mage/sets/odyssey/ZombieAssassin.java +++ b/Mage.Sets/src/mage/sets/odyssey/ZombieAssassin.java @@ -73,7 +73,7 @@ public class ZombieAssassin extends CardImpl { // {tap}, Exile two cards from your graveyard and Zombie Assassin: Destroy target nonblack creature. It can't be regenerated. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(true), new TapSourceCost()); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(2,2,new FilterCard("cards from your graveyard")))); diff --git a/Mage.Sets/src/mage/sets/onslaught/AstralSlide.java b/Mage.Sets/src/mage/sets/onslaught/AstralSlide.java index 28164a2a812..572bbee0cd9 100644 --- a/Mage.Sets/src/mage/sets/onslaught/AstralSlide.java +++ b/Mage.Sets/src/mage/sets/onslaught/AstralSlide.java @@ -78,7 +78,7 @@ class AstralSlideTriggeredAbility extends TriggeredAbilityImpl { public AstralSlideTriggeredAbility() { super(Zone.BATTLEFIELD, new AstralSlideEffect(), true); - this.addTarget(new TargetCreaturePermanent(true)); + this.addTarget(new TargetCreaturePermanent()); } public AstralSlideTriggeredAbility(final AstralSlideTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/onslaught/Blackmail.java b/Mage.Sets/src/mage/sets/onslaught/Blackmail.java index bb49dbd6057..250cc21788b 100644 --- a/Mage.Sets/src/mage/sets/onslaught/Blackmail.java +++ b/Mage.Sets/src/mage/sets/onslaught/Blackmail.java @@ -49,7 +49,7 @@ public class Blackmail extends CardImpl { // Target player reveals three cards from his or her hand and you choose one of them. That player discards that card. this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(TargetController.ANY, 3)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public Blackmail(final Blackmail card) { diff --git a/Mage.Sets/src/mage/sets/onslaught/CatapultMaster.java b/Mage.Sets/src/mage/sets/onslaught/CatapultMaster.java index 8cb0804c969..ecbf6db3336 100644 --- a/Mage.Sets/src/mage/sets/onslaught/CatapultMaster.java +++ b/Mage.Sets/src/mage/sets/onslaught/CatapultMaster.java @@ -69,7 +69,7 @@ public class CatapultMaster extends CardImpl { // Tap five untapped Soldiers you control: Exile target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new TapTargetCost(new TargetControlledPermanent(5,5,filter,false))); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/onslaught/CruelRevival.java b/Mage.Sets/src/mage/sets/onslaught/CruelRevival.java index bb600f7bd64..28b90faee27 100644 --- a/Mage.Sets/src/mage/sets/onslaught/CruelRevival.java +++ b/Mage.Sets/src/mage/sets/onslaught/CruelRevival.java @@ -70,7 +70,7 @@ public class CruelRevival extends CardImpl { // Destroy target non-Zombie creature. It can't be regenerated. Return up to one target Zombie card from your graveyard to your hand. this.getSpellAbility().addEffect(new CruelRevivalEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(0, 1, filter2)); } diff --git a/Mage.Sets/src/mage/sets/onslaught/DirgeOfDread.java b/Mage.Sets/src/mage/sets/onslaught/DirgeOfDread.java index 82252b7806b..a762b4c7808 100644 --- a/Mage.Sets/src/mage/sets/onslaught/DirgeOfDread.java +++ b/Mage.Sets/src/mage/sets/onslaught/DirgeOfDread.java @@ -60,7 +60,7 @@ public class DirgeOfDread extends CardImpl { this.addAbility(new CyclingAbility(new ManaCostsImpl("{1}{B}"))); // When you cycle Dirge of Dread, you may have target creature gain fear until end of turn. Ability ability = new CycleTriggeredAbility(new GainAbilityTargetEffect(FearAbility.getInstance(), Duration.EndOfTurn), true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/onslaught/GoblinBurrows.java b/Mage.Sets/src/mage/sets/onslaught/GoblinBurrows.java index bc2c590f37a..5618741f27a 100644 --- a/Mage.Sets/src/mage/sets/onslaught/GoblinBurrows.java +++ b/Mage.Sets/src/mage/sets/onslaught/GoblinBurrows.java @@ -64,7 +64,7 @@ public class GoblinBurrows extends CardImpl { // {1}{R}, {tap}: Target Goblin creature gets +2/+0 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2,0, Duration.EndOfTurn), new ManaCostsImpl("{1}{R}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/onslaught/GoblinSledder.java b/Mage.Sets/src/mage/sets/onslaught/GoblinSledder.java index 39e85d03591..a7f2f6ceb27 100644 --- a/Mage.Sets/src/mage/sets/onslaught/GoblinSledder.java +++ b/Mage.Sets/src/mage/sets/onslaught/GoblinSledder.java @@ -67,7 +67,7 @@ public class GoblinSledder extends CardImpl { // Sacrifice a Goblin: Target creature gets +1/+1 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1,1,Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1, filter, true))); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/onslaught/RavenousBaloth.java b/Mage.Sets/src/mage/sets/onslaught/RavenousBaloth.java index 7bdd44ae207..dbc6f645e7e 100644 --- a/Mage.Sets/src/mage/sets/onslaught/RavenousBaloth.java +++ b/Mage.Sets/src/mage/sets/onslaught/RavenousBaloth.java @@ -62,7 +62,7 @@ public class RavenousBaloth extends CardImpl { // Sacrifice a Beast: You gain 4 life. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(4), - new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1,filter,true,true)))); + new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1,filter,true)))); } public RavenousBaloth(final RavenousBaloth card) { diff --git a/Mage.Sets/src/mage/sets/onslaught/Sparksmith.java b/Mage.Sets/src/mage/sets/onslaught/Sparksmith.java index 02304d7a1c6..8f69f90e6bb 100644 --- a/Mage.Sets/src/mage/sets/onslaught/Sparksmith.java +++ b/Mage.Sets/src/mage/sets/onslaught/Sparksmith.java @@ -66,7 +66,7 @@ public class Sparksmith extends CardImpl { // {tap}: Sparksmith deals X damage to target creature and X damage to you, where X is the number of Goblins on the battlefield. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); ability.addEffect(new DamageControllerEffect(new PermanentsOnBattlefieldCount(filter))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/onslaught/SupremeInquisitor.java b/Mage.Sets/src/mage/sets/onslaught/SupremeInquisitor.java index a23006ea779..994cd3dba23 100644 --- a/Mage.Sets/src/mage/sets/onslaught/SupremeInquisitor.java +++ b/Mage.Sets/src/mage/sets/onslaught/SupremeInquisitor.java @@ -79,7 +79,7 @@ public class SupremeInquisitor extends CardImpl { // Tap five untapped Wizards you control: Search target player's library for up to five cards and exile them. Then that player shuffles his or her library. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SupremeInquisitorEffect(), new TapTargetCost(new TargetControlledPermanent(5, 5, filter, true))); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/onslaught/Swat.java b/Mage.Sets/src/mage/sets/onslaught/Swat.java index 636335f8e3f..6725e0879c4 100644 --- a/Mage.Sets/src/mage/sets/onslaught/Swat.java +++ b/Mage.Sets/src/mage/sets/onslaught/Swat.java @@ -59,7 +59,7 @@ public class Swat extends CardImpl { // Destroy target creature with power 2 or less. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); // Cycling {2} this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); } diff --git a/Mage.Sets/src/mage/sets/onslaught/WirewoodLodge.java b/Mage.Sets/src/mage/sets/onslaught/WirewoodLodge.java index d0167bd8203..be1dc8700a9 100644 --- a/Mage.Sets/src/mage/sets/onslaught/WirewoodLodge.java +++ b/Mage.Sets/src/mage/sets/onslaught/WirewoodLodge.java @@ -63,7 +63,7 @@ public class WirewoodLodge extends CardImpl { // {G}, {T}: Untap target Elf. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl("{G}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/onslaught/WordsOfWind.java b/Mage.Sets/src/mage/sets/onslaught/WordsOfWind.java index 9075ef36ce2..f4ed9fc3d07 100644 --- a/Mage.Sets/src/mage/sets/onslaught/WordsOfWind.java +++ b/Mage.Sets/src/mage/sets/onslaught/WordsOfWind.java @@ -102,7 +102,7 @@ class WordsOfWindEffect extends ReplacementEffectImpl { for (UUID playerId : game.getPlayerList()) { Player player = game.getPlayer(playerId); if (player != null) { - TargetControlledPermanent target = new TargetControlledPermanent(true); + TargetControlledPermanent target = new TargetControlledPermanent(); List liste = game.getBattlefield().getActivePermanents(new FilterControlledPermanent(), playerId, game); if(!liste.isEmpty()){ while (!player.choose(Outcome.ReturnToHand, target, source.getSourceId(), game)){ diff --git a/Mage.Sets/src/mage/sets/planarchaos/BigGameHunter.java b/Mage.Sets/src/mage/sets/planarchaos/BigGameHunter.java index b714e1bb60f..1da708fcfe3 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/BigGameHunter.java +++ b/Mage.Sets/src/mage/sets/planarchaos/BigGameHunter.java @@ -67,7 +67,7 @@ public class BigGameHunter extends CardImpl { // When Big Game Hunter enters the battlefield, destroy target creature with power 4 or greater. It can't be regenerated. Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(true)); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); // Madness {B} this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{B}"))); diff --git a/Mage.Sets/src/mage/sets/planarchaos/Blightspeaker.java b/Mage.Sets/src/mage/sets/planarchaos/Blightspeaker.java index 399e491889e..b1bb83314f2 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/Blightspeaker.java +++ b/Mage.Sets/src/mage/sets/planarchaos/Blightspeaker.java @@ -71,7 +71,7 @@ public class Blightspeaker extends CardImpl { // {tap}: Target player loses 1 life. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); // {4}, {tap}: Search your library for a Rebel permanent card with converted mana cost 3 or less and put it onto the battlefield. Then shuffle your library. SimpleActivatedAbility ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/sets/planarchaos/BruteForce.java b/Mage.Sets/src/mage/sets/planarchaos/BruteForce.java index 4dc5fd61a4b..d27ce791a83 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/BruteForce.java +++ b/Mage.Sets/src/mage/sets/planarchaos/BruteForce.java @@ -49,7 +49,7 @@ public class BruteForce extends CardImpl { // Target creature gets +3/+3 until end of turn. this.getSpellAbility().getEffects().add(new BoostTargetEffect(3,3, Duration.EndOfTurn)); - this.getSpellAbility().getTargets().add(new TargetCreaturePermanent(true)); + this.getSpellAbility().getTargets().add(new TargetCreaturePermanent()); } public BruteForce(final BruteForce card) { diff --git a/Mage.Sets/src/mage/sets/planarchaos/DawnCharm.java b/Mage.Sets/src/mage/sets/planarchaos/DawnCharm.java index 5558c23cda5..41c78014cde 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/DawnCharm.java +++ b/Mage.Sets/src/mage/sets/planarchaos/DawnCharm.java @@ -68,7 +68,7 @@ public class DawnCharm extends CardImpl { Mode mode = new Mode(); mode.getEffects().add(new RegenerateTargetEffect()); - mode.getTargets().add(new TargetCreaturePermanent(true)); + mode.getTargets().add(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); mode = new Mode(); diff --git a/Mage.Sets/src/mage/sets/planarchaos/ErraticMutation.java b/Mage.Sets/src/mage/sets/planarchaos/ErraticMutation.java index 3f9465446e5..501264437fe 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/ErraticMutation.java +++ b/Mage.Sets/src/mage/sets/planarchaos/ErraticMutation.java @@ -60,7 +60,7 @@ public class ErraticMutation extends CardImpl { this.color.setBlue(true); // Choose target creature. Reveal cards from the top of your library until you reveal a nonland card. That creature gets +X/-X until end of turn, where X is that card's converted mana cost. Put all cards revealed this way on the bottom of your library in any order. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new ErraticMutationEffect()); } diff --git a/Mage.Sets/src/mage/sets/planarchaos/FatalFrenzy.java b/Mage.Sets/src/mage/sets/planarchaos/FatalFrenzy.java index 77d341d2d7b..752afb725ba 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/FatalFrenzy.java +++ b/Mage.Sets/src/mage/sets/planarchaos/FatalFrenzy.java @@ -63,7 +63,7 @@ public class FatalFrenzy extends CardImpl { this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addEffect(new BoostTargetEffect(new TargetPermanentPowerCount(), new StaticValue(0), Duration.EndOfTurn, true)); this.getSpellAbility().addEffect(new FatalFrenzyEffect()); - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/planarchaos/FuryCharm.java b/Mage.Sets/src/mage/sets/planarchaos/FuryCharm.java index 0957125000f..244d1392284 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/FuryCharm.java +++ b/Mage.Sets/src/mage/sets/planarchaos/FuryCharm.java @@ -85,7 +85,7 @@ public class FuryCharm extends CardImpl { Mode mode = new Mode(); mode.getEffects().add(new BoostTargetEffect(1,1, Duration.EndOfTurn)); mode.getEffects().add(new GainAbilityTargetEffect(TrampleAbility.getInstance(),Duration.EndOfTurn)); - mode.getTargets().add(new TargetCreaturePermanent(true)); + mode.getTargets().add(new TargetCreaturePermanent()); this.getSpellAbility().getModes().addMode(mode); // or remove two time counters from target permanent or suspended card. mode = new Mode(); @@ -108,7 +108,7 @@ public class FuryCharm extends CardImpl { if (effect instanceof FuryCharmRemoveCounterEffect) { Choice targetChoice = ability.getChoices().get(0); if (targetChoice.getChoice().equals("Permanent")) { - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); } if (targetChoice.getChoice().equals("Suspended Card")) { Target target = new TargetCardInExile(1,1, filter, null, true); diff --git a/Mage.Sets/src/mage/sets/planarchaos/HammerheimDeadeye.java b/Mage.Sets/src/mage/sets/planarchaos/HammerheimDeadeye.java index f5d006b8470..34ba3147c28 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/HammerheimDeadeye.java +++ b/Mage.Sets/src/mage/sets/planarchaos/HammerheimDeadeye.java @@ -67,7 +67,7 @@ public class HammerheimDeadeye extends CardImpl { this.addAbility(new EchoAbility("{5}{R}")); // When Hammerheim Deadeye enters the battlefield, destroy target creature with flying. Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect()); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/planarchaos/KeenSense.java b/Mage.Sets/src/mage/sets/planarchaos/KeenSense.java index 45982d4f36e..6ef7cfe7e29 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/KeenSense.java +++ b/Mage.Sets/src/mage/sets/planarchaos/KeenSense.java @@ -55,7 +55,7 @@ public class KeenSense extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.DrawCard)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/planarchaos/KeldonMarauders.java b/Mage.Sets/src/mage/sets/planarchaos/KeldonMarauders.java index 762ea7518a4..73341046a4b 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/KeldonMarauders.java +++ b/Mage.Sets/src/mage/sets/planarchaos/KeldonMarauders.java @@ -65,10 +65,10 @@ public class KeldonMarauders extends CardImpl { this.addAbility(new VanishingSacrificeAbility()); // When Keldon Marauders enters the battlefield or leaves the battlefield, it deals 1 damage to target player. Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(1), false); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); Ability ability2 = new LeavesBattlefieldTriggeredAbility(new DamageTargetEffect(1), false); - ability2.addTarget(new TargetPlayer(true)); + ability2.addTarget(new TargetPlayer()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/sets/planarchaos/NecroticSliver.java b/Mage.Sets/src/mage/sets/planarchaos/NecroticSliver.java index 458407a26b2..42543a5d71c 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/NecroticSliver.java +++ b/Mage.Sets/src/mage/sets/planarchaos/NecroticSliver.java @@ -70,7 +70,7 @@ public class NecroticSliver extends CardImpl { // All Slivers have "{3}, Sacrifice this permanent: Destroy target permanent." Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); ability.addCost(new GenericManaCost(3)); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, filter, diff --git a/Mage.Sets/src/mage/sets/planarchaos/PorphyryNodes.java b/Mage.Sets/src/mage/sets/planarchaos/PorphyryNodes.java index e628de99dbb..2916df61382 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/PorphyryNodes.java +++ b/Mage.Sets/src/mage/sets/planarchaos/PorphyryNodes.java @@ -119,7 +119,7 @@ class PorphyryNodesEffect extends OneShotEffect { if (multipleExist) { FilterCreaturePermanent filter = new FilterCreaturePermanent("one of the creatures with the least power"); filter.add(new PowerPredicate(Filter.ComparisonType.Equal, leastPower)); - Target target = new TargetPermanent(filter, true); + Target target = new TargetPermanent(filter); target.setNotTarget(true); if (target.canChoose(source.getSourceId(), source.getControllerId(), game)) { if (controller.choose(outcome, target, source.getSourceId(), game)) { diff --git a/Mage.Sets/src/mage/sets/planarchaos/PoulticeSliver.java b/Mage.Sets/src/mage/sets/planarchaos/PoulticeSliver.java index f09d0f987e8..f7020e4f0be 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/PoulticeSliver.java +++ b/Mage.Sets/src/mage/sets/planarchaos/PoulticeSliver.java @@ -70,7 +70,7 @@ public class PoulticeSliver extends CardImpl { // All Slivers have "{2}, {tap}: Regenerate target Sliver." Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ability, diff --git a/Mage.Sets/src/mage/sets/planarchaos/RathiTrapper.java b/Mage.Sets/src/mage/sets/planarchaos/RathiTrapper.java index 38340d8e461..9abe8985935 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/RathiTrapper.java +++ b/Mage.Sets/src/mage/sets/planarchaos/RathiTrapper.java @@ -60,7 +60,7 @@ public class RathiTrapper extends CardImpl { // {B}, {tap}: Tap target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{B}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planarchaos/Saltblast.java b/Mage.Sets/src/mage/sets/planarchaos/Saltblast.java index 24c16d6d570..638e7731864 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/Saltblast.java +++ b/Mage.Sets/src/mage/sets/planarchaos/Saltblast.java @@ -55,7 +55,7 @@ public class Saltblast extends CardImpl { // Destroy target nonwhite permanent. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); } public Saltblast(final Saltblast card) { diff --git a/Mage.Sets/src/mage/sets/planarchaos/SaltfieldRecluse.java b/Mage.Sets/src/mage/sets/planarchaos/SaltfieldRecluse.java index f0aaf3439dc..ca2b2220663 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/SaltfieldRecluse.java +++ b/Mage.Sets/src/mage/sets/planarchaos/SaltfieldRecluse.java @@ -59,7 +59,7 @@ public class SaltfieldRecluse extends CardImpl { // {tap}: Target creature gets -2/-0 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2,0, Duration.EndOfTurn), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planarchaos/SealOfPrimordium.java b/Mage.Sets/src/mage/sets/planarchaos/SealOfPrimordium.java index 8e66df5fffe..4c7b61b48ed 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/SealOfPrimordium.java +++ b/Mage.Sets/src/mage/sets/planarchaos/SealOfPrimordium.java @@ -64,7 +64,7 @@ public class SealOfPrimordium extends CardImpl { // Sacrifice Seal of Primordium: Destroy target artifact or enchantment. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planarchaos/Stingscourger.java b/Mage.Sets/src/mage/sets/planarchaos/Stingscourger.java index d22640ff4c7..b9638a89730 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/Stingscourger.java +++ b/Mage.Sets/src/mage/sets/planarchaos/Stingscourger.java @@ -67,7 +67,7 @@ public class Stingscourger extends CardImpl { this.addAbility(new EchoAbility("{3}{R}")); // When Stingscourger enters the battlefield, return target creature an opponent controls to its owner's hand. Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect()); - TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true); + TargetCreaturePermanent target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/planarchaos/Sunlance.java b/Mage.Sets/src/mage/sets/planarchaos/Sunlance.java index 38a06f694d0..f2b0e416bb6 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/Sunlance.java +++ b/Mage.Sets/src/mage/sets/planarchaos/Sunlance.java @@ -57,7 +57,7 @@ public class Sunlance extends CardImpl { // Sunlance deals 3 damage to target nonwhite creature. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); } public Sunlance(final Sunlance card) { diff --git a/Mage.Sets/src/mage/sets/planechase/BogardanRager.java b/Mage.Sets/src/mage/sets/planechase/BogardanRager.java index 240073f02c6..88756a008af 100644 --- a/Mage.Sets/src/mage/sets/planechase/BogardanRager.java +++ b/Mage.Sets/src/mage/sets/planechase/BogardanRager.java @@ -55,7 +55,7 @@ public class BogardanRager extends CardImpl { this.toughness = new MageInt(4); this.addAbility(FlashAbility.getInstance()); Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(4, 0, Duration.EndOfTurn), false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planechase/Briarhorn.java b/Mage.Sets/src/mage/sets/planechase/Briarhorn.java index b8f47c64ad5..b3a0fe13966 100644 --- a/Mage.Sets/src/mage/sets/planechase/Briarhorn.java +++ b/Mage.Sets/src/mage/sets/planechase/Briarhorn.java @@ -59,7 +59,7 @@ public class Briarhorn extends CardImpl { this.addAbility(FlashAbility.getInstance()); // When Briarhorn enters the battlefield, target creature gets +3/+3 until end of turn. Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(3,3, Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Evoke {1}{G} this.addAbility(new EvokeAbility(this, "{1}{G}")); diff --git a/Mage.Sets/src/mage/sets/planechase/CranialPlating.java b/Mage.Sets/src/mage/sets/planechase/CranialPlating.java index c9d43a46d03..ad30b0f295c 100644 --- a/Mage.Sets/src/mage/sets/planechase/CranialPlating.java +++ b/Mage.Sets/src/mage/sets/planechase/CranialPlating.java @@ -68,7 +68,7 @@ public class CranialPlating extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(new PermanentsOnBattlefieldCount(filterCounted), new StaticValue(0)))); // {B}{B}: Attach Cranial Plating to target creature you control. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttachEffect(Outcome.BoostCreature, "Attach {this} to target creature you control"), new ManaCostsImpl("{B}{B}")); - ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); // Equip {1} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(1))); diff --git a/Mage.Sets/src/mage/sets/planechase/DoorToNothingness.java b/Mage.Sets/src/mage/sets/planechase/DoorToNothingness.java index 61998afe0c1..2b2a7d0bedf 100644 --- a/Mage.Sets/src/mage/sets/planechase/DoorToNothingness.java +++ b/Mage.Sets/src/mage/sets/planechase/DoorToNothingness.java @@ -62,7 +62,7 @@ public class DoorToNothingness extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DoorToNothingnessEffect(), new ManaCostsImpl("{W}{W}{U}{U}{B}{B}{R}{R}{G}{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planechase/EtchedOracle.java b/Mage.Sets/src/mage/sets/planechase/EtchedOracle.java index c5a20a43deb..3901493fee7 100644 --- a/Mage.Sets/src/mage/sets/planechase/EtchedOracle.java +++ b/Mage.Sets/src/mage/sets/planechase/EtchedOracle.java @@ -61,7 +61,7 @@ public class EtchedOracle extends CardImpl { // {1}, Remove four +1/+1 counters from Etched Oracle: Target player draws three cards. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardTargetEffect(3), new ManaCostsImpl("{1}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(4))); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planechase/FesteringGoblin.java b/Mage.Sets/src/mage/sets/planechase/FesteringGoblin.java index 657108df058..ad152de87b2 100644 --- a/Mage.Sets/src/mage/sets/planechase/FesteringGoblin.java +++ b/Mage.Sets/src/mage/sets/planechase/FesteringGoblin.java @@ -54,7 +54,7 @@ public class FesteringGoblin extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new DiesTriggeredAbility(new BoostTargetEffect(-1, -1, Duration.EndOfTurn), false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planechase/FiresOfYavimaya.java b/Mage.Sets/src/mage/sets/planechase/FiresOfYavimaya.java index f3cebb4e287..e8e3c369b05 100644 --- a/Mage.Sets/src/mage/sets/planechase/FiresOfYavimaya.java +++ b/Mage.Sets/src/mage/sets/planechase/FiresOfYavimaya.java @@ -61,7 +61,7 @@ public class FiresOfYavimaya extends CardImpl { this.color.setGreen(true); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planechase/FlametongueKavu.java b/Mage.Sets/src/mage/sets/planechase/FlametongueKavu.java index 049222a032a..a0f7023a993 100644 --- a/Mage.Sets/src/mage/sets/planechase/FlametongueKavu.java +++ b/Mage.Sets/src/mage/sets/planechase/FlametongueKavu.java @@ -51,7 +51,7 @@ public class FlametongueKavu extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(2); Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(4), false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planechase/KeldonChampion.java b/Mage.Sets/src/mage/sets/planechase/KeldonChampion.java index 2f623d7a904..bda5ef88824 100644 --- a/Mage.Sets/src/mage/sets/planechase/KeldonChampion.java +++ b/Mage.Sets/src/mage/sets/planechase/KeldonChampion.java @@ -60,7 +60,7 @@ public class KeldonChampion extends CardImpl { this.addAbility(new EchoAbility("{2}{R}{R}")); // When Keldon Champion enters the battlefield, it deals 3 damage to target player. Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(3), false); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planechase/PhyrexianGhoul.java b/Mage.Sets/src/mage/sets/planechase/PhyrexianGhoul.java index b0a76cc8532..e3699a9dcfa 100644 --- a/Mage.Sets/src/mage/sets/planechase/PhyrexianGhoul.java +++ b/Mage.Sets/src/mage/sets/planechase/PhyrexianGhoul.java @@ -53,7 +53,7 @@ public class PhyrexianGhoul extends CardImpl { this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); } public PhyrexianGhoul(final PhyrexianGhoul card) { diff --git a/Mage.Sets/src/mage/sets/planechase/RaziaBorosArchangel.java b/Mage.Sets/src/mage/sets/planechase/RaziaBorosArchangel.java index 19500aab44c..c4cf9e07748 100644 --- a/Mage.Sets/src/mage/sets/planechase/RaziaBorosArchangel.java +++ b/Mage.Sets/src/mage/sets/planechase/RaziaBorosArchangel.java @@ -77,8 +77,8 @@ public class RaziaBorosArchangel extends CardImpl { // {tap}: The next 3 damage that would be dealt to target creature you control this turn is dealt to another target creature instead. Effect effect = new RaziaBorosArchangelEffect(Duration.EndOfTurn, 3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); - ability.addTarget(new TargetControlledCreaturePermanent(true)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planechase/RecklessCharge.java b/Mage.Sets/src/mage/sets/planechase/RecklessCharge.java index 0cd8adfc16b..9b28c48f5f3 100644 --- a/Mage.Sets/src/mage/sets/planechase/RecklessCharge.java +++ b/Mage.Sets/src/mage/sets/planechase/RecklessCharge.java @@ -54,7 +54,7 @@ public class RecklessCharge extends CardImpl { this.color.setRed(true); // Target creature gets +3/+0 and gains haste until end of turn. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(3, 0, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/planechase/SunhomeFortressOfTheLegion.java b/Mage.Sets/src/mage/sets/planechase/SunhomeFortressOfTheLegion.java index 5dcf31951e0..fa645a1635d 100644 --- a/Mage.Sets/src/mage/sets/planechase/SunhomeFortressOfTheLegion.java +++ b/Mage.Sets/src/mage/sets/planechase/SunhomeFortressOfTheLegion.java @@ -55,7 +55,7 @@ public class SunhomeFortressOfTheLegion extends CardImpl { this.addAbility(new ColorlessManaAbility()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{2}{R}{W}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planechase2012/FelidarUmbra.java b/Mage.Sets/src/mage/sets/planechase2012/FelidarUmbra.java index f40bde58f57..532dbae3f50 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/FelidarUmbra.java +++ b/Mage.Sets/src/mage/sets/planechase2012/FelidarUmbra.java @@ -61,7 +61,7 @@ public class FelidarUmbra extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainLife)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); @@ -72,7 +72,7 @@ public class FelidarUmbra extends CardImpl { // {1}{W}: Attach Felidar Umbra to target creature you control. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttachEffect(Outcome.Detriment, "Attach {this} to target creature you control"), new ManaCostsImpl("{1}{W}")); - ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); // Totem armor diff --git a/Mage.Sets/src/mage/sets/planechase2012/IndrikUmbra.java b/Mage.Sets/src/mage/sets/planechase2012/IndrikUmbra.java index 1d217f6b64b..29a6a2a26be 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/IndrikUmbra.java +++ b/Mage.Sets/src/mage/sets/planechase2012/IndrikUmbra.java @@ -62,7 +62,7 @@ public class IndrikUmbra extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/planechase2012/KrondTheDawnClad.java b/Mage.Sets/src/mage/sets/planechase2012/KrondTheDawnClad.java index 9ac45f96bad..db822952545 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/KrondTheDawnClad.java +++ b/Mage.Sets/src/mage/sets/planechase2012/KrondTheDawnClad.java @@ -64,7 +64,7 @@ public class KrondTheDawnClad extends CardImpl { new AttacksTriggeredAbility(new ExileTargetEffect(), false), new EnchantedCondition(), "Whenever Krond the Dawn-Clad attacks, if it's enchanted, exile target permanent."); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planechase2012/LastStand.java b/Mage.Sets/src/mage/sets/planechase2012/LastStand.java index 0c35430545c..a4bff0ba0d2 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/LastStand.java +++ b/Mage.Sets/src/mage/sets/planechase2012/LastStand.java @@ -62,8 +62,8 @@ public class LastStand extends CardImpl { // Target opponent loses 2 life for each Swamp you control. Last Stand deals damage equal to the number of Mountains you control to target creature. Put a 1/1 green Saproling creature token onto the battlefield for each Forest you control. You gain 2 life for each Plains you control. Draw a card for each Island you control, then discard that many cards. this.getSpellAbility().addEffect(new LastStandEffect()); - this.getSpellAbility().addTarget(new TargetOpponent(true)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public LastStand(final LastStand card) { diff --git a/Mage.Sets/src/mage/sets/planechase2012/NullmageAdvocate.java b/Mage.Sets/src/mage/sets/planechase2012/NullmageAdvocate.java index fe1e876cff1..7960e96ce9c 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/NullmageAdvocate.java +++ b/Mage.Sets/src/mage/sets/planechase2012/NullmageAdvocate.java @@ -77,7 +77,7 @@ public class NullmageAdvocate extends CardImpl { effect.setTargetPointer(new SecondTargetPointer()); ability.addEffect(effect); ability.addTarget(new TargetCardInOpponentsGraveyard(2,2, new FilterCard("two target cards from an opponent's graveyard"), true)); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planechase2012/PollenbrightWings.java b/Mage.Sets/src/mage/sets/planechase2012/PollenbrightWings.java index 765b828d95d..38b5fbc0fe0 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/PollenbrightWings.java +++ b/Mage.Sets/src/mage/sets/planechase2012/PollenbrightWings.java @@ -69,7 +69,7 @@ public class PollenbrightWings extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/planechase2012/QuietDisrepair.java b/Mage.Sets/src/mage/sets/planechase2012/QuietDisrepair.java index e0787be9ec1..1876c7401a8 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/QuietDisrepair.java +++ b/Mage.Sets/src/mage/sets/planechase2012/QuietDisrepair.java @@ -70,7 +70,7 @@ public class QuietDisrepair extends CardImpl { this.color.setGreen(true); // Enchant artifact or enchantment - TargetPermanent auraTarget = new TargetPermanent(filter, true); + TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/planeshift/CavernHarpy.java b/Mage.Sets/src/mage/sets/planeshift/CavernHarpy.java index 4b24145ad6d..ef8154f0a37 100644 --- a/Mage.Sets/src/mage/sets/planeshift/CavernHarpy.java +++ b/Mage.Sets/src/mage/sets/planeshift/CavernHarpy.java @@ -73,7 +73,7 @@ public class CavernHarpy extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Cavern Harpy enters the battlefield, return a blue or black creature you control to its owner's hand. Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect(), false); - ability.addTarget(new TargetControlledCreaturePermanent(1,1,filter, false, true)); + ability.addTarget(new TargetControlledCreaturePermanent(1,1,filter, false)); this.addAbility(ability); // Pay 1 life: Return Cavern Harpy to its owner's hand. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new PayLifeCost(1))); diff --git a/Mage.Sets/src/mage/sets/planeshift/GaeasMight.java b/Mage.Sets/src/mage/sets/planeshift/GaeasMight.java index fc63f5d0c98..248a515cd18 100644 --- a/Mage.Sets/src/mage/sets/planeshift/GaeasMight.java +++ b/Mage.Sets/src/mage/sets/planeshift/GaeasMight.java @@ -51,7 +51,7 @@ public class GaeasMight extends CardImpl { // Domain - Target creature gets +1/+1 until end of turn for each basic land type among lands you control. this.getSpellAbility().addEffect(new BoostTargetEffect(new DomainValue(), new DomainValue(), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public GaeasMight(final GaeasMight card) { diff --git a/Mage.Sets/src/mage/sets/planeshift/OrimsChant.java b/Mage.Sets/src/mage/sets/planeshift/OrimsChant.java index 6e14812ecd5..60395e43380 100644 --- a/Mage.Sets/src/mage/sets/planeshift/OrimsChant.java +++ b/Mage.Sets/src/mage/sets/planeshift/OrimsChant.java @@ -60,7 +60,7 @@ public class OrimsChant extends CardImpl { this.addAbility(new KickerAbility("{W}")); // Target player can't cast spells this turn. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new OrimsChantCantCastEffect()); // If Orim's Chant was kicked, creatures can't attack this turn. diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/BurningOfXinye.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/BurningOfXinye.java index f0a8240f5a1..f189cf192e3 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/BurningOfXinye.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/BurningOfXinye.java @@ -57,7 +57,7 @@ public class BurningOfXinye extends CardImpl { this.color.setRed(true); // You destroy four lands you control, then target opponent destroys four lands he or she controls. Then Burning of Xinye deals 4 damage to each creature. - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); this.getSpellAbility().addEffect(new BurningOfXinyeEffect()); this.getSpellAbility().addEffect(new DamageAllEffect(4, new FilterCreaturePermanent())); } diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/CaoCaoLordOfWei.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/CaoCaoLordOfWei.java index 63de003eeb4..34ab96c6959 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/CaoCaoLordOfWei.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/CaoCaoLordOfWei.java @@ -59,7 +59,7 @@ public class CaoCaoLordOfWei extends CardImpl { // {tap}: Target opponent discards two cards. Activate this ability only during your turn, before attackers are declared. Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(2), new TapSourceCost(), MyTurnBeforeAttackersDeclaredCondition.getInstance()); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/portalthreekingdoms/DiaochanArtfulBeauty.java b/Mage.Sets/src/mage/sets/portalthreekingdoms/DiaochanArtfulBeauty.java index ef3b0aee560..e375ac6c80c 100644 --- a/Mage.Sets/src/mage/sets/portalthreekingdoms/DiaochanArtfulBeauty.java +++ b/Mage.Sets/src/mage/sets/portalthreekingdoms/DiaochanArtfulBeauty.java @@ -66,7 +66,7 @@ public class DiaochanArtfulBeauty extends CardImpl { // {tap}: Destroy target creature of your choice, then destroy target creature of an opponent's choice. Activate this ability only during your turn, before attackers are declared. Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new DiaochanArtfulBeautyDestroyEffect(), new TapSourceCost(), MyTurnBeforeAttackersDeclaredCondition.getInstance()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); ability.addTarget(new TargetOpponentsChoiceCreaturePermanent()); this.addAbility(ability); } @@ -159,7 +159,7 @@ class TargetOpponentsChoiceCreaturePermanent extends TargetPermanent { private UUID getOpponentId(UUID playerId, Ability source, Game game) { if (opponentId == null) { - TargetOpponent target = new TargetOpponent(true); + TargetOpponent target = new TargetOpponent(); Player player = game.getPlayer(playerId); if (player != null) { if (player.chooseTarget(Outcome.Detriment, target, source, game)) { diff --git a/Mage.Sets/src/mage/sets/prophecy/Abolish.java b/Mage.Sets/src/mage/sets/prophecy/Abolish.java index 04cf90cb309..62c26384a82 100644 --- a/Mage.Sets/src/mage/sets/prophecy/Abolish.java +++ b/Mage.Sets/src/mage/sets/prophecy/Abolish.java @@ -66,7 +66,7 @@ public class Abolish extends CardImpl { // Destroy target artifact or enchantment. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); } public Abolish(final Abolish card) { diff --git a/Mage.Sets/src/mage/sets/prophecy/AgentOfShauku.java b/Mage.Sets/src/mage/sets/prophecy/AgentOfShauku.java index 58136094f27..601ff2c5daf 100644 --- a/Mage.Sets/src/mage/sets/prophecy/AgentOfShauku.java +++ b/Mage.Sets/src/mage/sets/prophecy/AgentOfShauku.java @@ -65,7 +65,7 @@ public class AgentOfShauku extends CardImpl { // {1}{B}, Sacrifice a land: Target creature gets +2/+0 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}{B}")); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/prophecy/ShieldDancer.java b/Mage.Sets/src/mage/sets/prophecy/ShieldDancer.java index 81dd886f7cd..34568fe6a8a 100644 --- a/Mage.Sets/src/mage/sets/prophecy/ShieldDancer.java +++ b/Mage.Sets/src/mage/sets/prophecy/ShieldDancer.java @@ -100,7 +100,7 @@ class ShieldDancerRedirectionEffect extends RedirectionEffect { && event.getSourceId().equals(source.getTargets().get(0).getFirstTarget())) { DamageEvent damageEvent = (DamageEvent) event; if (damageEvent.isCombatDamage()) { - TargetPermanent target = new TargetPermanent(true); + TargetPermanent target = new TargetPermanent(); target.add(source.getTargets().get(0).getFirstTarget(), game); redirectTarget = target; } diff --git a/Mage.Sets/src/mage/sets/prophecy/VerdantField.java b/Mage.Sets/src/mage/sets/prophecy/VerdantField.java index 810a228982e..ac78d709de3 100644 --- a/Mage.Sets/src/mage/sets/prophecy/VerdantField.java +++ b/Mage.Sets/src/mage/sets/prophecy/VerdantField.java @@ -65,7 +65,7 @@ public class VerdantField extends CardImpl { // Enchanted land has "{T}: Target creature gets +1/+1 until end of turn." Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new TapSourceCost()); - gainAbility.addTarget(new TargetCreaturePermanent(true)); + gainAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{T}: Target creature gets +1/+1 until end of turn.\""))); } diff --git a/Mage.Sets/src/mage/sets/ravnika/BorosGuildmage.java b/Mage.Sets/src/mage/sets/ravnika/BorosGuildmage.java index 943ecb6e05c..52c228db79c 100644 --- a/Mage.Sets/src/mage/sets/ravnika/BorosGuildmage.java +++ b/Mage.Sets/src/mage/sets/ravnika/BorosGuildmage.java @@ -60,10 +60,10 @@ public class BorosGuildmage extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{R}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{W}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/Caregiver.java b/Mage.Sets/src/mage/sets/ravnika/Caregiver.java index 054caaf3b08..801d057516b 100644 --- a/Mage.Sets/src/mage/sets/ravnika/Caregiver.java +++ b/Mage.Sets/src/mage/sets/ravnika/Caregiver.java @@ -58,7 +58,7 @@ public class Caregiver extends CardImpl { // {W}, Sacrifice a creature: Prevent the next 1 damage that would be dealt to target creature or player this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new ColoredManaCost(ColoredManaSymbol.W)); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/ClingingDarkness.java b/Mage.Sets/src/mage/sets/ravnika/ClingingDarkness.java index 394392f98c3..109e64c7dfb 100644 --- a/Mage.Sets/src/mage/sets/ravnika/ClingingDarkness.java +++ b/Mage.Sets/src/mage/sets/ravnika/ClingingDarkness.java @@ -52,7 +52,7 @@ public class ClingingDarkness extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/ravnika/ClutchOfTheUndercity.java b/Mage.Sets/src/mage/sets/ravnika/ClutchOfTheUndercity.java index 7f451237d80..af6e377d066 100644 --- a/Mage.Sets/src/mage/sets/ravnika/ClutchOfTheUndercity.java +++ b/Mage.Sets/src/mage/sets/ravnika/ClutchOfTheUndercity.java @@ -52,7 +52,7 @@ public class ClutchOfTheUndercity extends CardImpl { // Return target permanent to its owner's hand. Its controller loses 3 life. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); this.getSpellAbility().addEffect(new LoseLifeTargetControllerEffect(3)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Transmute {1}{U}{B} this.addAbility(new TransmuteAbility("{1}{U}{B}")); } diff --git a/Mage.Sets/src/mage/sets/ravnika/CompulsiveResearch.java b/Mage.Sets/src/mage/sets/ravnika/CompulsiveResearch.java index c023c103895..bad9ca49407 100644 --- a/Mage.Sets/src/mage/sets/ravnika/CompulsiveResearch.java +++ b/Mage.Sets/src/mage/sets/ravnika/CompulsiveResearch.java @@ -54,7 +54,7 @@ public class CompulsiveResearch extends CardImpl { this.color.setBlue(true); // Target player draws three cards. Then that player discards two cards unless he or she discards a land card. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new DrawCardTargetEffect(3)); this.getSpellAbility().addEffect(new CompulsiveResearchDiscardEffect()); } diff --git a/Mage.Sets/src/mage/sets/ravnika/ConsultTheNecrosages.java b/Mage.Sets/src/mage/sets/ravnika/ConsultTheNecrosages.java index 23262fdbdd6..3a5dcf2451f 100644 --- a/Mage.Sets/src/mage/sets/ravnika/ConsultTheNecrosages.java +++ b/Mage.Sets/src/mage/sets/ravnika/ConsultTheNecrosages.java @@ -50,10 +50,10 @@ public class ConsultTheNecrosages extends CardImpl { this.color.setBlack(true); // Choose one - Target player draws two cards; or target player discards two cards. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new DrawCardTargetEffect(2)); Mode mode = new Mode(); - mode.getTargets().add(new TargetPlayer(true)); + mode.getTargets().add(new TargetPlayer()); mode.getEffects().add(new DiscardTargetEffect(2)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/sets/ravnika/CyclopeanSnare.java b/Mage.Sets/src/mage/sets/ravnika/CyclopeanSnare.java index d9f72a4d90e..6de2cf086e3 100644 --- a/Mage.Sets/src/mage/sets/ravnika/CyclopeanSnare.java +++ b/Mage.Sets/src/mage/sets/ravnika/CyclopeanSnare.java @@ -54,7 +54,7 @@ public class CyclopeanSnare extends CardImpl { // {3}, {tap}: Tap target creature, then return Cyclopean Snare to its owner's hand. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); ability.addEffect(new ReturnToHandSourceEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/Darkblast.java b/Mage.Sets/src/mage/sets/ravnika/Darkblast.java index 52ad1a5464e..49cec5b4ffe 100644 --- a/Mage.Sets/src/mage/sets/ravnika/Darkblast.java +++ b/Mage.Sets/src/mage/sets/ravnika/Darkblast.java @@ -50,7 +50,7 @@ public class Darkblast extends CardImpl { // Target creature gets -1/-1 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(-1, -1, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Dredge 3 this.addAbility(new DredgeAbility(3)); } diff --git a/Mage.Sets/src/mage/sets/ravnika/DimirGuildmage.java b/Mage.Sets/src/mage/sets/ravnika/DimirGuildmage.java index c0fc8906b32..1116c55b1ae 100644 --- a/Mage.Sets/src/mage/sets/ravnika/DimirGuildmage.java +++ b/Mage.Sets/src/mage/sets/ravnika/DimirGuildmage.java @@ -60,11 +60,11 @@ public class DimirGuildmage extends CardImpl { // {3}{U}: Target player draws a card. Activate this ability only any time you could cast a sorcery. Ability firstAbility = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DrawCardTargetEffect(1), new ManaCostsImpl("{3}{U}")); - firstAbility.addTarget(new TargetPlayer(true)); + firstAbility.addTarget(new TargetPlayer()); this.addAbility(firstAbility); // {3}{B}: Target player discards a card. Activate this ability only any time you could cast a sorcery. Ability secondAbility = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl("{3}{B}")); - secondAbility.addTarget(new TargetPlayer(true)); + secondAbility.addTarget(new TargetPlayer()); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/sets/ravnika/DimirHouseGuard.java b/Mage.Sets/src/mage/sets/ravnika/DimirHouseGuard.java index 5ea6bfaa7d1..2856b1170bd 100644 --- a/Mage.Sets/src/mage/sets/ravnika/DimirHouseGuard.java +++ b/Mage.Sets/src/mage/sets/ravnika/DimirHouseGuard.java @@ -58,7 +58,7 @@ public class DimirHouseGuard extends CardImpl { this.addAbility(FearAbility.getInstance()); // Sacrifice a creature: Regenerate Dimir House Guard. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); // Transmute {1}{B}{B} this.addAbility(new TransmuteAbility("{1}{B}{B}")); } diff --git a/Mage.Sets/src/mage/sets/ravnika/DizzySpell.java b/Mage.Sets/src/mage/sets/ravnika/DizzySpell.java index 4e2ff3ef410..1ef299ac131 100644 --- a/Mage.Sets/src/mage/sets/ravnika/DizzySpell.java +++ b/Mage.Sets/src/mage/sets/ravnika/DizzySpell.java @@ -51,7 +51,7 @@ public class DizzySpell extends CardImpl { // Target creature gets -3/-0 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(-3, 0, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Transmute {1}{U}{U} this.addAbility(new TransmuteAbility("{1}{U}{U}")); } diff --git a/Mage.Sets/src/mage/sets/ravnika/DuskmantleHouseOfShadow.java b/Mage.Sets/src/mage/sets/ravnika/DuskmantleHouseOfShadow.java index bc0e0a7603c..1f0e0904f56 100644 --- a/Mage.Sets/src/mage/sets/ravnika/DuskmantleHouseOfShadow.java +++ b/Mage.Sets/src/mage/sets/ravnika/DuskmantleHouseOfShadow.java @@ -56,7 +56,7 @@ public class DuskmantleHouseOfShadow extends CardImpl { // {U}{B}, {tap}: Target player puts the top card of his or her library into his or her graveyard. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(1), new ManaCostsImpl("{U}{B}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/ElvishSkysweeper.java b/Mage.Sets/src/mage/sets/ravnika/ElvishSkysweeper.java index 1367988f45b..2748c4e0104 100644 --- a/Mage.Sets/src/mage/sets/ravnika/ElvishSkysweeper.java +++ b/Mage.Sets/src/mage/sets/ravnika/ElvishSkysweeper.java @@ -69,8 +69,8 @@ public class ElvishSkysweeper extends CardImpl { // {4}{G}, Sacrifice a creature: Destroy target creature with flying. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{4}{G}")); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/EtherealUsher.java b/Mage.Sets/src/mage/sets/ravnika/EtherealUsher.java index 156df17ac3b..53eabac8602 100644 --- a/Mage.Sets/src/mage/sets/ravnika/EtherealUsher.java +++ b/Mage.Sets/src/mage/sets/ravnika/EtherealUsher.java @@ -61,7 +61,7 @@ public class EtherealUsher extends CardImpl { new UnblockableTargetEffect(), new ManaCostsImpl("{U}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Transmute {1}{U}{U} this.addAbility(new TransmuteAbility("{1}{U}{U}")); diff --git a/Mage.Sets/src/mage/sets/ravnika/FieryConclusion.java b/Mage.Sets/src/mage/sets/ravnika/FieryConclusion.java index 79723003354..be143eb5f0f 100644 --- a/Mage.Sets/src/mage/sets/ravnika/FieryConclusion.java +++ b/Mage.Sets/src/mage/sets/ravnika/FieryConclusion.java @@ -49,10 +49,10 @@ public class FieryConclusion extends CardImpl { this.color.setRed(true); // As an additional cost to cast Fiery Conclusion, sacrifice a creature. - this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); // Fiery Conclusion deals 5 damage to target creature. this.getSpellAbility().addEffect(new DamageTargetEffect(5)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public FieryConclusion(final FieryConclusion card) { diff --git a/Mage.Sets/src/mage/sets/ravnika/FistsOfIronwood.java b/Mage.Sets/src/mage/sets/ravnika/FistsOfIronwood.java index c59b4ae12ac..fc210d0cee5 100644 --- a/Mage.Sets/src/mage/sets/ravnika/FistsOfIronwood.java +++ b/Mage.Sets/src/mage/sets/ravnika/FistsOfIronwood.java @@ -57,7 +57,7 @@ public class FistsOfIronwood extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/ravnika/FlightOfFancy.java b/Mage.Sets/src/mage/sets/ravnika/FlightOfFancy.java index b0d9be9fe79..f113825292f 100644 --- a/Mage.Sets/src/mage/sets/ravnika/FlightOfFancy.java +++ b/Mage.Sets/src/mage/sets/ravnika/FlightOfFancy.java @@ -56,7 +56,7 @@ public class FlightOfFancy extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/ravnika/GalvanicArc.java b/Mage.Sets/src/mage/sets/ravnika/GalvanicArc.java index b6cca0288ee..39bffff9665 100644 --- a/Mage.Sets/src/mage/sets/ravnika/GalvanicArc.java +++ b/Mage.Sets/src/mage/sets/ravnika/GalvanicArc.java @@ -57,7 +57,7 @@ public class GalvanicArc extends CardImpl { this.color.setRed(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/ravnika/GatherCourage.java b/Mage.Sets/src/mage/sets/ravnika/GatherCourage.java index 8014a675a67..cdc89318faa 100644 --- a/Mage.Sets/src/mage/sets/ravnika/GatherCourage.java +++ b/Mage.Sets/src/mage/sets/ravnika/GatherCourage.java @@ -53,7 +53,7 @@ public class GatherCourage extends CardImpl { this.addAbility(new ConvokeAbility()); // Target creature gets +2/+2 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public GatherCourage(final GatherCourage card) { diff --git a/Mage.Sets/src/mage/sets/ravnika/GlimpseTheUnthinkable.java b/Mage.Sets/src/mage/sets/ravnika/GlimpseTheUnthinkable.java index 79cc61dbcbf..8e14e3a6ae6 100644 --- a/Mage.Sets/src/mage/sets/ravnika/GlimpseTheUnthinkable.java +++ b/Mage.Sets/src/mage/sets/ravnika/GlimpseTheUnthinkable.java @@ -49,7 +49,7 @@ public class GlimpseTheUnthinkable extends CardImpl { // Target player puts the top ten cards of his or her library into his or her graveyard. this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(10)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public GlimpseTheUnthinkable(final GlimpseTheUnthinkable card) { diff --git a/Mage.Sets/src/mage/sets/ravnika/GolgariGuildmage.java b/Mage.Sets/src/mage/sets/ravnika/GolgariGuildmage.java index b6dab138535..4785a06f54a 100644 --- a/Mage.Sets/src/mage/sets/ravnika/GolgariGuildmage.java +++ b/Mage.Sets/src/mage/sets/ravnika/GolgariGuildmage.java @@ -63,11 +63,11 @@ public class GolgariGuildmage extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{4}{B}")); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard"))); this.addAbility(ability); ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl("{4}{G}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/GolgariRotwurm.java b/Mage.Sets/src/mage/sets/ravnika/GolgariRotwurm.java index 3e032ea8a5f..ebd6f69f9ed 100644 --- a/Mage.Sets/src/mage/sets/ravnika/GolgariRotwurm.java +++ b/Mage.Sets/src/mage/sets/ravnika/GolgariRotwurm.java @@ -62,8 +62,8 @@ public class GolgariRotwurm extends CardImpl { // {B}, Sacrifice a creature: Target player loses 1 life. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ColoredManaCost(ColoredManaSymbol.B)); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); - ability.addTarget(new TargetPlayer(true)); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/GolgariThug.java b/Mage.Sets/src/mage/sets/ravnika/GolgariThug.java index e4ccc87a197..548e7c5e6d9 100644 --- a/Mage.Sets/src/mage/sets/ravnika/GolgariThug.java +++ b/Mage.Sets/src/mage/sets/ravnika/GolgariThug.java @@ -64,7 +64,7 @@ public class GolgariThug extends CardImpl { // When Golgari Thug dies, put target creature card from your graveyard on top of your library. Ability ability = new DiesTriggeredAbility(new PutOnLibraryTargetEffect(true)); - ability.addTarget(new TargetCardInYourGraveyard(filter, true)); + ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); // Dredge 4 this.addAbility(new DredgeAbility(4)); diff --git a/Mage.Sets/src/mage/sets/ravnika/HuntedDragon.java b/Mage.Sets/src/mage/sets/ravnika/HuntedDragon.java index 85b239e364d..e58488d9a01 100644 --- a/Mage.Sets/src/mage/sets/ravnika/HuntedDragon.java +++ b/Mage.Sets/src/mage/sets/ravnika/HuntedDragon.java @@ -62,7 +62,7 @@ public class HuntedDragon extends CardImpl { this.addAbility(HasteAbility.getInstance()); // When Hunted Dragon enters the battlefield, put three 2/2 white Knight creature tokens with first strike onto the battlefield under target opponent's control. Ability ability = new EntersBattlefieldTriggeredAbility(new CreateTokenTargetEffect(new KnightToken(), 3), false); - Target target = new TargetOpponent(true); + Target target = new TargetOpponent(); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/ravnika/HuntedHorror.java b/Mage.Sets/src/mage/sets/ravnika/HuntedHorror.java index 0a7ef6865a9..103720ef09a 100644 --- a/Mage.Sets/src/mage/sets/ravnika/HuntedHorror.java +++ b/Mage.Sets/src/mage/sets/ravnika/HuntedHorror.java @@ -63,7 +63,7 @@ public class HuntedHorror extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // When Hunted Horror enters the battlefield, put two 3/3 green Centaur creature tokens with protection from black onto the battlefield under target opponent's control. Ability ability = new EntersBattlefieldTriggeredAbility(new CreateTokenTargetEffect(new CentaurToken(), 2), false); - Target target = new TargetOpponent(true); + Target target = new TargetOpponent(); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/ravnika/HuntedLammasu.java b/Mage.Sets/src/mage/sets/ravnika/HuntedLammasu.java index 7158d342a67..ae898d85e4c 100644 --- a/Mage.Sets/src/mage/sets/ravnika/HuntedLammasu.java +++ b/Mage.Sets/src/mage/sets/ravnika/HuntedLammasu.java @@ -59,7 +59,7 @@ public class HuntedLammasu extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Hunted Lammasu enters the battlefield, put a 4/4 black Horror creature token onto the battlefield under target opponent's control. Ability ability = new EntersBattlefieldTriggeredAbility(new CreateTokenTargetEffect(new HorrorToken()), false); - Target target = new TargetOpponent(true); + Target target = new TargetOpponent(); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/ravnika/HuntedPhantasm.java b/Mage.Sets/src/mage/sets/ravnika/HuntedPhantasm.java index 0aadc3d9047..b16c21e7ca9 100644 --- a/Mage.Sets/src/mage/sets/ravnika/HuntedPhantasm.java +++ b/Mage.Sets/src/mage/sets/ravnika/HuntedPhantasm.java @@ -59,7 +59,7 @@ public class HuntedPhantasm extends CardImpl { this.addAbility(new UnblockableAbility()); // When Hunted Phantasm enters the battlefield, put five 1/1 red Goblin creature tokens onto the battlefield under target opponent's control. Ability ability = new EntersBattlefieldTriggeredAbility(new CreateTokenTargetEffect(new GoblinToken(), 5), false); - Target target = new TargetOpponent(true); + Target target = new TargetOpponent(); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/ravnika/HuntedTroll.java b/Mage.Sets/src/mage/sets/ravnika/HuntedTroll.java index 3440e079dd6..49526c2ed3f 100644 --- a/Mage.Sets/src/mage/sets/ravnika/HuntedTroll.java +++ b/Mage.Sets/src/mage/sets/ravnika/HuntedTroll.java @@ -65,7 +65,7 @@ public class HuntedTroll extends CardImpl { // When Hunted Troll enters the battlefield, put four 1/1 blue Faerie creature tokens with flying onto the battlefield under target opponent's control. Ability ability = new EntersBattlefieldTriggeredAbility(new CreateTokenTargetEffect(new FaerieToken(), 4), false); - Target target = new TargetOpponent(true); + Target target = new TargetOpponent(); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/ravnika/InfectiousHost.java b/Mage.Sets/src/mage/sets/ravnika/InfectiousHost.java index b036fbfca02..b8b87707b9a 100644 --- a/Mage.Sets/src/mage/sets/ravnika/InfectiousHost.java +++ b/Mage.Sets/src/mage/sets/ravnika/InfectiousHost.java @@ -54,7 +54,7 @@ public class InfectiousHost extends CardImpl { // When Infectious Host dies, target player loses 2 life. Ability ability = new DiesTriggeredAbility(new LoseLifeTargetEffect(2), false); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/IvyDancer.java b/Mage.Sets/src/mage/sets/ravnika/IvyDancer.java index 3de230d80f3..0e15622f518 100644 --- a/Mage.Sets/src/mage/sets/ravnika/IvyDancer.java +++ b/Mage.Sets/src/mage/sets/ravnika/IvyDancer.java @@ -60,7 +60,7 @@ public class IvyDancer extends CardImpl { // {tap}: Target creature gains forestwalk until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new ForestwalkAbility(), Duration.EndOfTurn), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/KeeningBanshee.java b/Mage.Sets/src/mage/sets/ravnika/KeeningBanshee.java index 1648f1c13fa..e1dc592adfb 100644 --- a/Mage.Sets/src/mage/sets/ravnika/KeeningBanshee.java +++ b/Mage.Sets/src/mage/sets/ravnika/KeeningBanshee.java @@ -58,7 +58,7 @@ public class KeeningBanshee extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Keening Banshee enters the battlefield, target creature gets -2/-2 until end of turn. Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(-2, -2, Duration.EndOfTurn), false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/LastGasp.java b/Mage.Sets/src/mage/sets/ravnika/LastGasp.java index ef99eb42781..21150aed833 100644 --- a/Mage.Sets/src/mage/sets/ravnika/LastGasp.java +++ b/Mage.Sets/src/mage/sets/ravnika/LastGasp.java @@ -50,7 +50,7 @@ public class LastGasp extends CardImpl { // Target creature gets -3/-3 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(-3, -3, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public LastGasp(final LastGasp card) { diff --git a/Mage.Sets/src/mage/sets/ravnika/LeaveNoTrace.java b/Mage.Sets/src/mage/sets/ravnika/LeaveNoTrace.java index 4a013398503..12ca814623f 100644 --- a/Mage.Sets/src/mage/sets/ravnika/LeaveNoTrace.java +++ b/Mage.Sets/src/mage/sets/ravnika/LeaveNoTrace.java @@ -60,7 +60,7 @@ public class LeaveNoTrace extends CardImpl { // Radiance - Destroy target enchantment and each other enchantment that shares a color with it. this.getSpellAbility().addEffect(new LeaveNoTraceEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(true)); + this.getSpellAbility().addTarget(new TargetPermanent()); } public LeaveNoTrace(final LeaveNoTrace card) { diff --git a/Mage.Sets/src/mage/sets/ravnika/MoldervineCloak.java b/Mage.Sets/src/mage/sets/ravnika/MoldervineCloak.java index 0365a647882..924878ee3f9 100644 --- a/Mage.Sets/src/mage/sets/ravnika/MoldervineCloak.java +++ b/Mage.Sets/src/mage/sets/ravnika/MoldervineCloak.java @@ -56,7 +56,7 @@ public class MoldervineCloak extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/ravnika/NightmareVoid.java b/Mage.Sets/src/mage/sets/ravnika/NightmareVoid.java index bc6ed894eea..a662cde4654 100644 --- a/Mage.Sets/src/mage/sets/ravnika/NightmareVoid.java +++ b/Mage.Sets/src/mage/sets/ravnika/NightmareVoid.java @@ -49,7 +49,7 @@ public class NightmareVoid extends CardImpl { this.color.setBlack(true); // Target player reveals his or her hand. You choose a card from it. That player discards that card. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(TargetController.ANY)); // Dredge 2 this.addAbility(new DredgeAbility(2)); diff --git a/Mage.Sets/src/mage/sets/ravnika/Putrefy.java b/Mage.Sets/src/mage/sets/ravnika/Putrefy.java index e039bd9e705..b14ab7da966 100644 --- a/Mage.Sets/src/mage/sets/ravnika/Putrefy.java +++ b/Mage.Sets/src/mage/sets/ravnika/Putrefy.java @@ -56,7 +56,7 @@ public class Putrefy extends CardImpl { this.expansionSetCode = "RAV"; this.color.setBlack(true); this.color.setGreen(true); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); } diff --git a/Mage.Sets/src/mage/sets/ravnika/Sandsower.java b/Mage.Sets/src/mage/sets/ravnika/Sandsower.java index 567fb9aec9c..f45239b0344 100644 --- a/Mage.Sets/src/mage/sets/ravnika/Sandsower.java +++ b/Mage.Sets/src/mage/sets/ravnika/Sandsower.java @@ -67,7 +67,7 @@ public class Sandsower extends CardImpl { // Tap three untapped creatures you control: Tap target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(3, 3, filter, true))); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/ShamblingShell.java b/Mage.Sets/src/mage/sets/ravnika/ShamblingShell.java index b85aff9552c..c7d2f8590bc 100644 --- a/Mage.Sets/src/mage/sets/ravnika/ShamblingShell.java +++ b/Mage.Sets/src/mage/sets/ravnika/ShamblingShell.java @@ -60,7 +60,7 @@ public class ShamblingShell extends CardImpl { // Sacrifice Shambling Shell: Put a +1/+1 counter on target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Dredge 3 this.addAbility(new DredgeAbility(3)); diff --git a/Mage.Sets/src/mage/sets/ravnika/SistersOfStoneDeath.java b/Mage.Sets/src/mage/sets/ravnika/SistersOfStoneDeath.java index 1a38ec0fec9..2acf062a50a 100644 --- a/Mage.Sets/src/mage/sets/ravnika/SistersOfStoneDeath.java +++ b/Mage.Sets/src/mage/sets/ravnika/SistersOfStoneDeath.java @@ -75,7 +75,7 @@ public class SistersOfStoneDeath extends CardImpl { // {G}: Target creature blocks Sisters of Stone Death this turn if able. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MustBeBlockedByTargetSourceEffect(), new ManaCostsImpl("{G}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {B}{G}: Exile target creature blocking or blocked by Sisters of Stone Death. @@ -83,7 +83,7 @@ public class SistersOfStoneDeath extends CardImpl { FilterCreaturePermanent filter = new FilterCreaturePermanent("creature blocking or blocked by Sisters of Stone Death"); filter.add(Predicates.or(new BlockedByIdPredicate(this.getId()), new BlockingAttackerIdPredicate(this.getId()))); - ability2.addTarget(new TargetCreaturePermanent(filter, true)); + ability2.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability2); // {2}{B}: Put a creature card exiled with Sisters of Stone Death onto the battlefield under your control. diff --git a/Mage.Sets/src/mage/sets/ravnika/SunderingVitae.java b/Mage.Sets/src/mage/sets/ravnika/SunderingVitae.java index 48645e6cd10..762ac34699d 100644 --- a/Mage.Sets/src/mage/sets/ravnika/SunderingVitae.java +++ b/Mage.Sets/src/mage/sets/ravnika/SunderingVitae.java @@ -61,7 +61,7 @@ public class SunderingVitae extends CardImpl { // Convoke this.addAbility(new ConvokeAbility()); // Destroy target artifact or enchantment. - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/ravnika/Ursapine.java b/Mage.Sets/src/mage/sets/ravnika/Ursapine.java index 1557d9d4eac..8adb724fd19 100644 --- a/Mage.Sets/src/mage/sets/ravnika/Ursapine.java +++ b/Mage.Sets/src/mage/sets/ravnika/Ursapine.java @@ -55,7 +55,7 @@ public class Ursapine extends CardImpl { // {G}: Target creature gets +1/+1 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.G)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/VedalkenDismisser.java b/Mage.Sets/src/mage/sets/ravnika/VedalkenDismisser.java index 07953f5e08c..b501f8f3dc8 100644 --- a/Mage.Sets/src/mage/sets/ravnika/VedalkenDismisser.java +++ b/Mage.Sets/src/mage/sets/ravnika/VedalkenDismisser.java @@ -55,7 +55,7 @@ public class VedalkenDismisser extends CardImpl { // When Vedalken Dismisser enters the battlefield, put target creature on top of its owner's library. Ability ability = new EntersBattlefieldTriggeredAbility(new PutOnLibraryTargetEffect(true), false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/VedalkenEntrancer.java b/Mage.Sets/src/mage/sets/ravnika/VedalkenEntrancer.java index 8862053e832..ebb25d175d7 100644 --- a/Mage.Sets/src/mage/sets/ravnika/VedalkenEntrancer.java +++ b/Mage.Sets/src/mage/sets/ravnika/VedalkenEntrancer.java @@ -61,7 +61,7 @@ public class VedalkenEntrancer extends CardImpl { // {U}, {tap}: Target player puts the top two cards of his or her library into his or her graveyard. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(2), new ColoredManaCost(ColoredManaSymbol.U)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AerialPredation.java b/Mage.Sets/src/mage/sets/returntoravnica/AerialPredation.java index 13dbbb037dc..3b2f4e65124 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AerialPredation.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AerialPredation.java @@ -58,7 +58,7 @@ public class AerialPredation extends CardImpl { this.color.setGreen(true); // Destroy target creature with flying. You gain 2 life. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new GainLifeEffect(2)); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AquusSteed.java b/Mage.Sets/src/mage/sets/returntoravnica/AquusSteed.java index 4c32f3c5025..1df9543901a 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AquusSteed.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AquusSteed.java @@ -60,7 +60,7 @@ public class AquusSteed extends CardImpl { // {2}{U}, {T}: Target creature gets -2/-0 until end of turn. Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new ManaCostsImpl("{2}{U}")); secondAbility.addCost(new TapSourceCost()); - secondAbility.addTarget(new TargetCreaturePermanent(true)); + secondAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AssassinsStrike.java b/Mage.Sets/src/mage/sets/returntoravnica/AssassinsStrike.java index e58307a4915..2e666dd68b3 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AssassinsStrike.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AssassinsStrike.java @@ -55,7 +55,7 @@ public class AssassinsStrike extends CardImpl { this.color.setBlack(true); // Destroy target creature. Its controller discards a card. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new AssassinsStrikeEffect()); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AugerSpree.java b/Mage.Sets/src/mage/sets/returntoravnica/AugerSpree.java index 84538989544..4ef8482304b 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AugerSpree.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AugerSpree.java @@ -50,7 +50,7 @@ public class AugerSpree extends CardImpl { // Target creature gets +4/-4 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(4, -4, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public AugerSpree(final AugerSpree card) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AzoriusArrester.java b/Mage.Sets/src/mage/sets/returntoravnica/AzoriusArrester.java index 48056e61151..55c75fef668 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/AzoriusArrester.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/AzoriusArrester.java @@ -65,7 +65,7 @@ public class AzoriusArrester extends CardImpl { // When Azorius Arrester enters the battlefield, detain target creature an opponent controls. Ability ability = new EntersBattlefieldTriggeredAbility(new DetainTargetEffect(), false); - TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true); + TargetCreaturePermanent target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Blustersquall.java b/Mage.Sets/src/mage/sets/returntoravnica/Blustersquall.java index 7fe18eede1b..96088f18c01 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Blustersquall.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Blustersquall.java @@ -65,7 +65,7 @@ public class Blustersquall extends CardImpl { this.color.setBlue(true); // Tap target creature you don't control. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new TapTargetEffect()); // Overload {3}{U} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.") diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ChemistersTrick.java b/Mage.Sets/src/mage/sets/returntoravnica/ChemistersTrick.java index 59ca94ed757..4e3613d26e8 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ChemistersTrick.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ChemistersTrick.java @@ -70,7 +70,7 @@ public class ChemistersTrick extends CardImpl { this.color.setRed(true); // Target creature you don't control gets -2/-0 until end of turn and attacks this turn if able. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new BoostTargetEffect(-2,0, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new AttacksIfAbleTargetEffect(Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ChorusOfMight.java b/Mage.Sets/src/mage/sets/returntoravnica/ChorusOfMight.java index 3daa0185513..db8c94d9914 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ChorusOfMight.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ChorusOfMight.java @@ -54,7 +54,7 @@ public class ChorusOfMight extends CardImpl { // Until end of turn, target creature gets +1/+1 for each creature you control and gains trample. PermanentsOnBattlefieldCount value = new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(value, value, Duration.EndOfTurn, true)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/CodexShredder.java b/Mage.Sets/src/mage/sets/returntoravnica/CodexShredder.java index fd62629ad89..194b4111ac3 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/CodexShredder.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/CodexShredder.java @@ -53,7 +53,7 @@ public class CodexShredder extends CardImpl { // {T}: Target player puts the top card of his or her library into his or her graveyard. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); // {5}, {T}, Sacrifice Codex Shredder: Return target card from your graveyard to your hand. diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ConjuredCurrency.java b/Mage.Sets/src/mage/sets/returntoravnica/ConjuredCurrency.java index ea2f2a87dc9..76fe4a5f3e9 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/ConjuredCurrency.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/ConjuredCurrency.java @@ -63,7 +63,7 @@ public class ConjuredCurrency extends CardImpl { // At the beginning of your upkeep, you may exchange control of Conjured Currency and target permanent you neither own nor control. Ability ability = new BeginningOfUpkeepTriggeredAbility(new ExchangeControlTargetEffect(Duration.EndOfGame, rule, true), TargetController.YOU, true); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DeathsPresence.java b/Mage.Sets/src/mage/sets/returntoravnica/DeathsPresence.java index 55964579e5f..499fe6410a7 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DeathsPresence.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DeathsPresence.java @@ -91,7 +91,7 @@ class DeathsPresenceTriggeredAbility extends TriggeredAbilityImpl { Permanent permanent = (Permanent) game.getLastKnownInformation(event.getTargetId(), Zone.BATTLEFIELD); if (permanent != null && permanent.getControllerId().equals(this.getControllerId()) && permanent.getCardType().contains(CardType.CREATURE)) { this.getTargets().clear(); - this.addTarget(new TargetControlledCreaturePermanent(true)); + this.addTarget(new TargetControlledCreaturePermanent()); this.getEffects().clear(); this.addEffect(new AddCountersTargetEffect(CounterType.P1P1.createInstance(permanent.getPower().getValue()))); return true; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DetentionSphere.java b/Mage.Sets/src/mage/sets/returntoravnica/DetentionSphere.java index 655e79f7d1c..1b11e557d69 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DetentionSphere.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DetentionSphere.java @@ -73,7 +73,7 @@ public class DetentionSphere extends CardImpl { // target nonland permanent not named Detention Sphere and all // other permanents with the same name as that permanent. Ability ability = new EntersBattlefieldTriggeredAbility(new DetentionSphereEntersEffect(), true); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DeviantGlee.java b/Mage.Sets/src/mage/sets/returntoravnica/DeviantGlee.java index 0863bb092fb..e0e754f44f6 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DeviantGlee.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DeviantGlee.java @@ -64,7 +64,7 @@ public class DeviantGlee extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Doorkeeper.java b/Mage.Sets/src/mage/sets/returntoravnica/Doorkeeper.java index 54b95ab27ab..4470fde5d7e 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Doorkeeper.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Doorkeeper.java @@ -71,7 +71,7 @@ public class Doorkeeper extends CardImpl { // {2}{U}, {T}: Target player puts the top X cards of his or her library into his or her graveyard, where X is the number of creatures with defender you control. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(new PermanentsOnBattlefieldCount(filter)), new ManaCostsImpl("{2}{U}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Downsize.java b/Mage.Sets/src/mage/sets/returntoravnica/Downsize.java index 65e4533e599..ccac70980dd 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Downsize.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Downsize.java @@ -61,7 +61,7 @@ public class Downsize extends CardImpl { this.color.setBlue(true); // Target creature you don't control gets -4/-0 until end of turn. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new BoostTargetEffect(-4,0, Duration.EndOfTurn)); // Overload {2}{U} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.") diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DrainpipeVermin.java b/Mage.Sets/src/mage/sets/returntoravnica/DrainpipeVermin.java index 43783ee17ac..e88e7e06c62 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DrainpipeVermin.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DrainpipeVermin.java @@ -56,7 +56,7 @@ public class DrainpipeVermin extends CardImpl { // When Drainpipe Vermin dies, you may pay {B}. If you do, target player discards a card. Ability ability = new DiesTriggeredAbility(new DoIfCostPaid(new DiscardTargetEffect(1), new ColoredManaCost(ColoredManaSymbol.B)), false); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DramaticRescue.java b/Mage.Sets/src/mage/sets/returntoravnica/DramaticRescue.java index 2a8b14c461f..7732e7877a8 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/DramaticRescue.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/DramaticRescue.java @@ -51,7 +51,7 @@ public class DramaticRescue extends CardImpl { // Target player draws two cards. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); this.getSpellAbility().addEffect(new GainLifeEffect(2)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Dreadbore.java b/Mage.Sets/src/mage/sets/returntoravnica/Dreadbore.java index ca1f852efe6..483bf060145 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Dreadbore.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Dreadbore.java @@ -61,7 +61,7 @@ public class Dreadbore extends CardImpl { // Destroy target creature or planeswalker. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); } public Dreadbore(final Dreadbore card) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Dynacharge.java b/Mage.Sets/src/mage/sets/returntoravnica/Dynacharge.java index 62679953aa2..d933a36886d 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Dynacharge.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Dynacharge.java @@ -51,7 +51,7 @@ public class Dynacharge extends CardImpl { this.color.setRed(true); // Target creature you control gets +2/+0 until end of turn. - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(2,0, Duration.EndOfTurn)); // Overload {2}{R} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.") diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Electrickery.java b/Mage.Sets/src/mage/sets/returntoravnica/Electrickery.java index 92b79de9512..8183df6d5b9 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Electrickery.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Electrickery.java @@ -60,7 +60,7 @@ public class Electrickery extends CardImpl { this.color.setRed(true); // Electrickery deals 1 damage to target creature you don't control. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DamageTargetEffect(1)); // Overload {1}{R} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.") diff --git a/Mage.Sets/src/mage/sets/returntoravnica/EtherealArmor.java b/Mage.Sets/src/mage/sets/returntoravnica/EtherealArmor.java index 58fafb5d855..aa4a742e5d6 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/EtherealArmor.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/EtherealArmor.java @@ -70,7 +70,7 @@ public class EtherealArmor extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GuildFeud.java b/Mage.Sets/src/mage/sets/returntoravnica/GuildFeud.java index e1c984acaeb..e91817adb0f 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/GuildFeud.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/GuildFeud.java @@ -67,7 +67,7 @@ public class GuildFeud extends CardImpl { // cards of your library. If two creatures are put onto the battlefield this way, // those creatures fight each other. Ability ability = new BeginningOfUpkeepTriggeredAbility(new GuildFeudEffect(), TargetController.YOU, true); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/HellholeFlailer.java b/Mage.Sets/src/mage/sets/returntoravnica/HellholeFlailer.java index 4f81afd675b..0a0afef1d8d 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/HellholeFlailer.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/HellholeFlailer.java @@ -64,7 +64,7 @@ public class HellholeFlailer extends CardImpl { // {2}{B}{R}, Sacrifice Hellhole Flailer: Hellhole Flailer deals damage equal to its power to target player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new SourcePermanentPowerCount()), new ManaCostsImpl("{2}{B}{R}")); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/InactionInjunction.java b/Mage.Sets/src/mage/sets/returntoravnica/InactionInjunction.java index 4145b120842..68ae51a621f 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/InactionInjunction.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/InactionInjunction.java @@ -60,7 +60,7 @@ public class InactionInjunction extends CardImpl { // Detain target creature an opponent controls. // (Until your next turn, that creature can't attack or block and its activated abilities can't be activated.) this.getSpellAbility().addEffect(new DetainTargetEffect()); - TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true); + TargetCreaturePermanent target = new TargetCreaturePermanent(filter); target.setRequired(true); this.getSpellAbility().addTarget(target); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Inspiration.java b/Mage.Sets/src/mage/sets/returntoravnica/Inspiration.java index 384b3e063cc..0193760d860 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Inspiration.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Inspiration.java @@ -48,7 +48,7 @@ public class Inspiration extends CardImpl { // Target player draws two cards. this.getSpellAbility().addEffect(new DrawCardTargetEffect(2)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/IsperiasSkywatch.java b/Mage.Sets/src/mage/sets/returntoravnica/IsperiasSkywatch.java index 2c561d47ea3..294cc35a1e8 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/IsperiasSkywatch.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/IsperiasSkywatch.java @@ -70,7 +70,7 @@ public class IsperiasSkywatch extends CardImpl { // When Isperia's Skywatch enters the battlefield, detain target creature an opponent controls. // (Until your next turn, that creature can't attack or block and its activated abilities can't be activated.) Ability ability = new EntersBattlefieldTriggeredAbility(new DetainTargetEffect()); - TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true); + TargetCreaturePermanent target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/IzzetCharm.java b/Mage.Sets/src/mage/sets/returntoravnica/IzzetCharm.java index 3c72cd6910f..f4272d2356e 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/IzzetCharm.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/IzzetCharm.java @@ -67,7 +67,7 @@ public class IzzetCharm extends CardImpl { // or Izzet Charm deals 2 damage to target creature; Mode mode = new Mode(); mode.getEffects().add(new DamageTargetEffect(2)); - mode.getTargets().add(new TargetCreaturePermanent(true)); + mode.getTargets().add(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); // or draw two cards, then discard two cards. diff --git a/Mage.Sets/src/mage/sets/returntoravnica/IzzetStaticaster.java b/Mage.Sets/src/mage/sets/returntoravnica/IzzetStaticaster.java index c3c146eb7f1..f1a9637b6c6 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/IzzetStaticaster.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/IzzetStaticaster.java @@ -72,7 +72,7 @@ public class IzzetStaticaster extends CardImpl { // {T}: Izzet Staticaster deals 1 damage to target creature and each other creature with the same name as that creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new IzzetStaticasterDamageEffect(), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/JaceArchitectOfThought.java b/Mage.Sets/src/mage/sets/returntoravnica/JaceArchitectOfThought.java index 93caf1f13f9..17576fda6ed 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/JaceArchitectOfThought.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/JaceArchitectOfThought.java @@ -252,7 +252,7 @@ class JaceArchitectOfThoughtEffect2 extends OneShotEffect { if (!opponents.isEmpty()) { Player opponent = null; if (opponents.size() > 1) { - TargetOpponent targetOpponent = new TargetOpponent(true); + TargetOpponent targetOpponent = new TargetOpponent(); if (player.chooseTarget(Outcome.Neutral, targetOpponent, source, game)) { opponent = game.getPlayer(targetOpponent.getFirstTarget()); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/KeeningApparition.java b/Mage.Sets/src/mage/sets/returntoravnica/KeeningApparition.java index 3fef5f94aaa..99256513115 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/KeeningApparition.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/KeeningApparition.java @@ -63,7 +63,7 @@ public class KeeningApparition extends CardImpl { // Sacrifice Keening Apparition: Destroy target enchantment. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(),new SacrificeSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/KnightlyValor.java b/Mage.Sets/src/mage/sets/returntoravnica/KnightlyValor.java index 24eca0c4cd6..26fea7fe6b9 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/KnightlyValor.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/KnightlyValor.java @@ -62,7 +62,7 @@ public class KnightlyValor extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/KorozdaGuildmage.java b/Mage.Sets/src/mage/sets/returntoravnica/KorozdaGuildmage.java index ed869c24efe..738a9454b39 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/KorozdaGuildmage.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/KorozdaGuildmage.java @@ -76,12 +76,12 @@ public class KorozdaGuildmage extends CardImpl { // {1}{B}{G}: Target creature gets +1/+1 and gains intimidate until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1,1, Duration.EndOfTurn),new ManaCostsImpl("{1}{B}{G}")); ability.addEffect(new GainAbilityTargetEffect(IntimidateAbility.getInstance(), Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {2}{B}{G}, Sacrifice a nontoken creature: Put X 1/1 green Saproling creature tokens onto the battlefield, where X is the sacrificed creature's toughness. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken(),new SacrificeCostCreaturesToughness()),new ManaCostsImpl("{2}{B}{G}")); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1,filter, true, true))); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1,filter, true))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/LaunchParty.java b/Mage.Sets/src/mage/sets/returntoravnica/LaunchParty.java index 2ce30a1aa6b..3e3b5dc0b5b 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/LaunchParty.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/LaunchParty.java @@ -49,10 +49,10 @@ public class LaunchParty extends CardImpl { this.color.setBlack(true); // As an additional cost to cast Launch Party, sacrifice a creature. - this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); // Destroy target creature. Its controller loses 2 life. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new LoseLifeTargetControllerEffect(2)); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/MartialLaw.java b/Mage.Sets/src/mage/sets/returntoravnica/MartialLaw.java index 7f72f8254fb..bdafdf1598b 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/MartialLaw.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/MartialLaw.java @@ -60,7 +60,7 @@ public class MartialLaw extends CardImpl { // At the beginning of your upkeep, detain target creature an opponent controls. // (Until your next turn, that creature can't attack or block and its activated abilities can't be activated.) Ability ability = new BeginningOfUpkeepTriggeredAbility(new DetainTargetEffect(), TargetController.YOU, false); - TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true); + TargetCreaturePermanent target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/MercurialChemister.java b/Mage.Sets/src/mage/sets/returntoravnica/MercurialChemister.java index 17860f2fb5e..00e7f9f37fb 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/MercurialChemister.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/MercurialChemister.java @@ -67,7 +67,7 @@ public class MercurialChemister extends CardImpl { // {R}, {T}, Discard a card: Mercurial Chemister deals damage to target creature equal to the discarded card's converted mana cost. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new DiscardCostCardConvertedMana()), new ManaCostsImpl("{R}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/MizziumMortars.java b/Mage.Sets/src/mage/sets/returntoravnica/MizziumMortars.java index e0be1b922f1..6ed8f02bfee 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/MizziumMortars.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/MizziumMortars.java @@ -60,7 +60,7 @@ public class MizziumMortars extends CardImpl { this.color.setRed(true); // MizziumMortars deals 4 damage to target creature you don't control. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DamageTargetEffect(4)); // Overload {3}{R}{R}{R} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.") diff --git a/Mage.Sets/src/mage/sets/returntoravnica/MizziumSkin.java b/Mage.Sets/src/mage/sets/returntoravnica/MizziumSkin.java index 58b94be520e..5c35f8437da 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/MizziumSkin.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/MizziumSkin.java @@ -64,7 +64,7 @@ public class MizziumSkin extends CardImpl { this.color.setBlue(true); // Target creature you control gets +0/+1 and gains hexproof until end of turn. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new BoostTargetEffect(0,1, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HexproofAbility.getInstance(), Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/NewPrahvGuildmage.java b/Mage.Sets/src/mage/sets/returntoravnica/NewPrahvGuildmage.java index a1f2271e58a..d598efa91ab 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/NewPrahvGuildmage.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/NewPrahvGuildmage.java @@ -72,7 +72,7 @@ public class NewPrahvGuildmage extends CardImpl { // {W}{U}: Target creature gains flying until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{W}{U}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {3}{W}{U}: Detain target nonland permanent an opponent controls. diff --git a/Mage.Sets/src/mage/sets/returntoravnica/PsychicSpiral.java b/Mage.Sets/src/mage/sets/returntoravnica/PsychicSpiral.java index cb96acbcde5..8449bf4ab0d 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/PsychicSpiral.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/PsychicSpiral.java @@ -53,7 +53,7 @@ public class PsychicSpiral extends CardImpl { this.color.setBlue(true); // Shuffle all cards from your graveyard into your library. Target player puts that many cards from the top of his or her library into his or her graveyard. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new PsychicSpiralEffect()); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/PursuitOfFlight.java b/Mage.Sets/src/mage/sets/returntoravnica/PursuitOfFlight.java index 890f72e35a0..b3878fb9f19 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/PursuitOfFlight.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/PursuitOfFlight.java @@ -60,7 +60,7 @@ public class PursuitOfFlight extends CardImpl { this.subtype.add("Aura"); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RacecourseFury.java b/Mage.Sets/src/mage/sets/returntoravnica/RacecourseFury.java index f90dfe14929..cfbae2f0c2d 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RacecourseFury.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RacecourseFury.java @@ -73,7 +73,7 @@ public class RacecourseFury extends CardImpl { // Enchanted land has "{T}: Target creature gains haste until end of turn." Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); - gainedAbility.addTarget(new TargetCreaturePermanent(true)); + gainedAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, rule))); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RakdosCharm.java b/Mage.Sets/src/mage/sets/returntoravnica/RakdosCharm.java index b18fdf45943..abc02b708da 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RakdosCharm.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RakdosCharm.java @@ -60,7 +60,7 @@ public class RakdosCharm extends CardImpl { // Choose one — Exile all cards from target player's graveyard; this.getSpellAbility().addEffect(new ExileGraveyardAllTargetPlayerEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); // or destroy target artifact; Mode mode = new Mode(); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RakdossReturn.java b/Mage.Sets/src/mage/sets/returntoravnica/RakdossReturn.java index 83add00ba78..397f6680fd2 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RakdossReturn.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RakdossReturn.java @@ -52,7 +52,7 @@ public class RakdossReturn extends CardImpl { // Rakdos's Return deals X damage to target opponent. That player discards X cards. this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); this.getSpellAbility().addEffect(new DiscardTargetEffect(new ManacostVariableValue())); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); } public RakdossReturn (final RakdossReturn card) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RighteousAuthority.java b/Mage.Sets/src/mage/sets/returntoravnica/RighteousAuthority.java index bd9d33da28c..d9b610d862b 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RighteousAuthority.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RighteousAuthority.java @@ -64,7 +64,7 @@ public class RighteousAuthority extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RitesOfReaping.java b/Mage.Sets/src/mage/sets/returntoravnica/RitesOfReaping.java index 65910b51d7c..c407bc2923f 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RitesOfReaping.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RitesOfReaping.java @@ -56,7 +56,7 @@ public class RitesOfReaping extends CardImpl { // Target creature gets +3/+3 until end of turn. Another target creature gets -3/-3 until end of turn. this.getSpellAbility().addEffect(new RitesOfReapingEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(2, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(2)); } public RitesOfReaping(final RitesOfReaping card) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RixMaadiGuildmage.java b/Mage.Sets/src/mage/sets/returntoravnica/RixMaadiGuildmage.java index d6cc94af359..58abb45cae3 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RixMaadiGuildmage.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RixMaadiGuildmage.java @@ -74,7 +74,7 @@ public class RixMaadiGuildmage extends CardImpl { // {B}{R}: Target blocking creature gets -1/-1 until end of turn. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn),new ManaCostsImpl("{B}{R}")); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); // {B}{R}: Target player who lost life this turn loses 1 life. diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RoguesPassage.java b/Mage.Sets/src/mage/sets/returntoravnica/RoguesPassage.java index dc8deadddb8..74ae0771741 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/RoguesPassage.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/RoguesPassage.java @@ -57,7 +57,7 @@ public class RoguesPassage extends CardImpl { // {4}, {T}: Target creature is unblockable this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UnblockableTargetEffect(), new ManaCostsImpl("{4}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SavageSurge.java b/Mage.Sets/src/mage/sets/returntoravnica/SavageSurge.java index bb90ab92b48..9dd7f3edc11 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SavageSurge.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SavageSurge.java @@ -50,7 +50,7 @@ public class SavageSurge extends CardImpl { this.color.setGreen(true); // Target creature gets +2/+2 until end of turn. Untap that creature. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new UntapTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SearchWarrant.java b/Mage.Sets/src/mage/sets/returntoravnica/SearchWarrant.java index 5c443a09acf..a1934ae916f 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SearchWarrant.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SearchWarrant.java @@ -52,7 +52,7 @@ public class SearchWarrant extends CardImpl { this.color.setWhite(true); // Target player reveals his or her hand. You gain life equal to the number of cards in that player's hand. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new SearchWarrantEffect()); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaCharm.java b/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaCharm.java index b8747e5390e..499257cd46d 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaCharm.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaCharm.java @@ -66,12 +66,12 @@ public class SelesnyaCharm extends CardImpl { // Choose one — Target creature gets +2/+2 and gains trample until end of turn; this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addEffect(new BoostTargetEffect(2,2, Duration.EndOfTurn)); - this.getSpellAbility().getTargets().add(new TargetCreaturePermanent(true)); + this.getSpellAbility().getTargets().add(new TargetCreaturePermanent()); // or exile target creature with power 5 or greater; Mode mode = new Mode(); mode.getEffects().add(new ExileTargetEffect()); - mode.getTargets().add(new TargetCreaturePermanent(filter, true)); + mode.getTargets().add(new TargetCreaturePermanent(filter)); this.getSpellAbility().addMode(mode); // or put a 2/2 white Knight creature token with vigilance onto the battlefield. diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SkymarkRoc.java b/Mage.Sets/src/mage/sets/returntoravnica/SkymarkRoc.java index 17cb4242e25..e28e4f8efb0 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SkymarkRoc.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SkymarkRoc.java @@ -98,7 +98,7 @@ class SkymarkRocAbility extends TriggeredAbilityImpl { filter.add(new ToughnessPredicate(Filter.ComparisonType.LessThan, 3)); this.getTargets().clear(); - TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true); + TargetCreaturePermanent target = new TargetCreaturePermanent(filter); target.setRequired(true); this.addTarget(target); return true; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SlaughterGames.java b/Mage.Sets/src/mage/sets/returntoravnica/SlaughterGames.java index 71766607d11..ec7f2dd1190 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SlaughterGames.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SlaughterGames.java @@ -70,7 +70,7 @@ public class SlaughterGames extends CardImpl { // Name a nonland card. Search target opponent's graveyard, hand, and library for any number of cards with that name and exile them. Then that player shuffles his or her library. this.getSpellAbility().addEffect(new SlaughterGamesEffect()); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SoulswornSpirit.java b/Mage.Sets/src/mage/sets/returntoravnica/SoulswornSpirit.java index 95e03962fa8..921b6e8ed76 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SoulswornSpirit.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SoulswornSpirit.java @@ -69,7 +69,7 @@ public class SoulswornSpirit extends CardImpl { // When Soulsworn Spirit enters the battlefield, detain target creature an opponent controls. //(Until your next turn, that creature can't attack or block and its activated abilities can't be activated.) Ability ability = new EntersBattlefieldTriggeredAbility(new DetainTargetEffect()); - TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true); + TargetCreaturePermanent target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/StabWound.java b/Mage.Sets/src/mage/sets/returntoravnica/StabWound.java index 9eeedd0fe7f..0d1f50440b5 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/StabWound.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/StabWound.java @@ -62,7 +62,7 @@ public class StabWound extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/StreetSpasm.java b/Mage.Sets/src/mage/sets/returntoravnica/StreetSpasm.java index 24b5b1905f6..1c37c26a9cb 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/StreetSpasm.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/StreetSpasm.java @@ -65,7 +65,7 @@ public class StreetSpasm extends CardImpl { this.color.setRed(true); // Street Spasm deals X damage to target creature without flying you don't control. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); // Overload {X}{X}{R}{R} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.") diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SunderingGrowth.java b/Mage.Sets/src/mage/sets/returntoravnica/SunderingGrowth.java index 52d58b53334..8f778c7c43b 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SunderingGrowth.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SunderingGrowth.java @@ -61,7 +61,7 @@ public class SunderingGrowth extends CardImpl { // Destroy target artifact or enchantment, then populate. // (Put a token onto the battlefield that's a copy of a creature token you control.) - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new PopulateEffect("then")); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SwiftJustice.java b/Mage.Sets/src/mage/sets/returntoravnica/SwiftJustice.java index 2594a3993d5..a335c13cfc0 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SwiftJustice.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SwiftJustice.java @@ -52,7 +52,7 @@ public class SwiftJustice extends CardImpl { this.color.setWhite(true); // Until end of turn, target creature gets +1/+0 and gains first strike and lifelink. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); Effect effect = new BoostTargetEffect(1,0,Duration.EndOfTurn); effect.setText("Until end of turn, target creature gets +1/+0"); this.getSpellAbility().addEffect(effect); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Teleportal.java b/Mage.Sets/src/mage/sets/returntoravnica/Teleportal.java index 07147a3f827..5154fb55cba 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Teleportal.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Teleportal.java @@ -70,7 +70,7 @@ public class Teleportal extends CardImpl { this.color.setRed(true); // Target creature you control gets +1/+0 until end of turn and is unblockable this turn. - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(1,0, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new UnblockableTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/TrostanisJudgment.java b/Mage.Sets/src/mage/sets/returntoravnica/TrostanisJudgment.java index 2e2fbe53f41..48787509e39 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/TrostanisJudgment.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/TrostanisJudgment.java @@ -50,7 +50,7 @@ public class TrostanisJudgment extends CardImpl { // Exile target creature, then populate. // (Put a token onto the battlefield that's a copy of a creature token you control.) this.getSpellAbility().addEffect(new ExileTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new PopulateEffect("then")); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/UltimatePrice.java b/Mage.Sets/src/mage/sets/returntoravnica/UltimatePrice.java index 8188c21c729..08208f449cb 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/UltimatePrice.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/UltimatePrice.java @@ -56,7 +56,7 @@ public class UltimatePrice extends CardImpl { this.color.setBlack(true); // Destroy target monocolored creature. - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); this.getSpellAbility().addTarget(target); this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Voidwielder.java b/Mage.Sets/src/mage/sets/returntoravnica/Voidwielder.java index 67036face17..b51971756bb 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/Voidwielder.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/Voidwielder.java @@ -55,7 +55,7 @@ public class Voidwielder extends CardImpl { // When Voidwielder enters the battlefield, you may return target creature to its owner's hand. Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect(), true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/revisededition/DesertTwister.java b/Mage.Sets/src/mage/sets/revisededition/DesertTwister.java index 84be67d8438..a6f9215dd82 100644 --- a/Mage.Sets/src/mage/sets/revisededition/DesertTwister.java +++ b/Mage.Sets/src/mage/sets/revisededition/DesertTwister.java @@ -48,7 +48,7 @@ public class DesertTwister extends CardImpl { // Destroy target permanent. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(true)); + this.getSpellAbility().addTarget(new TargetPermanent()); } public DesertTwister(final DesertTwister card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AffaGuardHound.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AffaGuardHound.java index 4c1cd3a1c3f..42b98038180 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AffaGuardHound.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AffaGuardHound.java @@ -57,7 +57,7 @@ public class AffaGuardHound extends CardImpl { this.addAbility(FlashAbility.getInstance()); Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(0, 3, Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraFinesse.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraFinesse.java index b0ebea87913..46597756a4f 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraFinesse.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraFinesse.java @@ -65,8 +65,8 @@ public class AuraFinesse extends CardImpl { // Attach target Aura you control to target creature. this.getSpellAbility().addEffect(new AuraFinesseEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BalaGedScorpion.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BalaGedScorpion.java index afb5b2e7339..34c765c0e29 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BalaGedScorpion.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BalaGedScorpion.java @@ -61,7 +61,7 @@ public class BalaGedScorpion extends CardImpl { this.toughness = new MageInt(3); EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), true); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BattleRampart.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BattleRampart.java index b5be060ef45..7734e17777b 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BattleRampart.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BattleRampart.java @@ -61,7 +61,7 @@ public class BattleRampart extends CardImpl { SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BattleRattleShaman.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BattleRattleShaman.java index ff60a2f13d2..f1c4db3ab3d 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BattleRattleShaman.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BattleRattleShaman.java @@ -55,7 +55,7 @@ public class BattleRattleShaman extends CardImpl { // At the beginning of combat on your turn, you may have target creature get +2/+0 until end of turn. Ability ability = new BeginningOfCombatTriggeredAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 0, Duration.EndOfTurn), TargetController.YOU, true, false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BearUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BearUmbra.java index 80ba24a3677..eeb8576a493 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BearUmbra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BearUmbra.java @@ -57,7 +57,7 @@ public class BearUmbra extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodriteInvoker.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodriteInvoker.java index 45adba7fb0c..c92030c198d 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodriteInvoker.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodriteInvoker.java @@ -58,7 +58,7 @@ public class BloodriteInvoker extends CardImpl { this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(3), new GenericManaCost(8)); ability.addEffect(new GainLifeEffect(3)); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodthroneVampire.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodthroneVampire.java index cf3cd794b4e..e75960ef25b 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodthroneVampire.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodthroneVampire.java @@ -53,7 +53,7 @@ public class BloodthroneVampire extends CardImpl { this.subtype.add("Vampire"); this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); } public BloodthroneVampire(final BloodthroneVampire card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BoarUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BoarUmbra.java index 3efe66076f9..d2e0344118a 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BoarUmbra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BoarUmbra.java @@ -54,7 +54,7 @@ public class BoarUmbra extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Bramblesnap.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Bramblesnap.java index ec4328bef74..88481046d67 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Bramblesnap.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Bramblesnap.java @@ -58,7 +58,7 @@ public class Bramblesnap extends CardImpl { this.addAbility(TrampleAbility.getInstance()); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), - new TapTargetCost(new TargetControlledCreaturePermanent(true)))); + new TapTargetCost(new TargetControlledCreaturePermanent()))); } public Bramblesnap(final Bramblesnap card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConqueringManticore.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConqueringManticore.java index e17ced92661..7d546640a79 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConqueringManticore.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConqueringManticore.java @@ -62,7 +62,7 @@ public class ConqueringManticore extends CardImpl { Ability ability = new EntersBattlefieldTriggeredAbility(new GainControlTargetEffect(Duration.EndOfTurn), false); ability.addEffect(new UntapTargetEffect()); ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConsumingVapors.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConsumingVapors.java index c7df28a7014..6e6041dd3ca 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConsumingVapors.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConsumingVapors.java @@ -61,7 +61,7 @@ public class ConsumingVapors extends CardImpl { // Target player sacrifices a creature. You gain life equal to that creature's toughness. this.getSpellAbility().addEffect(new ConsumingVaporsEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); // Rebound (If you cast this spell from your hand, exile it as it resolves. At the beginning of your next upkeep, you may cast this card from exile without paying its mana cost.) this.addAbility(new ReboundAbility()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Corpsehatch.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Corpsehatch.java index a2ae4c727f8..5fb3d7ab18e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Corpsehatch.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Corpsehatch.java @@ -58,7 +58,7 @@ public class Corpsehatch extends CardImpl { this.color.setBlack(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new CreateTokenEffect(new EldraziSpawnToken(), 2)); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/CrabUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/CrabUmbra.java index 79b33da0f61..717ee5e646c 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/CrabUmbra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/CrabUmbra.java @@ -58,7 +58,7 @@ public class CrabUmbra extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DawnglareInvoker.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DawnglareInvoker.java index 3aa3ea96353..c6ace5049ed 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DawnglareInvoker.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DawnglareInvoker.java @@ -66,7 +66,7 @@ public class DawnglareInvoker extends CardImpl { SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DawnglareInvokerEffect(), new ManaCostsImpl("{8}")); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DeathCultist.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DeathCultist.java index b285a369b3a..28b5e5f567c 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DeathCultist.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DeathCultist.java @@ -60,7 +60,7 @@ public class DeathCultist extends CardImpl { new LoseLifeTargetEffect(1), new SacrificeSourceCost()); ability.addEffect(new GainLifeEffect(1)); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DeathlessAngel.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DeathlessAngel.java index 348f0ff2c32..9baaec567ec 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DeathlessAngel.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DeathlessAngel.java @@ -64,7 +64,7 @@ public class DeathlessAngel extends CardImpl { Effect effect = new GainAbilityTargetEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn, "Target creature is indestructible this turn"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{W}{W}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DemonicAppetite.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DemonicAppetite.java index fb14f47c1f6..807170b68ff 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DemonicAppetite.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DemonicAppetite.java @@ -54,7 +54,7 @@ public class DemonicAppetite extends CardImpl { this.subtype.add("Aura"); this.color.setBlack(true); - TargetPermanent auraTarget = new TargetControlledCreaturePermanent(true); + TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); @@ -66,7 +66,7 @@ public class DemonicAppetite extends CardImpl { new DemonicAppetiteEffect(), TargetController.YOU, false); - ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DistortionStrike.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DistortionStrike.java index a52d1eb2e16..3c9464310a8 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DistortionStrike.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DistortionStrike.java @@ -51,7 +51,7 @@ public class DistortionStrike extends CardImpl { this.color.setBlue(true); // Target creature gets +1/+0 until end of turn and is unblockable this turn. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(1, 0, Duration.EndOfTurn)); Effect effect = new UnblockableTargetEffect(); effect.setText("and is unblockable this turn"); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Domestication.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Domestication.java index 95e27b7ead8..9c659b421bb 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Domestication.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Domestication.java @@ -63,7 +63,7 @@ public class Domestication extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DrakeUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DrakeUmbra.java index 373ce019ef1..b22a1f8bdae 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DrakeUmbra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DrakeUmbra.java @@ -56,7 +56,7 @@ public class DrakeUmbra extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DranaKalastriaBloodchief.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DranaKalastriaBloodchief.java index 057d7db77de..e9ca35cd5dc 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DranaKalastriaBloodchief.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DranaKalastriaBloodchief.java @@ -66,7 +66,7 @@ public class DranaKalastriaBloodchief extends CardImpl { this.addAbility(FlyingAbility.getInstance()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(new StaticValue(0), new SignInversionDynamicValue(new ManacostVariableValue()), Duration.EndOfTurn), new ManaCostsImpl("{X}{B}{B}")); ability.addEffect(new BoostSourceEffect(new ManacostVariableValue(), new StaticValue(0), Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EelUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EelUmbra.java index b0515575538..550191bc434 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EelUmbra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EelUmbra.java @@ -56,7 +56,7 @@ public class EelUmbra extends CardImpl { this.addAbility(FlashAbility.getInstance()); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ElandUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ElandUmbra.java index f5fe581d6b8..79dc30b3a6e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ElandUmbra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ElandUmbra.java @@ -54,7 +54,7 @@ public class ElandUmbra extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EldraziConscription.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EldraziConscription.java index 8cdd59107a6..92753d37f4b 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EldraziConscription.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EldraziConscription.java @@ -60,7 +60,7 @@ public class EldraziConscription extends CardImpl { this.subtype.add("Eldrazi"); this.subtype.add("Aura"); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmergeUnscathed.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmergeUnscathed.java index f85066ebc2c..7fbfb4be0a5 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmergeUnscathed.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmergeUnscathed.java @@ -52,7 +52,7 @@ public class EmergeUnscathed extends CardImpl { // Target creature you control gains protection from the color of your choice until end of turn. this.getSpellAbility().addEffect(new GainProtectionFromColorTargetEffect(Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); this.getSpellAbility().addChoice(new ChoiceColor()); // Rebound diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EssenceFeed.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EssenceFeed.java index 7440f258082..65331c254c5 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EssenceFeed.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EssenceFeed.java @@ -51,7 +51,7 @@ public class EssenceFeed extends CardImpl { this.getSpellAbility().addEffect(new LoseLifeTargetEffect(3)); this.getSpellAbility().addEffect(new GainLifeEffect(3)); this.getSpellAbility().addEffect(new CreateTokenEffect(new EldraziSpawnToken(), 3)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public EssenceFeed (final EssenceFeed card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ExplosiveRevelation.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ExplosiveRevelation.java index eb8c84f718a..f09add4d9db 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ExplosiveRevelation.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ExplosiveRevelation.java @@ -58,7 +58,7 @@ public class ExplosiveRevelation extends CardImpl { // Choose target creature or player. Reveal cards from the top of your library until you reveal a nonland card. Explosive Revelation deals damage equal to that card's converted mana cost to that creature or player. Put the nonland card into your hand and the rest on the bottom of your library in any order. this.getSpellAbility().addEffect(new ExplosiveRevelationEffect()); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); } public ExplosiveRevelation(final ExplosiveRevelation card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/FlameSlash.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/FlameSlash.java index c21a3085532..c25e4999545 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/FlameSlash.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/FlameSlash.java @@ -45,7 +45,7 @@ public class FlameSlash extends CardImpl { super(ownerId, 145, "Flame Slash", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{R}"); this.expansionSetCode = "ROE"; this.color.setRed(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DamageTargetEffect(4)); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/FleetingDistraction.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/FleetingDistraction.java index 8af8a1b9b60..0ff101f35db 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/FleetingDistraction.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/FleetingDistraction.java @@ -50,7 +50,7 @@ public class FleetingDistraction extends CardImpl { this.color.setBlue(true); this.getSpellAbility().addEffect(new BoostTargetEffect(-1, 0, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public FleetingDistraction (final FleetingDistraction card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java index 591d1404315..8d4694c3c47 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java @@ -72,11 +72,11 @@ public class GideonJura extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(6)), false)); LoyaltyAbility ability1 = new LoyaltyAbility(new GideonJuraEffect(), 2); - ability1.addTarget(new TargetOpponent(true)); + ability1.addTarget(new TargetOpponent()); this.addAbility(ability1); LoyaltyAbility ability2 = new LoyaltyAbility(new DestroyTargetEffect(), -2); - ability2.addTarget(new TargetCreaturePermanent(filter, true)); + ability2.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability2); LoyaltyAbility ability3 = new LoyaltyAbility(new BecomesCreatureSourceEffect(new GideonJuraToken(), "planeswalker", Duration.EndOfTurn), 0); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Gigantomancer.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Gigantomancer.java index f417a3984c8..b6232c5155e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Gigantomancer.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Gigantomancer.java @@ -57,7 +57,7 @@ public class Gigantomancer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SetPowerToughnessTargetEffect(7, 7, Duration.EndOfTurn), new GenericManaCost(1)); - ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinTunneler.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinTunneler.java index a857dc7985b..f118ff9b576 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinTunneler.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinTunneler.java @@ -66,7 +66,7 @@ public class GoblinTunneler extends CardImpl { // {tap}: Target creature with power 2 or less is unblockable this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UnblockableTargetEffect(), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GrotagSiegeRunner.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GrotagSiegeRunner.java index bffe6a295bb..4da2f2d170b 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GrotagSiegeRunner.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GrotagSiegeRunner.java @@ -73,7 +73,7 @@ public class GrotagSiegeRunner extends CardImpl { // {R}, Sacrifice Grotag Siege-Runner: Destroy target creature with defender. Grotag Siege-Runner deals 2 damage to that creature's controller. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{R}")); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); ability.addEffect(new GrotageSiegeRunnerEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuardDuty.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuardDuty.java index 62163a795cb..560c43a1c0b 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuardDuty.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuardDuty.java @@ -53,7 +53,7 @@ public class GuardDuty extends CardImpl { this.subtype.add("Aura"); this.color.setWhite(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuulDrazAssassin.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuulDrazAssassin.java index 10cfbea4404..ab413234b74 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuulDrazAssassin.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuulDrazAssassin.java @@ -66,13 +66,13 @@ public class GuulDrazAssassin extends LevelerCard { Abilities abilities1 = new AbilitiesImpl(); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl("{B}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); abilities1.add(ability); Abilities abilities2 = new AbilitiesImpl(); Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-4, -4, Duration.EndOfTurn), new ManaCostsImpl("{B}")); - ability2.addTarget(new TargetCreaturePermanent(true)); + ability2.addTarget(new TargetCreaturePermanent()); ability2.addCost(new TapSourceCost()); abilities2.add(ability2); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HeatRay.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HeatRay.java index b8f300e6d77..4e33df0b4fe 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HeatRay.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HeatRay.java @@ -48,7 +48,7 @@ public class HeatRay extends CardImpl { this.color.setRed(true); this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public HeatRay(final HeatRay card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HyenaUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HyenaUmbra.java index 846c3d58dab..26390441194 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/HyenaUmbra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/HyenaUmbra.java @@ -56,7 +56,7 @@ public class HyenaUmbra extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/InduceDespair.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/InduceDespair.java index efbf3695e3f..749695c3403 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/InduceDespair.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/InduceDespair.java @@ -60,7 +60,7 @@ public class InduceDespair extends CardImpl { // Target creature gets -X/-X until end of turn, where X is the revealed card's converted mana cost. this.getSpellAbility().addEffect(new InduceDespairEffect()); this.getSpellAbility().addCost(new RevealTargetFromHandCost(new TargetCardInHand(filter))); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public InduceDespair(final InduceDespair card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/InquisitionOfKozilek.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/InquisitionOfKozilek.java index 7c27bae2542..c38f1206769 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/InquisitionOfKozilek.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/InquisitionOfKozilek.java @@ -58,7 +58,7 @@ public class InquisitionOfKozilek extends CardImpl { super(ownerId, 115, "Inquisition of Kozilek", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY},"{B}"); this.expansionSetCode = "ROE"; this.color.setBlack(true); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(filter, TargetController.ANY)); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/IrresistiblePrey.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/IrresistiblePrey.java index edcde342231..9641bdc65db 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/IrresistiblePrey.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/IrresistiblePrey.java @@ -57,7 +57,7 @@ public class IrresistiblePrey extends CardImpl { new GainAbilityTargetEffect( new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAtLeastOneTargetEffect()), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/JaddiLifestrider.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/JaddiLifestrider.java index 0de283e4efd..d6a3edc3d97 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/JaddiLifestrider.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/JaddiLifestrider.java @@ -97,7 +97,7 @@ class JaddiLifestriderEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { int tappedAmount = 0; Player you = game.getPlayer(source.getControllerId()); - TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true); + TargetCreaturePermanent target = new TargetCreaturePermanent(filter); while (true) { target.clearChosen(); if (target.canChoose(source.getControllerId(), game) && target.choose(Outcome.Tap, source.getControllerId(), source.getSourceId(), game)) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KeeningStone.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KeeningStone.java index 7871018dfb2..cc5a39bd65a 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KeeningStone.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KeeningStone.java @@ -57,7 +57,7 @@ public class KeeningStone extends CardImpl { // {5}, {tap}: Target player puts the top X cards of his or her library into his or her graveyard, where X is the number of cards in that player's graveyard. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new KeeningStoneEffect(), new GenericManaCost(5)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorLineSlinger.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorLineSlinger.java index 8705ec36917..e94f046638f 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorLineSlinger.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorLineSlinger.java @@ -65,7 +65,7 @@ public class KorLineSlinger extends CardImpl { this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LastKiss.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LastKiss.java index 687d8e1b6d9..2e51c50e0b3 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LastKiss.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LastKiss.java @@ -48,7 +48,7 @@ public class LastKiss extends CardImpl { this.color.setBlack(true); this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellAbility().addEffect(new GainLifeEffect(2)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public LastKiss (final LastKiss card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LeafArrow.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LeafArrow.java index 238ac3f3905..4eb12335331 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LeafArrow.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LeafArrow.java @@ -55,7 +55,7 @@ public class LeafArrow extends CardImpl { this.color.setGreen(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DamageTargetEffect(3)); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LuminousWake.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LuminousWake.java index ec8324d680b..a15773efca9 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LuminousWake.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LuminousWake.java @@ -56,7 +56,7 @@ public class LuminousWake extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LustForWar.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LustForWar.java index 31482ed8a5b..a443932b0e8 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LustForWar.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LustForWar.java @@ -56,7 +56,7 @@ public class LustForWar extends CardImpl { this.color.setRed(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MammothUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MammothUmbra.java index 598562d112d..18287b23a29 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MammothUmbra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MammothUmbra.java @@ -56,7 +56,7 @@ public class MammothUmbra extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MerfolkObserver.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MerfolkObserver.java index 6161b768a37..a975724228f 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MerfolkObserver.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MerfolkObserver.java @@ -60,7 +60,7 @@ public class MerfolkObserver extends CardImpl { // When Merfolk Observer enters the battlefield, look at the top card of target player's library. EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new MerfolkObserverEffect()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MerfolkSkyscout.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MerfolkSkyscout.java index 0d32dfef071..6343ad7026a 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MerfolkSkyscout.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MerfolkSkyscout.java @@ -55,7 +55,7 @@ public class MerfolkSkyscout extends CardImpl { this.addAbility(FlyingAbility.getInstance()); AttacksOrBlocksTriggeredAbility ability = new AttacksOrBlocksTriggeredAbility(new UntapTargetEffect(), false); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MightOfTheMasses.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MightOfTheMasses.java index f4f958bbb9f..2ac8c44c1e4 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MightOfTheMasses.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MightOfTheMasses.java @@ -50,7 +50,7 @@ public class MightOfTheMasses extends CardImpl { this.color.setGreen(true); PermanentsOnBattlefieldCount value = new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(value, value, Duration.EndOfTurn, true)); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MomentousFall.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MomentousFall.java index a2fb0cb152e..96bd1ca94e2 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MomentousFall.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MomentousFall.java @@ -53,7 +53,7 @@ public class MomentousFall extends CardImpl { this.color.setGreen(true); // As an additional cost to cast Momentous Fall, sacrifice a creature. - this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); // You draw cards equal to the sacrificed creature's power, then you gain life equal to its toughness. this.getSpellAbility().addEffect(new MomentousFallEffect()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Narcolepsy.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Narcolepsy.java index fb9beb952dc..1a0e389c0b7 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Narcolepsy.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Narcolepsy.java @@ -61,7 +61,7 @@ public class Narcolepsy extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetPermanent(filter, true); + TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); EnchantAbility ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Nighthaze.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Nighthaze.java index 36086418045..fc1dd93e661 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Nighthaze.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Nighthaze.java @@ -51,7 +51,7 @@ public class Nighthaze extends CardImpl { this.color.setBlack(true); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(new SwampwalkAbility(), Duration.EndOfTurn)); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public Nighthaze (final Nighthaze card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Oust.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Oust.java index 7ce3d7723f6..c52ab425cbb 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Oust.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Oust.java @@ -55,7 +55,7 @@ public class Oust extends CardImpl { // Put target creature into its owner's library second from the top. Its controller gains 3 life. this.getSpellAbility().addEffect(new OustEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public Oust(final Oust card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PerishTheThought.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PerishTheThought.java index cf96eb0036d..80b037ca5c4 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PerishTheThought.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PerishTheThought.java @@ -57,7 +57,7 @@ public class PerishTheThought extends CardImpl { // Target opponent reveals his or her hand. You choose a card from it. That player shuffles that card into his or her library. this.getSpellAbility().addEffect(new PerishTheThoughtEffect()); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); } public PerishTheThought(final PerishTheThought card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PreysVengeance.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PreysVengeance.java index 654e16540d4..8301cc93a81 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PreysVengeance.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PreysVengeance.java @@ -49,7 +49,7 @@ public class PreysVengeance extends CardImpl { this.expansionSetCode = "ROE"; this.color.setGreen(true); this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.addAbility(new ReboundAbility()); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PuncturingLight.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PuncturingLight.java index afa51ac6b7d..1a59af03f60 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PuncturingLight.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PuncturingLight.java @@ -56,7 +56,7 @@ public class PuncturingLight extends CardImpl { this.color.setWhite(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RageNimbus.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RageNimbus.java index f19aee5b7a6..07e84fad38f 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RageNimbus.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RageNimbus.java @@ -61,7 +61,7 @@ public class RageNimbus extends CardImpl { SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttacksIfAbleTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{1}{R}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RecurringInsight.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RecurringInsight.java index 6d7044503f6..e2bfab453be 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RecurringInsight.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RecurringInsight.java @@ -82,7 +82,7 @@ class RecurringInsightEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - TargetOpponent target = new TargetOpponent(true); + TargetOpponent target = new TargetOpponent(); Player you = game.getPlayer(source.getControllerId()); if (target.canChoose(source.getSourceId(), source.getControllerId(), game)) { you.chooseTarget(Outcome.DrawCard, target, source, game); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SarkhanTheMad.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SarkhanTheMad.java index 4b2f42641a3..f24ea04a61e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SarkhanTheMad.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SarkhanTheMad.java @@ -72,13 +72,13 @@ public class SarkhanTheMad extends CardImpl { this.addAbility(new LoyaltyAbility(new SarkhanTheMadRevealAndDrawEffect(), 0)); - Target targetCreature = new TargetCreaturePermanent(true); + Target targetCreature = new TargetCreaturePermanent(); Ability sacAbility = new LoyaltyAbility(new SarkhanTheMadSacEffect(), -2); sacAbility.addTarget(targetCreature); this.addAbility(sacAbility); Ability damageAbility = new LoyaltyAbility(new SarkhanTheMadDragonDamageEffect(), -4); - damageAbility.addTarget(new TargetPlayer(true)); + damageAbility.addTarget(new TargetPlayer()); this.addAbility(damageAbility); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Smite.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Smite.java index 439df00b48c..ec38b2c83e2 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Smite.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Smite.java @@ -55,7 +55,7 @@ public class Smite extends CardImpl { this.color.setWhite(true); // Destroy target blocked creature. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect(false)); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SnakeUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SnakeUmbra.java index 09b088aceb5..3380471a66c 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SnakeUmbra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SnakeUmbra.java @@ -57,7 +57,7 @@ public class SnakeUmbra extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SpiderUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SpiderUmbra.java index 2c7f69e8119..ecc85bb62a1 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SpiderUmbra.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SpiderUmbra.java @@ -56,7 +56,7 @@ public class SpiderUmbra extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SplinterTwin.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SplinterTwin.java index c5e14e208ad..7a139f7bb00 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SplinterTwin.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SplinterTwin.java @@ -68,7 +68,7 @@ public class SplinterTwin extends CardImpl { this.color.setRed(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SufferThePast.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SufferThePast.java index 4219068eeaf..dac5f741d92 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SufferThePast.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SufferThePast.java @@ -57,7 +57,7 @@ public class SufferThePast extends CardImpl { // Exile X target cards from target player's graveyard. For each card exiled this way, that player loses 1 life and you gain 1 life. this.getSpellAbility().addEffect(new SufferThePastEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public SufferThePast(final SufferThePast card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TraitorousInstinct.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TraitorousInstinct.java index db5d6b84ce8..4a054dfef4e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TraitorousInstinct.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TraitorousInstinct.java @@ -51,7 +51,7 @@ public class TraitorousInstinct extends CardImpl { this.color.setRed(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new UntapTargetEffect()); this.getSpellAbility().addEffect(new BoostTargetEffect(2, 0, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/UlamogTheInfiniteGyre.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/UlamogTheInfiniteGyre.java index 1fc1440f0d6..9539da4bd14 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/UlamogTheInfiniteGyre.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/UlamogTheInfiniteGyre.java @@ -89,7 +89,7 @@ class UlamogTheInfiniteGyreDestroyOnCastAbility extends TriggeredAbilityImpl { UlamogTheInfiniteGyreDestroyOnCastAbility ( ) { super(Zone.STACK, new DestroyTargetEffect()); - this.addTarget(new TargetPermanent(true)); + this.addTarget(new TargetPermanent()); } UlamogTheInfiniteGyreDestroyOnCastAbility(UlamogTheInfiniteGyreDestroyOnCastAbility ability) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vendetta.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vendetta.java index 4f0a48811a7..f94f9103b69 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vendetta.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vendetta.java @@ -65,7 +65,7 @@ public class Vendetta extends CardImpl { this.color.setBlack(true); // Destroy target nonblack creature. It can't be regenerated. You lose life equal to that creature's toughness. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); this.getSpellAbility().addEffect(new VendettaEffect()); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/VentSentinel.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/VentSentinel.java index 36fa8b040cb..559da4fd1b8 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/VentSentinel.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/VentSentinel.java @@ -65,7 +65,7 @@ public class VentSentinel extends CardImpl { this.addAbility(DefenderAbility.getInstance()); SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)), new ManaCostsImpl("{1}{R}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/VirulentSwipe.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/VirulentSwipe.java index 62345b9fb1a..70a66db142d 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/VirulentSwipe.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/VirulentSwipe.java @@ -52,7 +52,7 @@ public class VirulentSwipe extends CardImpl { this.color.setBlack(true); // Target creature gets +2/+0 and gains deathtouch until end of turn. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); Effect effect = new BoostTargetEffect(2, 0, Duration.EndOfTurn); effect.setText("Target creature gets +2/+0"); this.getSpellAbility().addEffect(effect); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/WildheartInvoker.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/WildheartInvoker.java index bdd7164ab42..b813b3d8a71 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/WildheartInvoker.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/WildheartInvoker.java @@ -60,7 +60,7 @@ public class WildheartInvoker extends CardImpl { SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(5, 5, Duration.EndOfTurn), new ManaCostsImpl("{8}")); ability.addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/AkkiDrillmaster.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/AkkiDrillmaster.java index 9a109a7dfbe..a26c47a5b7d 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/AkkiDrillmaster.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/AkkiDrillmaster.java @@ -58,7 +58,7 @@ public class AkkiDrillmaster extends CardImpl { this.toughness = new MageInt(2); // {tap}: Target creature gains haste until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/BarrelDownSokenzan.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/BarrelDownSokenzan.java index 9397cdef358..c93a682729c 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/BarrelDownSokenzan.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/BarrelDownSokenzan.java @@ -56,7 +56,7 @@ public class BarrelDownSokenzan extends CardImpl { this.getSpellAbility().addEffect(new SweepEffect("Mountain")); DynamicValue sweepValue = new MultipliedValue(new SweepNumber("Mountain", false), 2); this.getSpellAbility().addEffect(new DamageTargetEffect(sweepValue)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public BarrelDownSokenzan(final BarrelDownSokenzan card) { diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/BloodClock.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/BloodClock.java index 94edede5f8b..9751ecb7bb8 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/BloodClock.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/BloodClock.java @@ -96,7 +96,7 @@ class BloodClockEffect extends OneShotEffect { game.informPlayers(player.getName() + " pays 2 life. He will not return a permanent he or she controls."); return true; } else { - Target target = new TargetControlledPermanent(true); + Target target = new TargetControlledPermanent(); if (target.canChoose(source.getSourceId(), player.getId(), game) && player.chooseTarget(outcome, target, source, game)) { Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent != null) { diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/BriarknitKami.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/BriarknitKami.java index 883ddbfab4f..9e7e0b3c932 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/BriarknitKami.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/BriarknitKami.java @@ -56,7 +56,7 @@ public class BriarknitKami extends CardImpl { this.toughness = new MageInt(3); // Whenever you cast a Spirit or Arcane spell, put a +1/+1 counter on target creature. Ability ability = new SpellCastControllerTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), filter, false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/CaptiveFlame.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/CaptiveFlame.java index 8bd0f3d63c5..75b39fc9284 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/CaptiveFlame.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/CaptiveFlame.java @@ -49,7 +49,7 @@ public class CaptiveFlame extends CardImpl { this.color.setRed(true); // {R}: Target creature gets +1/+0 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ChoiceOfDamnations.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ChoiceOfDamnations.java index 43363b4e89c..e43b46e1f2c 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ChoiceOfDamnations.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ChoiceOfDamnations.java @@ -58,7 +58,7 @@ public class ChoiceOfDamnations extends CardImpl { // Target opponent chooses a number. You may have that player lose that much life. If you don't, that player sacrifices all but that many permanents. this.getSpellAbility().addEffect(new ChoiceOfDamnationsEffect()); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); } public ChoiceOfDamnations(final ChoiceOfDamnations card) { diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/CloudhoofKirin.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/CloudhoofKirin.java index a5c211a2f38..d793bf561bc 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/CloudhoofKirin.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/CloudhoofKirin.java @@ -67,7 +67,7 @@ public class CloudhoofKirin extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Whenever you cast a Spirit or Arcane spell, you may have target player put the top X cards of his or her library into his or her graveyard, where X is that spell's converted mana cost. Ability ability = new SpellCastControllerTriggeredAbility(Zone.BATTLEFIELD, new CloudhoofKirinEffect(), new FilterSpiritOrArcaneCard(), true, true); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/CutTheEarthlyBond.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/CutTheEarthlyBond.java index b718bfa28d3..70cd862795b 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/CutTheEarthlyBond.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/CutTheEarthlyBond.java @@ -57,7 +57,7 @@ public class CutTheEarthlyBond extends CardImpl { // Return target enchanted permanent to its owner's hand. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); - Target target = new TargetPermanent(filter, true); + Target target = new TargetPermanent(filter); target.setRequired(true); this.getSpellAbility().addTarget(target); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/EternalDominion.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/EternalDominion.java index 703e6d609ec..ed5d6ea273a 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/EternalDominion.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/EternalDominion.java @@ -61,7 +61,7 @@ public class EternalDominion extends CardImpl { // Search target opponent's library for an artifact, creature, enchantment, or land card. // Put that card onto the battlefield under your control. Then that player shuffles his or her library. this.getSpellAbility().addEffect(new EternalDominionEffect()); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); // Epic this.getSpellAbility().addEffect(new EpicEffect()); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/FreedFromTheReal.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/FreedFromTheReal.java index ebf05f86325..c9f80dc8bbf 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/FreedFromTheReal.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/FreedFromTheReal.java @@ -55,7 +55,7 @@ public class FreedFromTheReal extends CardImpl { this.color.setBlue(true); this.subtype.add("Aura"); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Untap)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitNourisher.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitNourisher.java index 78ea06de4c7..ec9dcfc8221 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitNourisher.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitNourisher.java @@ -64,7 +64,7 @@ public class GhostLitNourisher extends CardImpl { this.addAbility(ability); // Channel - {3}{G}, Discard Ghost-Lit Nourisher: Target creature gets +4/+4 until end of turn. Ability ability2 = new ChannelAbility("{3}{G}", new BoostTargetEffect(4, 4, Duration.EndOfTurn)); - ability2.addTarget(new TargetCreaturePermanent(true)); + ability2.addTarget(new TargetCreaturePermanent()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitRaider.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitRaider.java index f62b9821a76..6049c92472c 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitRaider.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitRaider.java @@ -59,11 +59,11 @@ public class GhostLitRaider extends CardImpl { // {2}{R}, {tap}: Ghost-Lit Raider deals 2 damage to target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{2}{R}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Channel - {3}{R}, Discard Ghost-Lit Raider: Ghost-Lit Raider deals 4 damage to target creature. Ability ability2 = new ChannelAbility("{3}{R}", new DamageTargetEffect(4)); - ability2.addTarget(new TargetCreaturePermanent(true)); + ability2.addTarget(new TargetCreaturePermanent()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitStalker.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitStalker.java index 3de2765d5f5..47aceabea15 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitStalker.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitStalker.java @@ -61,11 +61,11 @@ public class GhostLitStalker extends CardImpl { // {4}{B}, {tap}: Target player discards two cards. Activate this ability only any time you could cast a sorcery. Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(2),new ManaCostsImpl("{4}{B}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); // Channel - {5}{B}{B}, Discard Ghost-Lit Stalker: Target player discards four cards. Activate this ability only any time you could cast a sorcery. Ability ability2 = new ChannelAbility("{5}{B}{B}", new DiscardTargetEffect(4), TimingRule.SORCERY); - ability2.addTarget(new TargetPlayer(true)); + ability2.addTarget(new TargetPlayer()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GodosIrregulars.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GodosIrregulars.java index 08ece15cfac..2206574414f 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GodosIrregulars.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GodosIrregulars.java @@ -69,7 +69,7 @@ public class GodosIrregulars extends CardImpl { // {R}: Godo's Irregulars deals 1 damage to target creature blocking it. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{R")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } @@ -79,7 +79,7 @@ public class GodosIrregulars extends CardImpl { ability.getTargets().clear(); FilterCreaturePermanent filter = basicFilter.copy(); filter.add(new BlockingAttackerIdPredicate(this.getId())); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); ability.addTarget(target); } } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/HidetsugusSecondRite.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/HidetsugusSecondRite.java index 68aad17a714..ef6773fb151 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/HidetsugusSecondRite.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/HidetsugusSecondRite.java @@ -52,7 +52,7 @@ public class HidetsugusSecondRite extends CardImpl { // If target player has exactly 10 life, Hidetsugu's Second Rite deals 10 damage to that player. this.getSpellAbility().addEffect(new HidetsugusSecondRiteEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public HidetsugusSecondRite(final HidetsugusSecondRite card) { diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/InfernalKirin.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/InfernalKirin.java index 24f21602ed1..d5092050e40 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/InfernalKirin.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/InfernalKirin.java @@ -68,7 +68,7 @@ public class InfernalKirin extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Whenever you cast a Spirit or Arcane spell, target player reveals his or her hand and discards all cards with that spell's converted mana cost. Ability ability = new SpellCastControllerTriggeredAbility(Zone.BATTLEFIELD, new InfernalKirinEffect(), new FilterSpiritOrArcaneCard(), false, true); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KemuriOnna.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KemuriOnna.java index 1e8cc34252b..ef3d67f80a9 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KemuriOnna.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KemuriOnna.java @@ -58,7 +58,7 @@ public class KemuriOnna extends CardImpl { // When Kemuri-Onna enters the battlefield, target player discards a card. Ability ability = new EntersBattlefieldTriggeredAbility(new DiscardTargetEffect(1), false); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); // Whenever you cast a Spirit or Arcane spell, you may return Kemuri-Onna to its owner's hand. this.addAbility(new SpellCastControllerTriggeredAbility(new ReturnToHandSourceEffect(), filter, true)); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KiriOnna.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KiriOnna.java index 55853eb94e1..0be4e84e03b 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KiriOnna.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KiriOnna.java @@ -58,7 +58,7 @@ public class KiriOnna extends CardImpl { // When Kiri-Onna enters the battlefield, return target creature to its owner's hand. Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect(), false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Whenever you cast a Spirit or Arcane spell, you may return Kiri-Onna to its owner's hand. this.addAbility(new SpellCastControllerTriggeredAbility(new ReturnToHandSourceEffect(), filter, true)); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KitsuneDawnblade.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KitsuneDawnblade.java index d4a202c7d83..23d8f0d1dd6 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KitsuneDawnblade.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KitsuneDawnblade.java @@ -55,7 +55,7 @@ public class KitsuneDawnblade extends CardImpl { this.addAbility(new BushidoAbility(1)); // When Kitsune Dawnblade enters the battlefield, you may tap target creature. Ability ability = new EntersBattlefieldTriggeredAbility(new TapTargetEffect(), true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ManrikiGusari.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ManrikiGusari.java index 89f7f46129b..4a7a259d4ad 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ManrikiGusari.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ManrikiGusari.java @@ -63,7 +63,7 @@ public class ManrikiGusari extends CardImpl { // Equipped creature gets +1/+2 and has "{tap}: Destroy target Equipment." this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 2))); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); - gainedAbility.addTarget(new TargetPermanent(filter, true)); + gainedAbility.addTarget(new TargetPermanent(filter)); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.EQUIPMENT))); // Equip {1} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(1))); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MoltingSkin.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MoltingSkin.java index 0f8f54ee4b8..afd3627ccd9 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MoltingSkin.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MoltingSkin.java @@ -51,7 +51,7 @@ public class MoltingSkin extends CardImpl { this.color.setGreen(true); // Return Molting Skin to its owner's hand: Regenerate target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ReturnToHandSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/NeverendingTorment.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/NeverendingTorment.java index d38d7828afa..b3b9958e231 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/NeverendingTorment.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/NeverendingTorment.java @@ -60,7 +60,7 @@ public class NeverendingTorment extends CardImpl { // Search target player's library for X cards, where X is the number of cards in your hand, and exile them. Then that player shuffles his or her library. this.getSpellAbility().addEffect(new NeverendingTormentEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); // Epic this.getSpellAbility().addEffect(new EpicEffect()); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/PlowThroughReito.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/PlowThroughReito.java index 1331fdd443c..9dd5f76c8fc 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/PlowThroughReito.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/PlowThroughReito.java @@ -55,7 +55,7 @@ public class PlowThroughReito extends CardImpl { this.getSpellAbility().addEffect(new SweepEffect("Plains")); DynamicValue sweepValue = new SweepNumber("Plains", true); this.getSpellAbility().addEffect(new BoostTargetEffect(sweepValue, sweepValue, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public PlowThroughReito(final PlowThroughReito card) { diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfFearsChill.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfFearsChill.java index 156f284b3f3..2ff9127c8b9 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfFearsChill.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfFearsChill.java @@ -60,7 +60,7 @@ public class ShinenOfFearsChill extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockSourceEffect(Duration.WhileOnBattlefield))); // Channel - {1}{B}, Discard Shinen of Fear's Chill: Target creature can't block this turn. Ability ability = new ChannelAbility("{1}{B}", new CantBlockTargetEffect(Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfFlightsWings.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfFlightsWings.java index 23490fdb09d..ef43b518a2c 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfFlightsWings.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfFlightsWings.java @@ -58,7 +58,7 @@ public class ShinenOfFlightsWings extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Channel - {U}, Discard Shinen of Flight's Wings: Target creature gains flying until end of turn. Ability ability = new ChannelAbility("{U}", new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfFurysFire.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfFurysFire.java index 406d5cb0aa1..5e6119f6178 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfFurysFire.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfFurysFire.java @@ -58,7 +58,7 @@ public class ShinenOfFurysFire extends CardImpl { this.addAbility(HasteAbility.getInstance()); // Channel - {R}, Discard Shinen of Fury's Fire: Target creature gains haste until end of turn. Ability ability = new ChannelAbility("{R}", new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfLifesRoar.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfLifesRoar.java index 44f0c7e8318..d0564232610 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfLifesRoar.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfLifesRoar.java @@ -60,7 +60,7 @@ public class ShinenOfLifesRoar extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAllSourceEffect())); // Channel - {2}{G}{G}, Discard Shinen of Life's Roar: All creatures able to block target creature this turn do so. Ability ability = new ChannelAbility("{2}{G}{G}", new MustBeBlockedByAllTargetEffect(Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfStarsLight.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfStarsLight.java index f8ae9eadb36..99b2c75b31e 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfStarsLight.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfStarsLight.java @@ -58,7 +58,7 @@ public class ShinenOfStarsLight extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // Channel - {1}{W}, Discard Shinen of Stars' Light: Target creature gains first strike until end of turn. Ability ability = new ChannelAbility("{1}{W}", new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SinkIntoTakenuma.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SinkIntoTakenuma.java index a5d3691f613..e51e9ab5bf6 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SinkIntoTakenuma.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SinkIntoTakenuma.java @@ -54,7 +54,7 @@ public class SinkIntoTakenuma extends CardImpl { this.getSpellAbility().addEffect(new SweepEffect("Swamp")); DynamicValue sweepValue = new SweepNumber("Swamp", false); this.getSpellAbility().addEffect(new DiscardTargetEffect(sweepValue)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public SinkIntoTakenuma(final SinkIntoTakenuma card) { diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SkyfireKirin.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SkyfireKirin.java index 12368039db3..9d296aec8cb 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SkyfireKirin.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SkyfireKirin.java @@ -75,7 +75,7 @@ public class SkyfireKirin extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Whenever you cast a Spirit or Arcane spell, you may gain control of target creature with that spell's converted mana cost until end of turn. Ability ability = new SpellCastControllerTriggeredAbility(Zone.BATTLEFIELD, new SkyfireKirinEffect(), new FilterSpiritOrArcaneCard(), true, true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } @@ -87,7 +87,7 @@ public class SkyfireKirin extends CardImpl { int cmc = spell.getManaCost().convertedManaCost(); ability.getTargets().clear(); FilterPermanent filter = new FilterCreaturePermanent(new StringBuilder("creature with converted mana costs of ").append(cmc).toString()); - Target target = new TargetPermanent(filter, true); + Target target = new TargetPermanent(filter); ability.addTarget(target); } } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SunderFromWithin.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SunderFromWithin.java index c3bdfce3854..06cee3937f2 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SunderFromWithin.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SunderFromWithin.java @@ -58,7 +58,7 @@ public class SunderFromWithin extends CardImpl { this.color.setRed(true); // Destroy target artifact or land. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); } public SunderFromWithin(final SunderFromWithin card) { diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/UndyingFlames.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/UndyingFlames.java index 2b269188b1a..1af3b2fe276 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/UndyingFlames.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/UndyingFlames.java @@ -58,7 +58,7 @@ public class UndyingFlames extends CardImpl { // Exile cards from the top of your library until you exile a nonland card. Undying Flames deals damage to target creature or player equal to that card's converted mana cost. this.getSpellAbility().addEffect(new UndyingFlamesEffect()); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); // Epic this.getSpellAbility().addEffect(new EpicEffect()); diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/WineOfBloodAndIron.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/WineOfBloodAndIron.java index 5e7f69b391c..d8d214fa747 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/WineOfBloodAndIron.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/WineOfBloodAndIron.java @@ -63,7 +63,7 @@ public class WineOfBloodAndIron extends CardImpl { new BoostTargetEffect(new TargetPermanentPowerCount(), new StaticValue(0), Duration.EndOfTurn, true), new GenericManaCost(4)); ability.addEffect(new WineOfBloodAndIronEffect()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/AbunaAcolyte.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/AbunaAcolyte.java index b4571139855..749b94a58ca 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/AbunaAcolyte.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/AbunaAcolyte.java @@ -67,7 +67,7 @@ public class AbunaAcolyte extends CardImpl { Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability1.addTarget(new TargetCreatureOrPlayer()); Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new TapSourceCost()); - ability2.addTarget(new TargetCreaturePermanent(filter, true)); + ability2.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability1); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/AcidWebSpider.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/AcidWebSpider.java index 6e019a88a2d..d07735510f9 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/AcidWebSpider.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/AcidWebSpider.java @@ -61,7 +61,7 @@ public class AcidWebSpider extends CardImpl { this.toughness = new MageInt(5); this.addAbility(ReachAbility.getInstance()); Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), true); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ArgentumArmor.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ArgentumArmor.java index db356ef9999..64169aefc92 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ArgentumArmor.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ArgentumArmor.java @@ -56,7 +56,7 @@ public class ArgentumArmor extends CardImpl { this.subtype.add("Equipment"); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(6, 6))); Ability ability = new AttacksAttachedTriggeredAbility(new DestroyTargetEffect()); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); this.addAbility(ability); this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(6))); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Asceticism.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Asceticism.java index 18a861d47ba..f1356890456 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Asceticism.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Asceticism.java @@ -58,7 +58,7 @@ public class Asceticism extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent()))); // {1}{G}: Regenerate target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{1}{G}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/AssaultStrobe.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/AssaultStrobe.java index 09e84e877d2..51c601dfd24 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/AssaultStrobe.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/AssaultStrobe.java @@ -49,7 +49,7 @@ public class AssaultStrobe extends CardImpl { this.expansionSetCode = "SOM"; this.color.setRed(true); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public AssaultStrobe (final AssaultStrobe card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BleakCovenVampires.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BleakCovenVampires.java index 6c25ba155fd..d8f7ca6e296 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/BleakCovenVampires.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BleakCovenVampires.java @@ -61,7 +61,7 @@ public class BleakCovenVampires extends CardImpl { TriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new LoseLifeTargetEffect(4), false); ability.addEffect(new GainLifeEffect(4)); - Target target = new TargetPlayer(true); + Target target = new TargetPlayer(); target.setRequired(true); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BloodshotTrainee.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BloodshotTrainee.java index fede4de329a..495ef3e0fef 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/BloodshotTrainee.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BloodshotTrainee.java @@ -59,7 +59,7 @@ public class BloodshotTrainee extends CardImpl { this.toughness = new MageInt(3); SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new BloodshotTraineeCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BondsOfQuicksilver.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BondsOfQuicksilver.java index 390ce9a6db1..61fa100d5cb 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/BondsOfQuicksilver.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BondsOfQuicksilver.java @@ -55,7 +55,7 @@ public class BondsOfQuicksilver extends CardImpl { this.color.setBlue(true); this.addAbility(FlashAbility.getInstance()); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/CerebralEruption.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/CerebralEruption.java index 33ba5b724a5..c8b34542e56 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/CerebralEruption.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/CerebralEruption.java @@ -57,7 +57,7 @@ public class CerebralEruption extends CardImpl { super(ownerId, 86, "Cerebral Eruption", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{2}{R}{R}"); this.expansionSetCode = "SOM"; this.color.setRed(true); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); this.getSpellAbility().addEffect(new CerebralEruptionEffect1()); this.getSpellAbility().addEffect(new CerebralEruptionEffect2()); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ContagionClasp.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ContagionClasp.java index dacb4e61fbc..7409279475d 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ContagionClasp.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ContagionClasp.java @@ -56,7 +56,7 @@ public class ContagionClasp extends CardImpl { // When Contagion Clasp enters the battlefield, put a -1/-1 counter on target creature. Ability ability = new EntersBattlefieldTriggeredAbility(new AddCountersTargetEffect(CounterType.M1M1.createInstance(), Outcome.UnboostCreature), false); - TargetCreaturePermanent target = new TargetCreaturePermanent(true); + TargetCreaturePermanent target = new TargetCreaturePermanent(); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ContagionEngine.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ContagionEngine.java index 5cd9fd1e9ca..b93cef49cb1 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ContagionEngine.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ContagionEngine.java @@ -59,7 +59,7 @@ public class ContagionEngine extends CardImpl { super(ownerId, 145, "Contagion Engine", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{6}"); this.expansionSetCode = "SOM"; Ability ability = new EntersBattlefieldTriggeredAbility(new ContagionEngineEffect()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ProliferateEffect(), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/CorruptedHarvester.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/CorruptedHarvester.java index b69214512f5..360dcf63580 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/CorruptedHarvester.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/CorruptedHarvester.java @@ -55,7 +55,7 @@ public class CorruptedHarvester extends CardImpl { this.power = new MageInt(6); this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}")); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/CullingDais.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/CullingDais.java index ab2cf71801e..f140c5b32a9 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/CullingDais.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/CullingDais.java @@ -59,7 +59,7 @@ public class CullingDais extends CardImpl { super(ownerId, 148, "Culling Dais", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "SOM"; Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost()); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.addAbility(ability); ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CullingDaisEffect(), new GenericManaCost(1)); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/DispenseJustice.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/DispenseJustice.java index ae0ba9fa1e8..b417a9d0915 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/DispenseJustice.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/DispenseJustice.java @@ -54,7 +54,7 @@ public class DispenseJustice extends CardImpl { this.color.setWhite(true); this.getSpellAbility().addEffect(new DispenseJusticeEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public DispenseJustice (final DispenseJustice card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/DrossHopper.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/DrossHopper.java index 2eb4e3c9a58..0ea922f78b4 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/DrossHopper.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/DrossHopper.java @@ -57,7 +57,7 @@ public class DrossHopper extends CardImpl { this.toughness = new MageInt(1); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), - new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); + new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); } public DrossHopper (final DrossHopper card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/FleshAllergy.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/FleshAllergy.java index aa9b962fb2b..17337cb995f 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/FleshAllergy.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/FleshAllergy.java @@ -61,9 +61,9 @@ public class FleshAllergy extends CardImpl { super(ownerId, 62, "Flesh Allergy", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{B}{B}"); this.expansionSetCode = "SOM"; this.color.setBlack(true); - this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new FleshAllergyEffect()); this.addWatcher(new FleshAllergyWatcher()); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/FlightSpellbomb.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/FlightSpellbomb.java index 7aa1d207211..b4703882bd8 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/FlightSpellbomb.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/FlightSpellbomb.java @@ -57,7 +57,7 @@ public class FlightSpellbomb extends CardImpl { this.expansionSetCode = "SOM"; Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); this.addAbility(new DiesTriggeredAbility(new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{U}")), false)); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/FumeSpitter.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/FumeSpitter.java index 38ca3937495..ac9645b7c89 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/FumeSpitter.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/FumeSpitter.java @@ -55,7 +55,7 @@ public class FumeSpitter extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GlimmerpointStag.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GlimmerpointStag.java index 4fd2ff53df2..f26347489c5 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GlimmerpointStag.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GlimmerpointStag.java @@ -62,7 +62,7 @@ public class GlimmerpointStag extends CardImpl { this.toughness = new MageInt(3); this.addAbility(VigilanceAbility.getInstance()); - Target etbTarget = new TargetPermanent(true); + Target etbTarget = new TargetPermanent(); etbTarget.setRequired(true); Ability etbAbility = new EntersBattlefieldTriggeredAbility(new GlimmerpointStagEffect()); etbAbility.addTarget(etbTarget); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GolemArtisan.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GolemArtisan.java index b406bdcc67e..20aeb333441 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GolemArtisan.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GolemArtisan.java @@ -76,13 +76,13 @@ public class GolemArtisan extends CardImpl { // {2}: Target artifact creature gets +1/+1 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new GenericManaCost(2)); - Target target = new TargetPermanent(filter, true); + Target target = new TargetPermanent(filter); ability.addTarget(target); this.addAbility(ability); // {2}: Target artifact creature gains your choice of flying, trample, or haste until end of turn. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GolemArtisanEffect(), new GenericManaCost(2)); - target = new TargetPermanent(filter, true); + target = new TargetPermanent(filter); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GraspOfDarkness.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GraspOfDarkness.java index aea6d0e773f..a8a71d8b3d6 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GraspOfDarkness.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GraspOfDarkness.java @@ -47,7 +47,7 @@ public class GraspOfDarkness extends CardImpl { this.expansionSetCode = "SOM"; this.color.setBlack(true); this.getSpellAbility().addEffect(new BoostTargetEffect(-4, -4, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public GraspOfDarkness (final GraspOfDarkness card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Grindclock.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Grindclock.java index f3de508440f..31a3787df35 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Grindclock.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Grindclock.java @@ -57,7 +57,7 @@ public class Grindclock extends CardImpl { this.expansionSetCode = "SOM"; this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost())); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GrindclockEffect(), new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/HandOfThePraetors.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/HandOfThePraetors.java index 9ccf707e3c3..d760c97fd51 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/HandOfThePraetors.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/HandOfThePraetors.java @@ -74,7 +74,7 @@ public class HandOfThePraetors extends CardImpl { this.addAbility(InfectAbility.getInstance()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); SpellCastControllerTriggeredAbility ability = new SpellCastControllerTriggeredAbility(new AddPoisonCounterTargetEffect(1), filterSpell, false); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/HoardSmelterDragon.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/HoardSmelterDragon.java index 1ab40b824bf..fd29f64e36b 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/HoardSmelterDragon.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/HoardSmelterDragon.java @@ -66,7 +66,7 @@ public class HoardSmelterDragon extends CardImpl { this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{3}{R}")); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); ability.addEffect(new HoardSmelterEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/InstillInfection.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/InstillInfection.java index 548de73b328..f16d9eb75bc 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/InstillInfection.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/InstillInfection.java @@ -49,7 +49,7 @@ public class InstillInfection extends CardImpl { this.color.setBlack(true); this.getSpellAbility().addEffect(new AddCountersTargetEffect(CounterType.M1M1.createInstance())); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public InstillInfection (final InstillInfection card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/LiquimetalCoating.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/LiquimetalCoating.java index c100734fed4..47525b023f4 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/LiquimetalCoating.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/LiquimetalCoating.java @@ -51,7 +51,7 @@ public class LiquimetalCoating extends CardImpl { super(ownerId, 171, "Liquimetal Coating", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "SOM"; Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCardTypeTargetEffect(CardType.ARTIFACT, Duration.EndOfTurn), new TapSourceCost()); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/LumengridDrake.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/LumengridDrake.java index bb08c3553c8..65019607d12 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/LumengridDrake.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/LumengridDrake.java @@ -58,7 +58,7 @@ public class LumengridDrake extends CardImpl { TriggeredAbility conditional = new ConditionalTriggeredAbility( new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect()), MetalcraftCondition.getInstance(), text); - conditional.addTarget(new TargetCreaturePermanent(true)); + conditional.addTarget(new TargetCreaturePermanent()); this.addAbility(conditional); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/LuxCannon.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/LuxCannon.java index 946796fd09c..4b7a65720db 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/LuxCannon.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/LuxCannon.java @@ -55,7 +55,7 @@ public class LuxCannon extends CardImpl { this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new TapSourceCost())); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(3))); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Memoricide.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Memoricide.java index 0cbc6c0706e..f162eeaf056 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Memoricide.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Memoricide.java @@ -57,7 +57,7 @@ public class Memoricide extends CardImpl { // Name a nonland card. Search target player's graveyard, hand, and library for any number of cards with // that name and exile them. Then that player shuffles his or her library - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new MemoricideEffect()); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Mindslaver.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Mindslaver.java index 84c4137d87b..431fab3d5e4 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Mindslaver.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Mindslaver.java @@ -56,7 +56,7 @@ public class Mindslaver extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ControlTargetPlayerNextTurnEffect(), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/NecrogenCenser.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/NecrogenCenser.java index 0419f7b253a..382edc5cf92 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/NecrogenCenser.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/NecrogenCenser.java @@ -55,7 +55,7 @@ public class NecrogenCenser extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(2)), "Necrogen Censer enters the battlefield with two charge counters on it")); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2), new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(1))); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Necropede.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Necropede.java index 93e2d1f10fd..01c91f304d2 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Necropede.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Necropede.java @@ -54,7 +54,7 @@ public class Necropede extends CardImpl { this.toughness = new MageInt(1); this.addAbility(InfectAbility.getInstance()); Ability ability = new DiesTriggeredAbility(new AddCountersTargetEffect(CounterType.M1M1.createInstance()), true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/NeurokInvisimancer.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/NeurokInvisimancer.java index 769a9bb6da2..0521e79134d 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/NeurokInvisimancer.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/NeurokInvisimancer.java @@ -58,7 +58,7 @@ public class NeurokInvisimancer extends CardImpl { this.addAbility(new UnblockableAbility()); // When Neurok Invisimancer enters the battlefield, target creature is unblockable this turn. Ability ability = new EntersBattlefieldTriggeredAbility(new UnblockableTargetEffect()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/NeurokReplica.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/NeurokReplica.java index 94de3703479..84486d28155 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/NeurokReplica.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/NeurokReplica.java @@ -55,7 +55,7 @@ public class NeurokReplica extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(4); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{1}{U}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/NihilSpellbomb.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/NihilSpellbomb.java index 846b57536b4..7f5571e9a1d 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/NihilSpellbomb.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/NihilSpellbomb.java @@ -55,7 +55,7 @@ public class NihilSpellbomb extends CardImpl { // {T}, Sacrifice Nihil Spellbomb: Exile all cards from target player's graveyard. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileGraveyardAllTargetPlayerEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); // When Nihil Spellbomb is put into a graveyard from the battlefield, you may pay {B}. If you do, draw a card. this.addAbility(new DiesTriggeredAbility(new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{B}")), false)); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/OxiddaScrapmelter.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/OxiddaScrapmelter.java index 1bec01c4423..cb8469e83f5 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/OxiddaScrapmelter.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/OxiddaScrapmelter.java @@ -57,7 +57,7 @@ public class OxiddaScrapmelter extends CardImpl { this.toughness = new MageInt(3); Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Painsmith.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Painsmith.java index a9ad28341f9..83926f46ee5 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Painsmith.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Painsmith.java @@ -65,7 +65,7 @@ public class Painsmith extends CardImpl { SpellCastControllerTriggeredAbility ability = new SpellCastControllerTriggeredAbility(new BoostTargetEffect(2, 0, Duration.EndOfTurn), filter, true); ability.addEffect(new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/PanicSpellbomb.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/PanicSpellbomb.java index 3e8fb93aa26..5aec33ea8b6 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/PanicSpellbomb.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/PanicSpellbomb.java @@ -56,7 +56,7 @@ public class PanicSpellbomb extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBlockTargetEffect(Duration.EndOfTurn), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); this.addAbility(new DiesTriggeredAbility(new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{R}")), false)); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/PsychicMiasma.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/PsychicMiasma.java index 68ae203021e..cff01fb6d6b 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/PsychicMiasma.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/PsychicMiasma.java @@ -52,7 +52,7 @@ public class PsychicMiasma extends CardImpl { super(ownerId, 76, "Psychic Miasma", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{1}{B}"); this.expansionSetCode = "SOM"; this.color.setBlack(true); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); PsychicMiasmaEffect1 effect1 = new PsychicMiasmaEffect1(); this.getSpellAbility().addEffect(effect1); this.getSpellAbility().addEffect(new PsychicMiasmaEffect2()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/QuicksilverGargantuan.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/QuicksilverGargantuan.java index bb400c5f6ce..83f4f1713d9 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/QuicksilverGargantuan.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/QuicksilverGargantuan.java @@ -62,7 +62,7 @@ public class QuicksilverGargantuan extends CardImpl { this.toughness = new MageInt(7); Ability ability = new EntersBattlefieldAbility(new QuicksilverGargantuanCopyEffect(), text); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/RevokeExistence.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/RevokeExistence.java index 457ef8e4712..1f38da01b1f 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/RevokeExistence.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/RevokeExistence.java @@ -57,7 +57,7 @@ public class RevokeExistence extends CardImpl { this.expansionSetCode = "SOM"; this.color.setWhite(true); this.getSpellAbility().addEffect(new ExileTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); } public RevokeExistence (final RevokeExistence card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SeizeTheInitiative.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SeizeTheInitiative.java index 121f5588a36..89ece3b2c8f 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SeizeTheInitiative.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SeizeTheInitiative.java @@ -51,7 +51,7 @@ public class SeizeTheInitiative extends CardImpl { this.color.setWhite(true); this.getSpellAbility().addEffect(new BoostTargetEffect(1, 1, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public SeizeTheInitiative (final SeizeTheInitiative card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ShapeAnew.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ShapeAnew.java index 1e7f0d6a462..35999caa07c 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ShapeAnew.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ShapeAnew.java @@ -65,7 +65,7 @@ public class ShapeAnew extends CardImpl { this.expansionSetCode = "SOM"; this.color.setBlue(true); this.getSpellAbility().addEffect(new SacrificeTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new ShapeAnewEffect()); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Skinrender.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Skinrender.java index 5a56b936839..076476dde42 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Skinrender.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Skinrender.java @@ -58,7 +58,7 @@ public class Skinrender extends CardImpl { Effect putCountersEffect = new AddCountersTargetEffect(CounterType.M1M1.createInstance(3), Outcome.UnboostCreature); Ability ability = new EntersBattlefieldTriggeredAbility(putCountersEffect, false); - Target target = new TargetCreaturePermanent(true); + Target target = new TargetCreaturePermanent(); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SliceinTwain.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SliceinTwain.java index 5f6b61658ce..1621a2e4603 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SliceinTwain.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SliceinTwain.java @@ -58,7 +58,7 @@ public class SliceinTwain extends CardImpl { this.color.setGreen(true); this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); } public SliceinTwain (final SliceinTwain card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SylvokReplica.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SylvokReplica.java index 64e110b363b..d4f6062842b 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SylvokReplica.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SylvokReplica.java @@ -65,7 +65,7 @@ public class SylvokReplica extends CardImpl { this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{G}")); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TaintedStrike.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TaintedStrike.java index fd7c978bc92..f46344e55e6 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TaintedStrike.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TaintedStrike.java @@ -50,7 +50,7 @@ public class TaintedStrike extends CardImpl { this.color.setBlack(true); this.getSpellAbility().addEffect(new BoostTargetEffect(1, 0, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(InfectAbility.getInstance(), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public TaintedStrike (final TaintedStrike card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TangleAngler.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TangleAngler.java index d4b6088ee25..fe1f44d16ce 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TangleAngler.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TangleAngler.java @@ -56,7 +56,7 @@ public class TangleAngler extends CardImpl { this.addAbility(InfectAbility.getInstance()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MustBeBlockedByTargetSourceEffect(), new ManaCostsImpl("{G}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladDefiance.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladDefiance.java index 3e865d9a6d3..83894fe8956 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladDefiance.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladDefiance.java @@ -49,7 +49,7 @@ public class TelJiladDefiance extends CardImpl { this.expansionSetCode = "SOM"; this.color.setGreen(true); this.getSpellAbility().addEffect(new GainProtectionFromTypeTargetEffect(Duration.EndOfTurn, new FilterArtifactCard("artifacts"))); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TowerOfCalamities.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TowerOfCalamities.java index ac6f27ac1d2..c60c6e84bea 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TowerOfCalamities.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TowerOfCalamities.java @@ -51,7 +51,7 @@ public class TowerOfCalamities extends CardImpl { super(ownerId, 212, "Tower of Calamities", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{4}"); this.expansionSetCode = "SOM"; Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(12), new ManaCostsImpl("{8}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfCorruption.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfCorruption.java index 1d809b01cb4..b4b699b363e 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfCorruption.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfCorruption.java @@ -68,7 +68,7 @@ public class TrigonOfCorruption extends CardImpl { Effect putCounterEffect = new AddCountersTargetEffect(CounterType.M1M1.createInstance()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, putCounterEffect, costs); ability.addManaCost(new GenericManaCost(2)); - Target target = new TargetCreaturePermanent(true); + Target target = new TargetCreaturePermanent(); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfRage.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfRage.java index 3a130d7304b..d3f682f3ddf 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfRage.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfRage.java @@ -68,7 +68,7 @@ public class TrigonOfRage extends CardImpl { Effect pumpEffect = new BoostTargetEffect(3, 0, Duration.EndOfTurn); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, pumpEffect, costs); ability.addManaCost(new GenericManaCost(2)); - Target target = new TargetCreaturePermanent(true); + Target target = new TargetCreaturePermanent(); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TumbleMagnet.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TumbleMagnet.java index 7b312062243..c79b9f0e22a 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TumbleMagnet.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TumbleMagnet.java @@ -65,7 +65,7 @@ public class TumbleMagnet extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(3)), "Tumble Magnet enters the battlefield with three charge counters on it")); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance())); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TurnToSlag.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TurnToSlag.java index f7b871b052b..696c9be40d7 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TurnToSlag.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TurnToSlag.java @@ -53,7 +53,7 @@ public class TurnToSlag extends CardImpl { this.expansionSetCode = "SOM"; this.color.setRed(true); this.getSpellAbility().addEffect(new TurnToSlagEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public TurnToSlag (final TurnToSlag card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TwistedImage.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TwistedImage.java index 5dd94ff79b8..bbe00ca6032 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TwistedImage.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TwistedImage.java @@ -50,7 +50,7 @@ public class TwistedImage extends CardImpl { this.color.setBlue(true); this.getSpellAbility().addEffect(new SwitchPowerToughnessTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public TwistedImage (final TwistedImage card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/UntamedMight.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/UntamedMight.java index 62a17585244..abb527367ce 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/UntamedMight.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/UntamedMight.java @@ -47,7 +47,7 @@ public class UntamedMight extends CardImpl { super(ownerId, 131, "Untamed Might", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{X}{G}"); this.expansionSetCode = "SOM"; this.color.setGreen(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(new ManacostVariableValue(), new ManacostVariableValue(), Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VaultSkyward.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VaultSkyward.java index 5d0ddc54528..e0406e6ed48 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/VaultSkyward.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/VaultSkyward.java @@ -50,7 +50,7 @@ public class VaultSkyward extends CardImpl { this.color.setBlue(true); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addEffect(new UntapTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public VaultSkyward (final VaultSkyward card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VedalkenCertarch.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VedalkenCertarch.java index b7bf471c2d3..067b0aedec8 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/VedalkenCertarch.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/VedalkenCertarch.java @@ -72,7 +72,7 @@ public class VedalkenCertarch extends CardImpl { // Metalcraft - {T}: Tap target artifact, creature, or land. Activate this ability only if you control three or more artifacts. Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost(), MetalcraftCondition.getInstance()); ability.setAbilityWord(AbilityWord.METALCRAFT); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VenserTheSojourner.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VenserTheSojourner.java index 869a485310f..2b8329f3a99 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/VenserTheSojourner.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/VenserTheSojourner.java @@ -76,7 +76,7 @@ public class VenserTheSojourner extends CardImpl { // +2: Exile target permanent you own. Return it to the battlefield under your control at the beginning of the next end step. LoyaltyAbility ability1 = new LoyaltyAbility(new VenserTheSojournerEffect(), 2); - Target target = new TargetControlledPermanent(true); + Target target = new TargetControlledPermanent(); target.setRequired(true); ability1.addTarget(target); this.addAbility(ability1); @@ -146,7 +146,7 @@ class VenserTheSojournerEmblem extends Emblem { public VenserTheSojournerEmblem() { this.setName("EMBLEM: Venser, the Sojourner"); Ability ability = new VenserTheSojournerSpellCastTriggeredAbility(new ExileTargetEffect(), false); - Target target = new TargetPermanent(true); + Target target = new TargetPermanent(); target.setRequired(true); ability.addTarget(target); this.getAbilities().add(ability); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VolitionReins.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VolitionReins.java index 5c4a2c866c3..30154624575 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/VolitionReins.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/VolitionReins.java @@ -57,7 +57,7 @@ public class VolitionReins extends CardImpl { this.subtype.add("Aura"); this.color.setBlue(true); - TargetPermanent auraTarget = new TargetPermanent(true); + TargetPermanent auraTarget = new TargetPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VulshokHeartstoker.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VulshokHeartstoker.java index 1d0cce51d3c..7d75688b750 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/VulshokHeartstoker.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/VulshokHeartstoker.java @@ -54,7 +54,7 @@ public class VulshokHeartstoker extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(2, 0, Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VulshokReplica.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VulshokReplica.java index f238e48fcba..3d53303bc20 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/VulshokReplica.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/VulshokReplica.java @@ -55,7 +55,7 @@ public class VulshokReplica extends CardImpl { this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new ManaCostsImpl("{1}{R}")); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/WingPuncture.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/WingPuncture.java index 89d25f038e2..4a0654614bc 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/WingPuncture.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/WingPuncture.java @@ -61,8 +61,8 @@ public class WingPuncture extends CardImpl { this.color.setGreen(true); - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new WingPunctureEffect()); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/WithstandDeath.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/WithstandDeath.java index 233481d60ea..553e4f92868 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/WithstandDeath.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/WithstandDeath.java @@ -53,7 +53,7 @@ public class WithstandDeath extends CardImpl { Effect effect = new GainAbilityTargetEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn); effect.setText("Target creature is indestructible this turn"); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public WithstandDeath (final WithstandDeath card) { diff --git a/Mage.Sets/src/mage/sets/scourge/AstralSteel.java b/Mage.Sets/src/mage/sets/scourge/AstralSteel.java index 4456e7bd136..66f9ff91a9b 100644 --- a/Mage.Sets/src/mage/sets/scourge/AstralSteel.java +++ b/Mage.Sets/src/mage/sets/scourge/AstralSteel.java @@ -50,7 +50,7 @@ public class AstralSteel extends CardImpl { this.color.setWhite(true); // Target creature gets +1/+2 until end of turn. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(1, 2, Duration.EndOfTurn)); // Storm this.addAbility(new StormAbility()); diff --git a/Mage.Sets/src/mage/sets/scourge/BrainFreeze.java b/Mage.Sets/src/mage/sets/scourge/BrainFreeze.java index 3f9029d3fa5..2cbb8e54096 100644 --- a/Mage.Sets/src/mage/sets/scourge/BrainFreeze.java +++ b/Mage.Sets/src/mage/sets/scourge/BrainFreeze.java @@ -48,7 +48,7 @@ public class BrainFreeze extends CardImpl { this.color.setBlue(true); // Target player puts the top three cards of his or her library into his or her graveyard. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(3)); // Storm this.addAbility(new StormAbility()); diff --git a/Mage.Sets/src/mage/sets/scourge/CarrionFeeder.java b/Mage.Sets/src/mage/sets/scourge/CarrionFeeder.java index 9ef358bd81e..b2f3f809f3e 100644 --- a/Mage.Sets/src/mage/sets/scourge/CarrionFeeder.java +++ b/Mage.Sets/src/mage/sets/scourge/CarrionFeeder.java @@ -60,7 +60,7 @@ public class CarrionFeeder extends CardImpl { // Sacrifice a creature: Put a +1/+1 counter on Carrion Feeder. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), - new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); + new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); } public CarrionFeeder(final CarrionFeeder card) { diff --git a/Mage.Sets/src/mage/sets/scourge/GoblinWarStrike.java b/Mage.Sets/src/mage/sets/scourge/GoblinWarStrike.java index 6b270dc603e..c7360cd732b 100644 --- a/Mage.Sets/src/mage/sets/scourge/GoblinWarStrike.java +++ b/Mage.Sets/src/mage/sets/scourge/GoblinWarStrike.java @@ -60,7 +60,7 @@ public class GoblinWarStrike extends CardImpl { // Goblin War Strike deals damage equal to the number of Goblins you control to target player. this.getSpellAbility().addEffect(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter))); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public GoblinWarStrike(final GoblinWarStrike card) { diff --git a/Mage.Sets/src/mage/sets/scourge/Scattershot.java b/Mage.Sets/src/mage/sets/scourge/Scattershot.java index 955c2567900..b94f5228c20 100644 --- a/Mage.Sets/src/mage/sets/scourge/Scattershot.java +++ b/Mage.Sets/src/mage/sets/scourge/Scattershot.java @@ -48,7 +48,7 @@ public class Scattershot extends CardImpl { this.color.setRed(true); // Scattershot deals 1 damage to target creature. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DamageTargetEffect(1)); // Storm this.addAbility(new StormAbility()); diff --git a/Mage.Sets/src/mage/sets/scourge/TemporalFissure.java b/Mage.Sets/src/mage/sets/scourge/TemporalFissure.java index be2ecd2f3a7..494b1575d77 100644 --- a/Mage.Sets/src/mage/sets/scourge/TemporalFissure.java +++ b/Mage.Sets/src/mage/sets/scourge/TemporalFissure.java @@ -48,7 +48,7 @@ public class TemporalFissure extends CardImpl { this.color.setBlue(true); // Return target permanent to its owner's hand. - this.getSpellAbility().addTarget(new TargetPermanent(true)); + this.getSpellAbility().addTarget(new TargetPermanent()); this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); // Storm this.addAbility(new StormAbility()); diff --git a/Mage.Sets/src/mage/sets/scourge/TendrilsOfAgony.java b/Mage.Sets/src/mage/sets/scourge/TendrilsOfAgony.java index 78b737982ad..72d1e0542d9 100644 --- a/Mage.Sets/src/mage/sets/scourge/TendrilsOfAgony.java +++ b/Mage.Sets/src/mage/sets/scourge/TendrilsOfAgony.java @@ -49,7 +49,7 @@ public class TendrilsOfAgony extends CardImpl { this.color.setBlack(true); // Target player loses 2 life and you gain 2 life. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new LoseLifeTargetEffect(2)); this.getSpellAbility().addEffect(new GainLifeEffect(2)); // Storm diff --git a/Mage.Sets/src/mage/sets/scourge/WingShards.java b/Mage.Sets/src/mage/sets/scourge/WingShards.java index 762326a8982..2aa1e349260 100644 --- a/Mage.Sets/src/mage/sets/scourge/WingShards.java +++ b/Mage.Sets/src/mage/sets/scourge/WingShards.java @@ -50,7 +50,7 @@ public class WingShards extends CardImpl { // Target player sacrifices an attacking creature. this.getSpellAbility().addEffect(new SacrificeEffect(new FilterAttackingCreature(), 1, "Target player")); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); // Storm this.addAbility(new StormAbility()); } diff --git a/Mage.Sets/src/mage/sets/scourge/WirewoodSymbiote.java b/Mage.Sets/src/mage/sets/scourge/WirewoodSymbiote.java index 2a9423df315..44f6946bdfc 100644 --- a/Mage.Sets/src/mage/sets/scourge/WirewoodSymbiote.java +++ b/Mage.Sets/src/mage/sets/scourge/WirewoodSymbiote.java @@ -65,7 +65,7 @@ public class WirewoodSymbiote extends CardImpl { // Return an Elf you control to its owner's hand: Untap target creature. Activate this ability only once each turn. Ability ability = new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ReturnToHandTargetCost(new TargetControlledPermanent(filter))); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/seventhedition/AgonizingMemories.java b/Mage.Sets/src/mage/sets/seventhedition/AgonizingMemories.java index 333d9515c84..4895b95ae12 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/AgonizingMemories.java +++ b/Mage.Sets/src/mage/sets/seventhedition/AgonizingMemories.java @@ -57,7 +57,7 @@ public class AgonizingMemories extends CardImpl { // Look at target player's hand and choose two cards from it. Put them on top of that player's library in any order. this.getSpellAbility().addEffect(new AgonizingMemoriesEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public AgonizingMemories(final AgonizingMemories card) { diff --git a/Mage.Sets/src/mage/sets/seventhedition/CrimsonHellkite.java b/Mage.Sets/src/mage/sets/seventhedition/CrimsonHellkite.java index ffc1db22730..dbe70e5361b 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/CrimsonHellkite.java +++ b/Mage.Sets/src/mage/sets/seventhedition/CrimsonHellkite.java @@ -78,7 +78,7 @@ public class CrimsonHellkite extends CardImpl { if (variableCost instanceof VariableManaCost) { ((VariableManaCost) variableCost).setFilter(filterRedMana); } - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/seventhedition/DisruptingScepter.java b/Mage.Sets/src/mage/sets/seventhedition/DisruptingScepter.java index 9adcef70c7d..ea6c483f2ff 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/DisruptingScepter.java +++ b/Mage.Sets/src/mage/sets/seventhedition/DisruptingScepter.java @@ -53,7 +53,7 @@ public class DisruptingScepter extends CardImpl { // {3}, {tap}: Target player discards a card. Activate this ability only during your turn. Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl("{3}"), new MyTurnCondition()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/seventhedition/FallenAngel.java b/Mage.Sets/src/mage/sets/seventhedition/FallenAngel.java index db545753081..47d00f209cd 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/FallenAngel.java +++ b/Mage.Sets/src/mage/sets/seventhedition/FallenAngel.java @@ -59,7 +59,7 @@ public class FallenAngel extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Sacrifice a creature: Fallen Angel gets +2/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 1, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 1, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); } public FallenAngel(final FallenAngel card) { diff --git a/Mage.Sets/src/mage/sets/seventhedition/FlyingCarpet.java b/Mage.Sets/src/mage/sets/seventhedition/FlyingCarpet.java index 9883225f2c7..23e653bf84b 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/FlyingCarpet.java +++ b/Mage.Sets/src/mage/sets/seventhedition/FlyingCarpet.java @@ -54,7 +54,7 @@ public class FlyingCarpet extends CardImpl { // {2}, {tap}: Target creature gains flying until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{2}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/seventhedition/GrapeshotCatapult.java b/Mage.Sets/src/mage/sets/seventhedition/GrapeshotCatapult.java index da3fb83d63a..295efd54e98 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/GrapeshotCatapult.java +++ b/Mage.Sets/src/mage/sets/seventhedition/GrapeshotCatapult.java @@ -64,7 +64,7 @@ public class GrapeshotCatapult extends CardImpl { // {tap}: Grapeshot Catapult deals 1 damage to target creature with flying. Ability activatedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - activatedAbility.addTarget(new TargetCreaturePermanent(filter, true)); + activatedAbility.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(activatedAbility); } diff --git a/Mage.Sets/src/mage/sets/seventhedition/HealingSalve.java b/Mage.Sets/src/mage/sets/seventhedition/HealingSalve.java index 5fbfa8153ad..9adaaf2b1c6 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/HealingSalve.java +++ b/Mage.Sets/src/mage/sets/seventhedition/HealingSalve.java @@ -53,7 +53,7 @@ public class HealingSalve extends CardImpl { // Choose one - Target player gains 3 life; or prevent the next 3 damage that would be dealt to target creature or player this turn. this.getSpellAbility().addEffect(new GainLifeTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); Mode mode = new Mode(); mode.getEffects().add(new PreventDamageToTargetEffect(Duration.EndOfTurn, 3)); diff --git a/Mage.Sets/src/mage/sets/seventhedition/JandorsSaddlebags.java b/Mage.Sets/src/mage/sets/seventhedition/JandorsSaddlebags.java index e51066f8d90..8540d34a73a 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/JandorsSaddlebags.java +++ b/Mage.Sets/src/mage/sets/seventhedition/JandorsSaddlebags.java @@ -53,7 +53,7 @@ public class JandorsSaddlebags extends CardImpl { // {3}, {tap}: Untap target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/seventhedition/MonstrousGrowth.java b/Mage.Sets/src/mage/sets/seventhedition/MonstrousGrowth.java index 422074e63d9..a8704fcd382 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/MonstrousGrowth.java +++ b/Mage.Sets/src/mage/sets/seventhedition/MonstrousGrowth.java @@ -50,7 +50,7 @@ public class MonstrousGrowth extends CardImpl { // Target creature gets +4/+4 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(4, 4, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public MonstrousGrowth(final MonstrousGrowth card) { diff --git a/Mage.Sets/src/mage/sets/seventhedition/Pillage.java b/Mage.Sets/src/mage/sets/seventhedition/Pillage.java index d72aa0e8aaf..c1e56d99009 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/Pillage.java +++ b/Mage.Sets/src/mage/sets/seventhedition/Pillage.java @@ -60,7 +60,7 @@ public class Pillage extends CardImpl { // Destroy target artifact or land. It can't be regenerated. this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); } public Pillage(final Pillage card) { diff --git a/Mage.Sets/src/mage/sets/seventhedition/Reprisal.java b/Mage.Sets/src/mage/sets/seventhedition/Reprisal.java index 55d102b8ae4..371dcd9d491 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/Reprisal.java +++ b/Mage.Sets/src/mage/sets/seventhedition/Reprisal.java @@ -57,7 +57,7 @@ public class Reprisal extends CardImpl { // Destroy target creature with power 4 or greater. It can't be regenerated. this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); } public Reprisal(final Reprisal card) { diff --git a/Mage.Sets/src/mage/sets/seventhedition/SpiritLink.java b/Mage.Sets/src/mage/sets/seventhedition/SpiritLink.java index b5c5037e4e3..13034049447 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/SpiritLink.java +++ b/Mage.Sets/src/mage/sets/seventhedition/SpiritLink.java @@ -60,7 +60,7 @@ public class SpiritLink extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/seventhedition/StreamOfLife.java b/Mage.Sets/src/mage/sets/seventhedition/StreamOfLife.java index 8cf9333d3e9..13d5ce9ea94 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/StreamOfLife.java +++ b/Mage.Sets/src/mage/sets/seventhedition/StreamOfLife.java @@ -49,7 +49,7 @@ public class StreamOfLife extends CardImpl { // Target player gains X life. this.getSpellAbility().addEffect(new GainLifeTargetEffect(new ManacostVariableValue())); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public StreamOfLife(final StreamOfLife card) { diff --git a/Mage.Sets/src/mage/sets/seventhedition/Vengeance.java b/Mage.Sets/src/mage/sets/seventhedition/Vengeance.java index c25d515fe38..530b3082f71 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/Vengeance.java +++ b/Mage.Sets/src/mage/sets/seventhedition/Vengeance.java @@ -54,7 +54,7 @@ public class Vengeance extends CardImpl { this.color.setWhite(true); // Destroy target tapped creature. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/AphoticWisps.java b/Mage.Sets/src/mage/sets/shadowmoor/AphoticWisps.java index 42793494953..fe5cd6cefed 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/AphoticWisps.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/AphoticWisps.java @@ -52,7 +52,7 @@ public class AphoticWisps extends CardImpl { this.expansionSetCode = "SHM"; this.color.setBlack(true); // Target creature becomes black and gains fear until end of turn. (It can't be blocked except by artifact creatures and/or black creatures.) - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new SetCardColorTargetEffect(ObjectColor.BLACK, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FearAbility.getInstance(), Duration.EndOfTurn)); // Draw a card. diff --git a/Mage.Sets/src/mage/sets/shadowmoor/BarrentonMedic.java b/Mage.Sets/src/mage/sets/shadowmoor/BarrentonMedic.java index 8432eac80b3..4a585ce2728 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/BarrentonMedic.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/BarrentonMedic.java @@ -62,7 +62,7 @@ public class BarrentonMedic extends CardImpl { // {tap}: Prevent the next 1 damage that would be dealt to target creature or player this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer(true)); + ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); // Put a -1/-1 counter on Barrenton Medic: Untap Barrenton Medic. diff --git a/Mage.Sets/src/mage/sets/shadowmoor/BitingTether.java b/Mage.Sets/src/mage/sets/shadowmoor/BitingTether.java index 1ac2310af31..d79ed85f738 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/BitingTether.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/BitingTether.java @@ -62,7 +62,7 @@ public class BitingTether extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/BlowflyInfestation.java b/Mage.Sets/src/mage/sets/shadowmoor/BlowflyInfestation.java index 97ab0f21d24..d1fc3cef6cf 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/BlowflyInfestation.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/BlowflyInfestation.java @@ -64,7 +64,7 @@ public class BlowflyInfestation extends CardImpl { Effect effect = new BlowflyInfestationEffect(); TriggeredAbility triggeredAbility = new DiesCreatureTriggeredAbility(effect, false, false, true); - triggeredAbility.addTarget(new TargetCreaturePermanent(true)); + triggeredAbility.addTarget(new TargetCreaturePermanent()); Condition condition = new BlowflyInfestationCondition(); this.addAbility(new ConditionalTriggeredAbility(triggeredAbility, condition, rule)); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/BoggartArsonists.java b/Mage.Sets/src/mage/sets/shadowmoor/BoggartArsonists.java index 3b9fa4da123..ab2fc0fe3da 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/BoggartArsonists.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/BoggartArsonists.java @@ -74,7 +74,7 @@ public class BoggartArsonists extends CardImpl { // {2}{R}, Sacrifice Boggart Arsonists: Destroy target Scarecrow or Plains. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{2}{R}")); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/CeruleanWisps.java b/Mage.Sets/src/mage/sets/shadowmoor/CeruleanWisps.java index 673c71db98f..4e1e5544cad 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/CeruleanWisps.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/CeruleanWisps.java @@ -51,7 +51,7 @@ public class CeruleanWisps extends CardImpl { this.expansionSetCode = "SHM"; this.color.setBlue(true); // Target creature becomes blue until end of turn. Untap that creature. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new SetCardColorTargetEffect(ObjectColor.BLUE, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new UntapTargetEffect()); // Draw a card. diff --git a/Mage.Sets/src/mage/sets/shadowmoor/CinderhazeWretch.java b/Mage.Sets/src/mage/sets/shadowmoor/CinderhazeWretch.java index 671a6d85c20..857d98a6650 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/CinderhazeWretch.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/CinderhazeWretch.java @@ -63,7 +63,7 @@ public class CinderhazeWretch extends CardImpl { // {tap}: Target player discards a card. Activate this ability only during your turn. Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new TapSourceCost(), MyTurnCondition.getInstance()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); // Put a -1/-1 counter on Cinderhaze Wretch: Untap Cinderhaze Wretch. diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ConsignToDream.java b/Mage.Sets/src/mage/sets/shadowmoor/ConsignToDream.java index 90e632236e6..da2dedfd75d 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ConsignToDream.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ConsignToDream.java @@ -55,7 +55,7 @@ public class ConsignToDream extends CardImpl { // Return target permanent to its owner's hand. If that permanent is red or green, put it on top of its owner's library instead. this.getSpellAbility().addEffect(new ConsignToDreamEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(true)); + this.getSpellAbility().addTarget(new TargetPermanent()); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/CrimsonWisps.java b/Mage.Sets/src/mage/sets/shadowmoor/CrimsonWisps.java index 2a4a2430448..31349e9cf84 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/CrimsonWisps.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/CrimsonWisps.java @@ -52,7 +52,7 @@ public class CrimsonWisps extends CardImpl { this.expansionSetCode = "SHM"; this.color.setRed(true); // Target creature becomes red and gains haste until end of turn. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new SetCardColorTargetEffect(ObjectColor.RED, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/CultbrandCinder.java b/Mage.Sets/src/mage/sets/shadowmoor/CultbrandCinder.java index 9f77bf4871d..d3a42d6d3d2 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/CultbrandCinder.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/CultbrandCinder.java @@ -57,7 +57,7 @@ public class CultbrandCinder extends CardImpl { // When Cultbrand Cinder enters the battlefield, put a -1/-1 counter on target creature. Ability ability = new EntersBattlefieldTriggeredAbility(new AddCountersTargetEffect(CounterType.M1M1.createInstance())); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/DrownerInitiate.java b/Mage.Sets/src/mage/sets/shadowmoor/DrownerInitiate.java index e88195b89ac..fe360db92e1 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/DrownerInitiate.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/DrownerInitiate.java @@ -67,7 +67,7 @@ public class DrownerInitiate extends CardImpl { // Whenever a player casts a blue spell, you may pay {1}. If you do, target player puts the top two cards of his or her library into his or her graveyard. Ability ability = new SpellCastAllTriggeredAbility(new DoIfCostPaid(new PutLibraryIntoGraveTargetEffect(2), new ManaCostsImpl("{1}")), filter, true); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ElvishHexhunter.java b/Mage.Sets/src/mage/sets/shadowmoor/ElvishHexhunter.java index d3acb7c4912..0b72fab24d6 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ElvishHexhunter.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ElvishHexhunter.java @@ -70,7 +70,7 @@ public class ElvishHexhunter extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{G/W}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/FistsOfTheDemigod.java b/Mage.Sets/src/mage/sets/shadowmoor/FistsOfTheDemigod.java index 295d9f97fb5..1efbf08a951 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/FistsOfTheDemigod.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/FistsOfTheDemigod.java @@ -63,7 +63,7 @@ public class FistsOfTheDemigod extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/GnarledEffigy.java b/Mage.Sets/src/mage/sets/shadowmoor/GnarledEffigy.java index 14c5f2a8bb0..b5a962adf5f 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/GnarledEffigy.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/GnarledEffigy.java @@ -54,7 +54,7 @@ public class GnarledEffigy extends CardImpl { new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new ManaCostsImpl("4")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/HelmOfTheGhastlord.java b/Mage.Sets/src/mage/sets/shadowmoor/HelmOfTheGhastlord.java index ce0cd3226dd..22386d31817 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/HelmOfTheGhastlord.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/HelmOfTheGhastlord.java @@ -64,7 +64,7 @@ public class HelmOfTheGhastlord extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/KinscaerHarpoonist.java b/Mage.Sets/src/mage/sets/shadowmoor/KinscaerHarpoonist.java index 93f51b0220a..494e9168b60 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/KinscaerHarpoonist.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/KinscaerHarpoonist.java @@ -64,7 +64,7 @@ public class KinscaerHarpoonist extends CardImpl { Effect effect = new LoseAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn); effect.setText("you may have target creature lose flying until end of turn"); Ability ability = new AttacksTriggeredAbility(effect, true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/KithkinShielddare.java b/Mage.Sets/src/mage/sets/shadowmoor/KithkinShielddare.java index 60a6ad3a175..294bbd5af18 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/KithkinShielddare.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/KithkinShielddare.java @@ -65,7 +65,7 @@ public class KithkinShielddare extends CardImpl { new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("{W}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/KnacksawClique.java b/Mage.Sets/src/mage/sets/shadowmoor/KnacksawClique.java index 6d656cd14d2..a61c82cd4ab 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/KnacksawClique.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/KnacksawClique.java @@ -72,7 +72,7 @@ public class KnacksawClique extends CardImpl { // {1}{U}, {untap}: Target opponent exiles the top card of his or her library. Until end of turn, you may play that card. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new KnacksawCliqueEffect(), new ManaCostsImpl("{1}{U}")); ability.addCost(new UntapSourceCost()); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/LastBreath.java b/Mage.Sets/src/mage/sets/shadowmoor/LastBreath.java index e25f4b55b5f..44b35e55ff0 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/LastBreath.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/LastBreath.java @@ -64,7 +64,7 @@ public class LastBreath extends CardImpl { // Exile target creature with power 2 or less. Its controller gains 4 life. this.getSpellAbility().addEffect(new ExileTargetEffect()); this.getSpellAbility().addEffect(new LastBreathEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/LeechBonder.java b/Mage.Sets/src/mage/sets/shadowmoor/LeechBonder.java index 3f1b19db5cf..f6149769ed6 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/LeechBonder.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/LeechBonder.java @@ -75,8 +75,8 @@ public class LeechBonder extends CardImpl { // {U}, {untap}: Move a counter from target creature onto another target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LeechBonderEffect(), new ManaCostsImpl("{U}")); ability.addCost(new UntapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent("creature to remove counter from"), true)); - ability.addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent("creature to put counter on"), true)); + ability.addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent("creature to remove counter from"))); + ability.addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent("creature to put counter on"))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/MistmeadowWitch.java b/Mage.Sets/src/mage/sets/shadowmoor/MistmeadowWitch.java index 85b99bc3063..fb98fb4e9d8 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/MistmeadowWitch.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/MistmeadowWitch.java @@ -65,7 +65,7 @@ public class MistmeadowWitch extends CardImpl { // {2}{W}{U}: Exile target creature. Return that card to the battlefield under its owner's control at the beginning of the next end step. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MistmeadowWitchEffect(), new ManaCostsImpl("{2}{W}{U}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/NiveousWisps.java b/Mage.Sets/src/mage/sets/shadowmoor/NiveousWisps.java index f83de522e56..7a07c77e527 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/NiveousWisps.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/NiveousWisps.java @@ -51,7 +51,7 @@ public class NiveousWisps extends CardImpl { this.expansionSetCode = "SHM"; this.color.setWhite(true); // Target creature becomes white until end of turn. Tap that creature. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new SetCardColorTargetEffect(ObjectColor.WHITE, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new TapTargetEffect()); // Draw a card. diff --git a/Mage.Sets/src/mage/sets/shadowmoor/OonaQueenOfTheFae.java b/Mage.Sets/src/mage/sets/shadowmoor/OonaQueenOfTheFae.java index e85df4cbb99..7c956cdfbde 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/OonaQueenOfTheFae.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/OonaQueenOfTheFae.java @@ -69,7 +69,7 @@ public class OonaQueenOfTheFae extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {X}{UB}: Choose a color. Target opponent exiles the top X cards of his or her library. For each card of the chosen color exiled this way, put a 1/1 blue and black Faerie Rogue creature token with flying onto the battlefield. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new OonaQueenOfTheFaeEffect(), new ManaCostsImpl("{X}{U/B}")); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/PaleWayfarer.java b/Mage.Sets/src/mage/sets/shadowmoor/PaleWayfarer.java index 9db8b418752..2d256157962 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/PaleWayfarer.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/PaleWayfarer.java @@ -65,7 +65,7 @@ public class PaleWayfarer extends CardImpl { // {2}{W}{W}, {untap}: Target creature gains protection from the color of its controller's choice until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PaleWayfarerEffect(), new ManaCostsImpl("{2}{W}{W}")); ability.addCost(new UntapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/PrisonTerm.java b/Mage.Sets/src/mage/sets/shadowmoor/PrisonTerm.java index a439a417381..55800945144 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/PrisonTerm.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/PrisonTerm.java @@ -71,7 +71,7 @@ public class PrisonTerm extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/PunctureBolt.java b/Mage.Sets/src/mage/sets/shadowmoor/PunctureBolt.java index ba86f75ea29..b84c2d4834c 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/PunctureBolt.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/PunctureBolt.java @@ -51,7 +51,7 @@ public class PunctureBolt extends CardImpl { // Puncture Bolt deals 1 damage to target creature. Put a -1/-1 counter on that creature. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); this.getSpellAbility().addEffect(new AddCountersTargetEffect(CounterType.M1M1.createInstance())); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public PunctureBolt(final PunctureBolt card) { diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ReaperKing.java b/Mage.Sets/src/mage/sets/shadowmoor/ReaperKing.java index 33808d9eed5..a1db4e31a34 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ReaperKing.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ReaperKing.java @@ -77,7 +77,7 @@ public class ReaperKing extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); // Whenever another Scarecrow enters the battlefield under your control, destroy target permanent. Ability ability = new EntersBattlefieldControlledTriggeredAbility(new DestroyTargetEffect(), filterTrigger); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Reknit.java b/Mage.Sets/src/mage/sets/shadowmoor/Reknit.java index 7ea71400f5d..1826f7053af 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/Reknit.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/Reknit.java @@ -49,7 +49,7 @@ public class Reknit extends CardImpl { // Regenerate target permanent. this.getSpellAbility().addEffect(new RegenerateTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(true)); + this.getSpellAbility().addTarget(new TargetPermanent()); } public Reknit(final Reknit card) { diff --git a/Mage.Sets/src/mage/sets/shadowmoor/RevelsongHorn.java b/Mage.Sets/src/mage/sets/shadowmoor/RevelsongHorn.java index ac88c9ac26a..01a0448b7a0 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/RevelsongHorn.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/RevelsongHorn.java @@ -56,8 +56,8 @@ public class RevelsongHorn extends CardImpl { new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{1}")); ability.addCost(new TapSourceCost()); - ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(true))); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent())); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/RiteOfConsumption.java b/Mage.Sets/src/mage/sets/shadowmoor/RiteOfConsumption.java index 924d4c0cdda..6f0df0b9802 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/RiteOfConsumption.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/RiteOfConsumption.java @@ -59,7 +59,7 @@ public class RiteOfConsumption extends CardImpl { this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1,new FilterControlledCreaturePermanent("a creature"), false))); // Rite of Consumption deals damage equal to the sacrificed creature's power to target player. You gain life equal to the damage dealt this way. this.getSpellAbility().addEffect(new RiteOfConsumptionEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public RiteOfConsumption(final RiteOfConsumption card) { diff --git a/Mage.Sets/src/mage/sets/shadowmoor/RunesOfTheDeus.java b/Mage.Sets/src/mage/sets/shadowmoor/RunesOfTheDeus.java index ea37d1a379b..15365761a13 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/RunesOfTheDeus.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/RunesOfTheDeus.java @@ -63,7 +63,7 @@ public class RunesOfTheDeus extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Scar.java b/Mage.Sets/src/mage/sets/shadowmoor/Scar.java index af699cab744..194002cd5c3 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/Scar.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/Scar.java @@ -50,7 +50,7 @@ public class Scar extends CardImpl { // Put a -1/-1 counter on target creature.] this.getSpellAbility().addEffect(new AddCountersTargetEffect(CounterType.M1M1.createInstance())); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public Scar(final Scar card) { diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SeedcradleWitch.java b/Mage.Sets/src/mage/sets/shadowmoor/SeedcradleWitch.java index f10c76464af..b25541e2b86 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SeedcradleWitch.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SeedcradleWitch.java @@ -60,7 +60,7 @@ public class SeedcradleWitch extends CardImpl { // {2}{G}{W}: Target creature gets +3/+3 until end of turn. Untap that creature. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(3, 3, Duration.EndOfTurn), new ManaCostsImpl("{2}{G}{W}")); ability.addEffect(new UntapTargetEffect()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ShieldOfTheOversoul.java b/Mage.Sets/src/mage/sets/shadowmoor/ShieldOfTheOversoul.java index 003f9ab2c06..315063f752d 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ShieldOfTheOversoul.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ShieldOfTheOversoul.java @@ -63,7 +63,7 @@ public class ShieldOfTheOversoul extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SmolderInitiate.java b/Mage.Sets/src/mage/sets/shadowmoor/SmolderInitiate.java index 1cf1e714560..7a5886aa979 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SmolderInitiate.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SmolderInitiate.java @@ -66,7 +66,7 @@ public class SmolderInitiate extends CardImpl { // Whenever a player casts a black spell, you may pay {1}. If you do, target player loses 1 life. Ability ability = new SpellCastAllTriggeredAbility(new DoIfCostPaid(new LoseLifeTargetEffect(1), new ManaCostsImpl("{1}")), filter, false); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Somnomancer.java b/Mage.Sets/src/mage/sets/shadowmoor/Somnomancer.java index 57913cf8dbe..b8a213d0813 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/Somnomancer.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/Somnomancer.java @@ -55,7 +55,7 @@ public class Somnomancer extends CardImpl { // When Somnomancer enters the battlefield, you may tap target creature. EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new TapTargetEffect(), true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SootstokeKindler.java b/Mage.Sets/src/mage/sets/shadowmoor/SootstokeKindler.java index 0aa5c5d83b2..110c1ede2d0 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SootstokeKindler.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SootstokeKindler.java @@ -74,7 +74,7 @@ public class SootstokeKindler extends CardImpl { SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SteelOfTheGodhead.java b/Mage.Sets/src/mage/sets/shadowmoor/SteelOfTheGodhead.java index 1d74f3a7d54..451cd41ce48 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/SteelOfTheGodhead.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/SteelOfTheGodhead.java @@ -66,7 +66,7 @@ public class SteelOfTheGodhead extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/StripBare.java b/Mage.Sets/src/mage/sets/shadowmoor/StripBare.java index 7cecb5faa2b..4ad8eebb705 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/StripBare.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/StripBare.java @@ -56,7 +56,7 @@ public class StripBare extends CardImpl { // Destroy all Auras and Equipment attached to target creature. this.getSpellAbility().addEffect(new StripBareEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/TurnToMist.java b/Mage.Sets/src/mage/sets/shadowmoor/TurnToMist.java index 6593c1d5a39..d61fdc66a75 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/TurnToMist.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/TurnToMist.java @@ -48,7 +48,7 @@ public class TurnToMist extends CardImpl { // Exile target creature. Return that card to the battlefield under its owner's control at the beginning of the next end step. this.getSpellAbility().addEffect(new MistmeadowWitchEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public TurnToMist(final TurnToMist card) { diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ViridescentWisps.java b/Mage.Sets/src/mage/sets/shadowmoor/ViridescentWisps.java index 79549d0bfc7..d4899d932bb 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/ViridescentWisps.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/ViridescentWisps.java @@ -51,7 +51,7 @@ public class ViridescentWisps extends CardImpl { this.expansionSetCode = "SHM"; this.color.setGreen(true); // Target creature becomes green and gets +1/+0 until end of turn. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new SetCardColorTargetEffect(ObjectColor.GREEN, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new BoostTargetEffect(1,0, Duration.EndOfTurn)); // Draw a card. diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Woeleecher.java b/Mage.Sets/src/mage/sets/shadowmoor/Woeleecher.java index 32e20c5e934..83fdc2e5a49 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/Woeleecher.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/Woeleecher.java @@ -63,7 +63,7 @@ public class Woeleecher extends CardImpl { // {W}, {tap}: Remove a -1/-1 counter from target creature. If you do, you gain 2 life. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WoeleecherEffect(), new ManaCostsImpl("{W}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/shadowmoor/WoodfallPrimus.java b/Mage.Sets/src/mage/sets/shadowmoor/WoodfallPrimus.java index c220144a7a5..19d4e333675 100644 --- a/Mage.Sets/src/mage/sets/shadowmoor/WoodfallPrimus.java +++ b/Mage.Sets/src/mage/sets/shadowmoor/WoodfallPrimus.java @@ -67,7 +67,7 @@ public class WoodfallPrimus extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // When Woodfall Primus enters the battlefield, destroy target noncreature permanent. Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); // Persist this.addAbility(new PersistAbility()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/AjaniVengeant.java b/Mage.Sets/src/mage/sets/shardsofalara/AjaniVengeant.java index 147c28de053..9452763e315 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/AjaniVengeant.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/AjaniVengeant.java @@ -68,7 +68,7 @@ public class AjaniVengeant extends CardImpl { LoyaltyAbility ability1 = new LoyaltyAbility(new SkipNextUntapTargetEffect(), 1); - ability1.addTarget(new TargetPermanent(true)); + ability1.addTarget(new TargetPermanent()); this.addAbility(ability1); Effects effects1 = new Effects(); @@ -79,7 +79,7 @@ public class AjaniVengeant extends CardImpl { this.addAbility(ability2); LoyaltyAbility ability3 = new LoyaltyAbility(new DestroyAllControlledTargetEffect(filter), -7); - ability3.addTarget(new TargetPlayer(true)); + ability3.addTarget(new TargetPlayer()); this.addAbility(ability3); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/AngelicBenediction.java b/Mage.Sets/src/mage/sets/shardsofalara/AngelicBenediction.java index 3ca8097de65..f752e61605e 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/AngelicBenediction.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/AngelicBenediction.java @@ -71,7 +71,7 @@ class AngelicBenedictionTriggeredAbility extends TriggeredAbilityImpl { public AngelicBenedictionTriggeredAbility() { super(Zone.BATTLEFIELD, new TapTargetEffect(), true); - this.addTarget(new TargetCreaturePermanent(true)); + this.addTarget(new TargetCreaturePermanent()); } public AngelicBenedictionTriggeredAbility(final AngelicBenedictionTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BanewaspAffliction.java b/Mage.Sets/src/mage/sets/shardsofalara/BanewaspAffliction.java index 2108671262c..a5080df5ddd 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BanewaspAffliction.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BanewaspAffliction.java @@ -59,7 +59,7 @@ public class BanewaspAffliction extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BantBattlemage.java b/Mage.Sets/src/mage/sets/shardsofalara/BantBattlemage.java index 1cf37bde6a6..af05a998f94 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BantBattlemage.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BantBattlemage.java @@ -60,11 +60,11 @@ public class BantBattlemage extends CardImpl { this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{G}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{U}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BantCharm.java b/Mage.Sets/src/mage/sets/shardsofalara/BantCharm.java index d8753588d5d..65e6f4d4091 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BantCharm.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BantCharm.java @@ -67,7 +67,7 @@ public class BantCharm extends CardImpl { // or put target creature on the bottom of its owner's library; Mode mode = new Mode(); mode.getEffects().add(new PutOnLibraryTargetEffect(false)); - mode.getTargets().add(new TargetCreaturePermanent(true)); + mode.getTargets().add(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); // or counter target instant spell. mode = new Mode(); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Blightning.java b/Mage.Sets/src/mage/sets/shardsofalara/Blightning.java index 9baa7bf2214..5ed32286175 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Blightning.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Blightning.java @@ -49,7 +49,7 @@ public class Blightning extends CardImpl { this.color.setRed(true); // Blightning deals 3 damage to target player. That player discards two cards. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addEffect(new DiscardTargetEffect(2)); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BlisterBeetle.java b/Mage.Sets/src/mage/sets/shardsofalara/BlisterBeetle.java index a65a6a9ad23..17d1862bebc 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BlisterBeetle.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BlisterBeetle.java @@ -54,7 +54,7 @@ public class BlisterBeetle extends CardImpl { this.toughness = new MageInt(1); Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(-1, -1, Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BloodCultist.java b/Mage.Sets/src/mage/sets/shardsofalara/BloodCultist.java index 999dc3ea24a..bec0fbbee6f 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BloodCultist.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BloodCultist.java @@ -61,7 +61,7 @@ public class BloodCultist extends CardImpl { // {tap}: Blood Cultist deals 1 damage to target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Whenever a creature dealt damage by Blood Cultist this turn dies, put a +1/+1 counter on Blood Cultist. this.addAbility(new DiesAndDealtDamageThisTurnTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()))); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BloodpyreElemental.java b/Mage.Sets/src/mage/sets/shardsofalara/BloodpyreElemental.java index 26c37a7e99b..4143ec00341 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BloodpyreElemental.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BloodpyreElemental.java @@ -57,7 +57,7 @@ public class BloodpyreElemental extends CardImpl { // Sacrifice Bloodpyre Elemental: Bloodpyre Elemental deals 4 damage to target creature. Activate this ability only any time you could cast a sorcery. Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4), new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BloodthornTaunter.java b/Mage.Sets/src/mage/sets/shardsofalara/BloodthornTaunter.java index 9aeb2323c3d..09c628a97c6 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BloodthornTaunter.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BloodthornTaunter.java @@ -69,7 +69,7 @@ public class BloodthornTaunter extends CardImpl { SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BoneSplinters.java b/Mage.Sets/src/mage/sets/shardsofalara/BoneSplinters.java index 64da4ba330a..0306b339f15 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BoneSplinters.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BoneSplinters.java @@ -49,9 +49,9 @@ public class BoneSplinters extends CardImpl { this.color.setBlack(true); // As an additional cost to cast Bone Splinters, sacrifice a creature. - this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); // Destroy target creature. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DestroyTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BrilliantUltimatum.java b/Mage.Sets/src/mage/sets/shardsofalara/BrilliantUltimatum.java index b5d78f41885..2250a50c6c5 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/BrilliantUltimatum.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/BrilliantUltimatum.java @@ -62,7 +62,7 @@ public class BrilliantUltimatum extends CardImpl { // Exile the top five cards of your library. An opponent separates those cards into two piles. You may play any number of cards from one of those piles without paying their mana costs. this.getSpellAbility().addEffect(new BrilliantUltimatumEffect()); - this.getSpellAbility().addTarget(new TargetOpponent(true, true)); + this.getSpellAbility().addTarget(new TargetOpponent(true)); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CallToHeel.java b/Mage.Sets/src/mage/sets/shardsofalara/CallToHeel.java index b2905b0bf26..1ba540f2a2f 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CallToHeel.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CallToHeel.java @@ -56,7 +56,7 @@ public class CallToHeel extends CardImpl { // Return target creature to its owner's hand. Its controller draws a card. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); this.getSpellAbility().addEffect(new CallToHeelEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public CallToHeel(final CallToHeel card) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CatharticAdept.java b/Mage.Sets/src/mage/sets/shardsofalara/CatharticAdept.java index f72bf76d119..250aaf7ea21 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CatharticAdept.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CatharticAdept.java @@ -57,7 +57,7 @@ public class CatharticAdept extends CardImpl { SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ComaVeil.java b/Mage.Sets/src/mage/sets/shardsofalara/ComaVeil.java index 8826e441388..f9079929fc8 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ComaVeil.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ComaVeil.java @@ -62,7 +62,7 @@ public class ComaVeil extends CardImpl { this.color.setBlue(true); // Enchant artifact or creature - TargetPermanent auraTarget = new TargetPermanent(filter, true); + TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); // Enchanted permanent doesn't untap during its controller's untap step. diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CovenantOfMinds.java b/Mage.Sets/src/mage/sets/shardsofalara/CovenantOfMinds.java index 8c7e544c1b4..8bb39c490d9 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CovenantOfMinds.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CovenantOfMinds.java @@ -56,7 +56,7 @@ public class CovenantOfMinds extends CardImpl { // Reveal the top three cards of your library. Target opponent may choose to put those cards into your hand. // If he or she doesn't, put those cards into your graveyard and draw five cards. this.getSpellAbility().addEffect(new CovenantOfMindsEffect()); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); } public CovenantOfMinds(final CovenantOfMinds card) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CradleOfVitality.java b/Mage.Sets/src/mage/sets/shardsofalara/CradleOfVitality.java index 60e2926d2a5..abc5fec5713 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CradleOfVitality.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CradleOfVitality.java @@ -58,7 +58,7 @@ public class CradleOfVitality extends CardImpl { // Whenever you gain life, you may pay {1}{W}. If you do, put a +1/+1 counter on target creature for each 1 life you gained. Ability ability = new CradleOfVitalityGainLifeTriggeredAbility(); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CruelUltimatum.java b/Mage.Sets/src/mage/sets/shardsofalara/CruelUltimatum.java index a619e404edc..aee2fb0b4ab 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/CruelUltimatum.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/CruelUltimatum.java @@ -60,7 +60,7 @@ public class CruelUltimatum extends CardImpl { this.color.setBlack(true); // Target opponent sacrifices a creature, discards three cards, then loses 5 life. You return a creature card from your graveyard to your hand, draw three cards, then gain 5 life. - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); this.getSpellAbility().addEffect(new SacrificeEffect(new FilterCreaturePermanent(), 1, "Target opponent")); this.getSpellAbility().addEffect(new DiscardTargetEffect(3)); this.getSpellAbility().addEffect(new LoseLifeTargetEffect(5)); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/DispellersCapsule.java b/Mage.Sets/src/mage/sets/shardsofalara/DispellersCapsule.java index c1b9e54bead..e2b04830231 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/DispellersCapsule.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/DispellersCapsule.java @@ -63,7 +63,7 @@ public class DispellersCapsule extends CardImpl { this.color.setWhite(true); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{2}{W}")); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ElspethKnightErrant.java b/Mage.Sets/src/mage/sets/shardsofalara/ElspethKnightErrant.java index cf8d98b7307..9c34765b64a 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ElspethKnightErrant.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ElspethKnightErrant.java @@ -84,7 +84,7 @@ public class ElspethKnightErrant extends CardImpl { effect.setText("and gains flying until end of turn"); effects1.add(effect); LoyaltyAbility ability1 = new LoyaltyAbility(effects1, 1); - ability1.addTarget(new TargetCreaturePermanent(true)); + ability1.addTarget(new TargetCreaturePermanent()); this.addAbility(ability1); // -8: You get an emblem with "Artifacts, creatures, enchantments, and lands you control are indestructible." diff --git a/Mage.Sets/src/mage/sets/shardsofalara/EsperBattlemage.java b/Mage.Sets/src/mage/sets/shardsofalara/EsperBattlemage.java index 017840590ef..6fb007d9dca 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/EsperBattlemage.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/EsperBattlemage.java @@ -71,7 +71,7 @@ public class EsperBattlemage extends CardImpl { new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/EsperCharm.java b/Mage.Sets/src/mage/sets/shardsofalara/EsperCharm.java index f3db4719d26..e8d72531789 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/EsperCharm.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/EsperCharm.java @@ -62,7 +62,7 @@ public class EsperCharm extends CardImpl { // Choose one - Destroy target enchantment; this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); // or draw two cards; Mode mode = new Mode(); mode.getEffects().add(new DrawCardSourceControllerEffect(2)); @@ -70,7 +70,7 @@ public class EsperCharm extends CardImpl { // or target player discards two cards. mode = new Mode(); mode.getEffects().add(new DiscardTargetEffect(2)); - mode.getTargets().add(new TargetPlayer(true)); + mode.getTargets().add(new TargetPlayer()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Excommunicate.java b/Mage.Sets/src/mage/sets/shardsofalara/Excommunicate.java index 5adf29d306f..495e538708b 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Excommunicate.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Excommunicate.java @@ -45,7 +45,7 @@ public class Excommunicate extends CardImpl { super(ownerId, 11, "Excommunicate", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{W}"); this.expansionSetCode = "ALA"; this.color.setWhite(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true)); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ExecutionersCapsule.java b/Mage.Sets/src/mage/sets/shardsofalara/ExecutionersCapsule.java index 65c47240765..84f63a733d2 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ExecutionersCapsule.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ExecutionersCapsule.java @@ -64,7 +64,7 @@ public class ExecutionersCapsule extends CardImpl { SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ExuberantFirestoker.java b/Mage.Sets/src/mage/sets/shardsofalara/ExuberantFirestoker.java index 61fe134aa3e..64cfc36d001 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ExuberantFirestoker.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ExuberantFirestoker.java @@ -86,7 +86,7 @@ class ExuberantFirestokerTriggeredAbility extends TriggeredAbilityImpl { public ExuberantFirestokerTriggeredAbility() { super(Zone.BATTLEFIELD, new DamageTargetEffect(2), true); - this.addTarget(new TargetPlayer(true)); + this.addTarget(new TargetPlayer()); } public ExuberantFirestokerTriggeredAbility(final ExuberantFirestokerTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Fatestitcher.java b/Mage.Sets/src/mage/sets/shardsofalara/Fatestitcher.java index d67160188fd..e9185add12e 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Fatestitcher.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Fatestitcher.java @@ -67,7 +67,7 @@ public class Fatestitcher extends CardImpl { // {tap}: You may tap or untap another target permanent. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new TapSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); // Unearth {U} this.addAbility(new UnearthAbility(new ManaCostsImpl("{U}"))); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/FiligreeSages.java b/Mage.Sets/src/mage/sets/shardsofalara/FiligreeSages.java index 17989ade3fe..2eb343337f4 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/FiligreeSages.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/FiligreeSages.java @@ -62,7 +62,7 @@ public class FiligreeSages extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl("{2}{U}")); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/FlameblastDragon.java b/Mage.Sets/src/mage/sets/shardsofalara/FlameblastDragon.java index 4eb5c8cf524..a262cb2be48 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/FlameblastDragon.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/FlameblastDragon.java @@ -63,7 +63,7 @@ public class FlameblastDragon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Whenever Flameblast Dragon attacks, you may pay {X}{R}. If you do, Flameblast Dragon deals X damage to target creature or player. Ability ability = new AttacksTriggeredAbility(new FlameblastDragonEffect(), false); - ability.addTarget(new TargetCreatureOrPlayer(true)); + ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Godtoucher.java b/Mage.Sets/src/mage/sets/shardsofalara/Godtoucher.java index 3122e30e7c5..354a5aa8d03 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Godtoucher.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Godtoucher.java @@ -72,7 +72,7 @@ public class Godtoucher extends CardImpl { new GodtoucherEffect(Duration.EndOfTurn), new ManaCostsImpl("{1}{W}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/GrixisBattlemage.java b/Mage.Sets/src/mage/sets/shardsofalara/GrixisBattlemage.java index fb2bfda575e..c32c8db9168 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/GrixisBattlemage.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/GrixisBattlemage.java @@ -66,7 +66,7 @@ public class GrixisBattlemage extends CardImpl { // {R}, {tap}: Target creature can't block this turn. Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{R}")); ability2.addCost(new TapSourceCost()); - ability2.addTarget(new TargetCreaturePermanent(true)); + ability2.addTarget(new TargetCreaturePermanent()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/GrixisCharm.java b/Mage.Sets/src/mage/sets/shardsofalara/GrixisCharm.java index f4450626e16..e401783963d 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/GrixisCharm.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/GrixisCharm.java @@ -56,11 +56,11 @@ public class GrixisCharm extends CardImpl { // Choose one - Return target permanent to its owner's hand; this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(true)); + this.getSpellAbility().addTarget(new TargetPermanent()); // or target creature gets -4/-4 until end of turn; Mode mode = new Mode(); mode.getEffects().add(new BoostTargetEffect(-4, -4, Duration.EndOfTurn)); - mode.getTargets().add(new TargetCreaturePermanent(true)); + mode.getTargets().add(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); // or creatures you control get +2/+0 until end of turn. mode = new Mode(); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/HissingIguanar.java b/Mage.Sets/src/mage/sets/shardsofalara/HissingIguanar.java index 950560fbb00..34693b88214 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/HissingIguanar.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/HissingIguanar.java @@ -53,7 +53,7 @@ public class HissingIguanar extends CardImpl { // Whenever another creature dies, you may have Hissing Iguanar deal 1 damage to target player. DiesCreatureTriggeredAbility ability = new DiesCreatureTriggeredAbility(new DamageTargetEffect(1), true, true); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/JundBattlemage.java b/Mage.Sets/src/mage/sets/shardsofalara/JundBattlemage.java index 3c83bf17d05..03b2f960693 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/JundBattlemage.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/JundBattlemage.java @@ -59,7 +59,7 @@ public class JundBattlemage extends CardImpl { this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl("{B}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl("{G}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/JundCharm.java b/Mage.Sets/src/mage/sets/shardsofalara/JundCharm.java index 81663918867..cb93c3f93ea 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/JundCharm.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/JundCharm.java @@ -57,7 +57,7 @@ public class JundCharm extends CardImpl { // Choose one - Exile all cards from target player's graveyard; this.getSpellAbility().addEffect(new ExileGraveyardAllTargetPlayerEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); // or Jund Charm deals 2 damage to each creature; Mode mode = new Mode(); mode.getEffects().add(new DamageAllEffect(2, new FilterCreaturePermanent())); @@ -65,7 +65,7 @@ public class JundCharm extends CardImpl { // or put two +1/+1 counters on target creature. mode = new Mode(); mode.getEffects().add(new AddCountersTargetEffect(CounterType.P1P1.createInstance(2), Outcome.BoostCreature)); - mode.getTargets().add(new TargetCreaturePermanent(true)); + mode.getTargets().add(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/KissOfTheAmesha.java b/Mage.Sets/src/mage/sets/shardsofalara/KissOfTheAmesha.java index 0210f5f7bc2..929aca2548e 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/KissOfTheAmesha.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/KissOfTheAmesha.java @@ -49,7 +49,7 @@ public class KissOfTheAmesha extends CardImpl { this.color.setWhite(true); // Target player gains 7 life and draws two cards. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new GainLifeTargetEffect(7)); this.getSpellAbility().addEffect(new DrawCardTargetEffect(2)); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/LightningTalons.java b/Mage.Sets/src/mage/sets/shardsofalara/LightningTalons.java index 1bf082a4d7e..768e3000e02 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/LightningTalons.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/LightningTalons.java @@ -59,7 +59,7 @@ public class LightningTalons extends CardImpl { this.subtype.add("Aura"); this.color.setRed(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/MagmaSpray.java b/Mage.Sets/src/mage/sets/shardsofalara/MagmaSpray.java index 0cd31e73971..b7971fbeaad 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/MagmaSpray.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/MagmaSpray.java @@ -58,7 +58,7 @@ public class MagmaSpray extends CardImpl { // Magma Spray deals 2 damage to target creature. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // If that creature would die this turn, exile it instead. this.getSpellAbility().addEffect(new MagmaSprayEffect()); this.addWatcher(new DamagedByWatcher()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Mosstodon.java b/Mage.Sets/src/mage/sets/shardsofalara/Mosstodon.java index 63190298ad2..bac39002c30 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Mosstodon.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Mosstodon.java @@ -68,7 +68,7 @@ public class Mosstodon extends CardImpl { SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}")); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/NayaBattlemage.java b/Mage.Sets/src/mage/sets/shardsofalara/NayaBattlemage.java index 8eee74a6c20..806fdc11f2d 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/NayaBattlemage.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/NayaBattlemage.java @@ -59,11 +59,11 @@ public class NayaBattlemage extends CardImpl { this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{W}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/NayaCharm.java b/Mage.Sets/src/mage/sets/shardsofalara/NayaCharm.java index c634bbded31..3914673d82f 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/NayaCharm.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/NayaCharm.java @@ -62,7 +62,7 @@ public class NayaCharm extends CardImpl { // Choose one - Naya Charm deals 3 damage to target creature; this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // or return target card from a graveyard to its owner's hand; Mode mode = new Mode(); mode.getEffects().add(new ReturnToHandTargetEffect()); @@ -71,7 +71,7 @@ public class NayaCharm extends CardImpl { // or tap all creatures target player controls. mode = new Mode(); mode.getEffects().add(new NayaCharmEffect()); - mode.getTargets().add(new TargetPlayer(true)); + mode.getTargets().add(new TargetPlayer()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/OnyxGoblet.java b/Mage.Sets/src/mage/sets/shardsofalara/OnyxGoblet.java index 82eb262bf58..6db9e9f7594 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/OnyxGoblet.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/OnyxGoblet.java @@ -51,7 +51,7 @@ public class OnyxGoblet extends CardImpl { this.color.setBlack(true); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RakeclawGargantuan.java b/Mage.Sets/src/mage/sets/shardsofalara/RakeclawGargantuan.java index 70723037b0c..5785b55b061 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/RakeclawGargantuan.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/RakeclawGargantuan.java @@ -69,7 +69,7 @@ public class RakeclawGargantuan extends CardImpl { SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}")); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RelicOfProgenitus.java b/Mage.Sets/src/mage/sets/shardsofalara/RelicOfProgenitus.java index 3a34edc6950..4c722ecfa1a 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/RelicOfProgenitus.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/RelicOfProgenitus.java @@ -60,7 +60,7 @@ public class RelicOfProgenitus extends CardImpl { // {tap}: Target player exiles a card from his or her graveyard. Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RelicOfProgenitusEffect(), new TapSourceCost()); - firstAbility.addTarget(new TargetPlayer(true)); + firstAbility.addTarget(new TargetPlayer()); this.addAbility(firstAbility); // {1}, Exile Relic of Progenitus: Exile all cards from all graveyards. Draw a card. Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RelicOfProgenitusEffect2(),new GenericManaCost(1)); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingRoar.java b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingRoar.java index c87aa8f9cc8..66df675e6a2 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingRoar.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingRoar.java @@ -54,12 +54,12 @@ public class ResoundingRoar extends CardImpl { // Target creature gets +3/+3 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(3, 3, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Cycling {5}{R}{G}{W} this.addAbility(new CyclingAbility(new ManaCostsImpl("{5}{R}{G}{W}"))); // When you cycle Resounding Roar, target creature gets +6/+6 until end of turn. Ability ability = new CycleTriggeredAbility(new BoostTargetEffect(6, 6, Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingScream.java b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingScream.java index e6c099c03f3..016f2525a95 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingScream.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingScream.java @@ -52,12 +52,12 @@ public class ResoundingScream extends CardImpl { // Target player discards a card at random. this.getSpellAbility().addEffect(new DiscardTargetEffect(1, true)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); // Cycling {5}{U}{B}{R} this.addAbility(new CyclingAbility(new ManaCostsImpl("{5}{U}{B}{R}"))); // When you cycle Resounding Scream, target player discards two cards at random. Ability ability = new CycleTriggeredAbility(new DiscardTargetEffect(2, true)); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingThunder.java b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingThunder.java index 0efbdb01bfe..611d18f8ecb 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingThunder.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingThunder.java @@ -57,7 +57,7 @@ public class ResoundingThunder extends CardImpl { this.addAbility(new CyclingAbility(new ManaCostsImpl("{5}{B}{R}{G}"))); // When you cycle Resounding Thunder, it deals 6 damage to target creature or player. Ability ability = new CycleTriggeredAbility(new DamageTargetEffect(6)); - ability.addTarget(new TargetCreatureOrPlayer(true)); + ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingWave.java b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingWave.java index 846c66cd070..bdfa76d8c3a 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingWave.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingWave.java @@ -53,7 +53,7 @@ public class ResoundingWave extends CardImpl { // Return target permanent to its owner's hand. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(true)); + this.getSpellAbility().addTarget(new TargetPermanent()); // Cycling {5}{W}{U}{B} this.addAbility(new CyclingAbility(new ManaCostsImpl("{5}{W}{U}{B}"))); // When you cycle Resounding Wave, return two target permanents to their owners' hands. diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SangriteSurge.java b/Mage.Sets/src/mage/sets/shardsofalara/SangriteSurge.java index 3138a9bf4ed..a1307ee8e23 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SangriteSurge.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SangriteSurge.java @@ -53,7 +53,7 @@ public class SangriteSurge extends CardImpl { // Target creature gets +3/+3 and gains double strike until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(3, 3, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public SangriteSurge(final SangriteSurge card) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SarkhanVol.java b/Mage.Sets/src/mage/sets/shardsofalara/SarkhanVol.java index cbc0b3c2cca..c1ff1dcf9b2 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SarkhanVol.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SarkhanVol.java @@ -76,7 +76,7 @@ public class SarkhanVol extends CardImpl { effects2.add(new UntapTargetEffect()); effects2.add(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); LoyaltyAbility ability = new LoyaltyAbility(effects2, -2); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // -6: Put five 4/4 red Dragon creature tokens with flying onto the battlefield. diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SavageHunger.java b/Mage.Sets/src/mage/sets/shardsofalara/SavageHunger.java index 562face3102..6408baa4ce6 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SavageHunger.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SavageHunger.java @@ -60,7 +60,7 @@ public class SavageHunger extends CardImpl { this.subtype.add("Aura"); this.color.setGreen(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SigilBlessing.java b/Mage.Sets/src/mage/sets/shardsofalara/SigilBlessing.java index a8fa63d30e4..f47fcb23aa3 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SigilBlessing.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SigilBlessing.java @@ -52,7 +52,7 @@ public class SigilBlessing extends CardImpl { this.color.setWhite(true); // Until end of turn, target creature you control gets +3/+3 and other creatures you control get +1/+1. - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new BoostControlledEffect(1, 1, Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SkeletalKathari.java b/Mage.Sets/src/mage/sets/shardsofalara/SkeletalKathari.java index eec3e0dc976..1845d723e44 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SkeletalKathari.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SkeletalKathari.java @@ -59,7 +59,7 @@ public class SkeletalKathari extends CardImpl { this.addAbility(FlyingAbility.getInstance()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}")); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Skeletonize.java b/Mage.Sets/src/mage/sets/shardsofalara/Skeletonize.java index 2727660410e..829316d6fbd 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/Skeletonize.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/Skeletonize.java @@ -65,7 +65,7 @@ public class Skeletonize extends CardImpl { // Skeletonize deals 3 damage to target creature. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // When a creature dealt damage this way dies this turn, put a 1/1 black Skeleton creature token onto the battlefield with "{B}: Regenerate this creature." this.getSpellAbility().addEffect(new SkeletonizeEffect()); this.addWatcher(new DamagedByWatcher()); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SoulsFire.java b/Mage.Sets/src/mage/sets/shardsofalara/SoulsFire.java index ae39ea55cd1..4d79f609195 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SoulsFire.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SoulsFire.java @@ -56,7 +56,7 @@ public class SoulsFire extends CardImpl { // Target creature you control on the battlefield deals damage equal to its power to target creature or player. this.getSpellAbility().addEffect(new SoulsFireEffect()); - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SoulsGrace.java b/Mage.Sets/src/mage/sets/shardsofalara/SoulsGrace.java index 4eb0ebb00b7..01b4d1bea13 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SoulsGrace.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SoulsGrace.java @@ -52,7 +52,7 @@ public class SoulsGrace extends CardImpl { this.color.setWhite(true); // You gain life equal to target creature's power. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new SoulsGraceEffect()); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SoulsMight.java b/Mage.Sets/src/mage/sets/shardsofalara/SoulsMight.java index b668af9d7ee..0a35aeffa5f 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SoulsMight.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SoulsMight.java @@ -53,7 +53,7 @@ public class SoulsMight extends CardImpl { // Put X +1/+1 counters on target creature, where X is that creature's power. this.getSpellAbility().addEffect(new SoulsMightEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public SoulsMight(final SoulsMight card) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SpearbreakerBehemoth.java b/Mage.Sets/src/mage/sets/shardsofalara/SpearbreakerBehemoth.java index 7112b39e34a..f741b80c28d 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SpearbreakerBehemoth.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SpearbreakerBehemoth.java @@ -70,7 +70,7 @@ public class SpearbreakerBehemoth extends CardImpl { SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}")); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/TarFiend.java b/Mage.Sets/src/mage/sets/shardsofalara/TarFiend.java index 4abd35ee851..c02ece3ede7 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/TarFiend.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/TarFiend.java @@ -59,7 +59,7 @@ public class TarFiend extends CardImpl { // When Tar Fiend enters the battlefield, target player discards a card for each creature it devoured. Ability ability = new EntersBattlefieldTriggeredAbility(new DiscardTargetEffect(new DevouredCreaturesCount())); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ThoughtcutterAgent.java b/Mage.Sets/src/mage/sets/shardsofalara/ThoughtcutterAgent.java index 6bb25abdc3f..3356432ecfd 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ThoughtcutterAgent.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ThoughtcutterAgent.java @@ -69,7 +69,7 @@ public class ThoughtcutterAgent extends CardImpl { revealEffect.setText("and reveals his or her hand"); ability.addEffect(revealEffect); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/TidehollowSculler.java b/Mage.Sets/src/mage/sets/shardsofalara/TidehollowSculler.java index 3e047b0a9f2..c1d53941a57 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/TidehollowSculler.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/TidehollowSculler.java @@ -66,7 +66,7 @@ public class TidehollowSculler extends CardImpl { // When Tidehollow Sculler enters the battlefield, target opponent reveals his or her hand and you choose a nonland card from it. Exile that card. Ability ability = new EntersBattlefieldTriggeredAbility(new TidehollowScullerExileEffect(), false); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/VeinDrinker.java b/Mage.Sets/src/mage/sets/shardsofalara/VeinDrinker.java index f0630ea4593..7d7fbc3015f 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/VeinDrinker.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/VeinDrinker.java @@ -69,7 +69,7 @@ public class VeinDrinker extends CardImpl { // {R}, {tap}: Vein Drinker deals damage equal to its power to target creature. That creature deals damage equal to its power to Vein Drinker. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VeinDrinkerEffect(), new ManaCostsImpl("{R}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Whenever a creature dealt damage by Vein Drinker this turn dies, put a +1/+1 counter on Vein Drinker. this.addAbility(new DiesAndDealtDamageThisTurnTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()))); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ViciousShadows.java b/Mage.Sets/src/mage/sets/shardsofalara/ViciousShadows.java index ab84aac8af3..7ee8ea2cb0e 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ViciousShadows.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ViciousShadows.java @@ -53,7 +53,7 @@ public class ViciousShadows extends CardImpl { // Whenever a creature dies, you may have Vicious Shadows deal damage to target player equal to the number of cards in that player's hand. Ability ability = new DiesCreatureTriggeredAbility(new DamageTargetEffect(new TargetPlayerCardsInHandCount()), true); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/VolcanicSubmersion.java b/Mage.Sets/src/mage/sets/shardsofalara/VolcanicSubmersion.java index a4a82e2ff6f..f06170b6ff6 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/VolcanicSubmersion.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/VolcanicSubmersion.java @@ -61,7 +61,7 @@ public class VolcanicSubmersion extends CardImpl { // Destroy target artifact or land. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); // Cycling {2} this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/WelkinGuide.java b/Mage.Sets/src/mage/sets/shardsofalara/WelkinGuide.java index c26f050bd9d..067d9f11749 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/WelkinGuide.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/WelkinGuide.java @@ -59,7 +59,7 @@ public class WelkinGuide extends CardImpl { this.addAbility(FlyingAbility.getInstance()); Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn), false); ability.addEffect(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/stronghold/StrongholdAssassin.java b/Mage.Sets/src/mage/sets/stronghold/StrongholdAssassin.java index 9616edf22fe..19ff73995dd 100644 --- a/Mage.Sets/src/mage/sets/stronghold/StrongholdAssassin.java +++ b/Mage.Sets/src/mage/sets/stronghold/StrongholdAssassin.java @@ -71,7 +71,7 @@ public class StrongholdAssassin extends CardImpl { // {tap}, Sacrifice a creature: Destroy target nonblack creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1, new FilterControlledCreaturePermanent("a creature"), true))); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/tempest/AdvanceScout.java b/Mage.Sets/src/mage/sets/tempest/AdvanceScout.java index e59000d8b18..6c64e14054d 100644 --- a/Mage.Sets/src/mage/sets/tempest/AdvanceScout.java +++ b/Mage.Sets/src/mage/sets/tempest/AdvanceScout.java @@ -56,7 +56,7 @@ public class AdvanceScout extends CardImpl { this.toughness = new MageInt(1); this.addAbility(FirstStrikeAbility.getInstance()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.W)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/Aftershock.java b/Mage.Sets/src/mage/sets/tempest/Aftershock.java index 8663f9359f9..7d2610124c4 100644 --- a/Mage.Sets/src/mage/sets/tempest/Aftershock.java +++ b/Mage.Sets/src/mage/sets/tempest/Aftershock.java @@ -58,7 +58,7 @@ public class Aftershock extends CardImpl { this.expansionSetCode = "TMP"; this.color.setRed(true); this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new DamageControllerEffect(3)); } diff --git a/Mage.Sets/src/mage/sets/tempest/AltarOfDementia.java b/Mage.Sets/src/mage/sets/tempest/AltarOfDementia.java index b92108c1e36..057d22782de 100644 --- a/Mage.Sets/src/mage/sets/tempest/AltarOfDementia.java +++ b/Mage.Sets/src/mage/sets/tempest/AltarOfDementia.java @@ -65,7 +65,7 @@ public class AltarOfDementia extends CardImpl { // Sacrifice a creature: Target player puts a number of cards equal to the sacrificed creature's power from the top of his or her library into his or her graveyard. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AltarOfDementiaEffect(), new SacrificeTargetCost(new TargetControlledPermanent(filter))); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/BrokenFall.java b/Mage.Sets/src/mage/sets/tempest/BrokenFall.java index 5a38d8bc63a..07ed993ec92 100644 --- a/Mage.Sets/src/mage/sets/tempest/BrokenFall.java +++ b/Mage.Sets/src/mage/sets/tempest/BrokenFall.java @@ -50,7 +50,7 @@ public class BrokenFall extends CardImpl { this.expansionSetCode = "TMP"; this.color.setGreen(true); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ReturnToHandSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/Capsize.java b/Mage.Sets/src/mage/sets/tempest/Capsize.java index 29b1aa64e2a..cf068a9af47 100644 --- a/Mage.Sets/src/mage/sets/tempest/Capsize.java +++ b/Mage.Sets/src/mage/sets/tempest/Capsize.java @@ -52,7 +52,7 @@ public class Capsize extends CardImpl { // Return target permanent to its owner's hand. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(true)); + this.getSpellAbility().addTarget(new TargetPermanent()); } public Capsize(final Capsize card) { diff --git a/Mage.Sets/src/mage/sets/tempest/CloudchaserEagle.java b/Mage.Sets/src/mage/sets/tempest/CloudchaserEagle.java index 7358b2efe62..540a2edf9b0 100644 --- a/Mage.Sets/src/mage/sets/tempest/CloudchaserEagle.java +++ b/Mage.Sets/src/mage/sets/tempest/CloudchaserEagle.java @@ -61,7 +61,7 @@ public class CloudchaserEagle extends CardImpl { this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/CommanderGrevenIlVec.java b/Mage.Sets/src/mage/sets/tempest/CommanderGrevenIlVec.java index d4db5c98de5..bdc7026f2e0 100644 --- a/Mage.Sets/src/mage/sets/tempest/CommanderGrevenIlVec.java +++ b/Mage.Sets/src/mage/sets/tempest/CommanderGrevenIlVec.java @@ -54,7 +54,7 @@ public class CommanderGrevenIlVec extends CardImpl { this.power = new MageInt(7); this.toughness = new MageInt(5); Ability ability = new EntersBattlefieldTriggeredAbility(new SacrificeTargetEffect(), false); - ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); this.addAbility(FearAbility.getInstance()); } diff --git a/Mage.Sets/src/mage/sets/tempest/CrownOfFlames.java b/Mage.Sets/src/mage/sets/tempest/CrownOfFlames.java index a44dfa6d5c6..b1c00944daa 100644 --- a/Mage.Sets/src/mage/sets/tempest/CrownOfFlames.java +++ b/Mage.Sets/src/mage/sets/tempest/CrownOfFlames.java @@ -52,7 +52,7 @@ public class CrownOfFlames extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Aura"); this.color.setRed(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/tempest/DarkBanishing.java b/Mage.Sets/src/mage/sets/tempest/DarkBanishing.java index 073c5d65968..24ecf687f18 100644 --- a/Mage.Sets/src/mage/sets/tempest/DarkBanishing.java +++ b/Mage.Sets/src/mage/sets/tempest/DarkBanishing.java @@ -55,7 +55,7 @@ public class DarkBanishing extends CardImpl { this.expansionSetCode = "TMP"; this.color.setBlack(true); this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); } public DarkBanishing(final DarkBanishing card) { diff --git a/Mage.Sets/src/mage/sets/tempest/DiabolicEdict.java b/Mage.Sets/src/mage/sets/tempest/DiabolicEdict.java index da9c72dde2a..32400da733f 100644 --- a/Mage.Sets/src/mage/sets/tempest/DiabolicEdict.java +++ b/Mage.Sets/src/mage/sets/tempest/DiabolicEdict.java @@ -46,7 +46,7 @@ public class DiabolicEdict extends CardImpl { this.expansionSetCode = "TMP"; this.color.setBlack(true); this.getSpellAbility().addEffect(new SacrificeEffect(new FilterCreaturePermanent(), 1, "Target player")); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public DiabolicEdict(final DiabolicEdict card) { diff --git a/Mage.Sets/src/mage/sets/tempest/Disenchant.java b/Mage.Sets/src/mage/sets/tempest/Disenchant.java index 97c2e2c5e26..481e83eceb1 100644 --- a/Mage.Sets/src/mage/sets/tempest/Disenchant.java +++ b/Mage.Sets/src/mage/sets/tempest/Disenchant.java @@ -56,7 +56,7 @@ public class Disenchant extends CardImpl { this.expansionSetCode = "TMP"; this.color.setWhite(true); this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); } public Disenchant(final Disenchant card) { diff --git a/Mage.Sets/src/mage/sets/tempest/EliteJavelineer.java b/Mage.Sets/src/mage/sets/tempest/EliteJavelineer.java index afc6ff99048..3d37cb7ed3f 100644 --- a/Mage.Sets/src/mage/sets/tempest/EliteJavelineer.java +++ b/Mage.Sets/src/mage/sets/tempest/EliteJavelineer.java @@ -55,7 +55,7 @@ public class EliteJavelineer extends CardImpl { // Whenever Elite Javelineer blocks, it deals 1 damage to target attacking creature. Ability ability = new BlocksTriggeredAbility(new DamageTargetEffect(1), false); - ability.addTarget(new TargetCreaturePermanent(new FilterAttackingCreature(), true)); + ability.addTarget(new TargetCreaturePermanent(new FilterAttackingCreature())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/ElvishFury.java b/Mage.Sets/src/mage/sets/tempest/ElvishFury.java index e97ba99f7c0..bd8ae72bd28 100644 --- a/Mage.Sets/src/mage/sets/tempest/ElvishFury.java +++ b/Mage.Sets/src/mage/sets/tempest/ElvishFury.java @@ -52,7 +52,7 @@ public class ElvishFury extends CardImpl { // Target creature gets +2/+2 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(2,2, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public ElvishFury(final ElvishFury card) { diff --git a/Mage.Sets/src/mage/sets/tempest/Enfeeblement.java b/Mage.Sets/src/mage/sets/tempest/Enfeeblement.java index 5f171316f88..2c41ff46e03 100644 --- a/Mage.Sets/src/mage/sets/tempest/Enfeeblement.java +++ b/Mage.Sets/src/mage/sets/tempest/Enfeeblement.java @@ -49,7 +49,7 @@ public class Enfeeblement extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Aura"); this.color.setBlack(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/tempest/FeveredConvulsions.java b/Mage.Sets/src/mage/sets/tempest/FeveredConvulsions.java index 26484766c52..02cb74ca86c 100644 --- a/Mage.Sets/src/mage/sets/tempest/FeveredConvulsions.java +++ b/Mage.Sets/src/mage/sets/tempest/FeveredConvulsions.java @@ -51,7 +51,7 @@ public class FeveredConvulsions extends CardImpl { this.expansionSetCode = "TMP"; this.color.setBlack(true); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.M1M1.createInstance(1)), new ManaCostsImpl("{2}{B}{B}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/FrogTongue.java b/Mage.Sets/src/mage/sets/tempest/FrogTongue.java index f9b95a105b5..966e0cfa67f 100644 --- a/Mage.Sets/src/mage/sets/tempest/FrogTongue.java +++ b/Mage.Sets/src/mage/sets/tempest/FrogTongue.java @@ -52,7 +52,7 @@ public class FrogTongue extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Aura"); this.color.setGreen(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/tempest/Gallantry.java b/Mage.Sets/src/mage/sets/tempest/Gallantry.java index ca6164b6be4..bb08d182bf1 100644 --- a/Mage.Sets/src/mage/sets/tempest/Gallantry.java +++ b/Mage.Sets/src/mage/sets/tempest/Gallantry.java @@ -54,7 +54,7 @@ public class Gallantry extends CardImpl { // Target blocking creature gets +4/+4 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(4, 4, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/tempest/GaseousForm.java b/Mage.Sets/src/mage/sets/tempest/GaseousForm.java index d52c9eba5ac..d067cee399c 100644 --- a/Mage.Sets/src/mage/sets/tempest/GaseousForm.java +++ b/Mage.Sets/src/mage/sets/tempest/GaseousForm.java @@ -56,7 +56,7 @@ public class GaseousForm extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Neutral)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/tempest/GiantStrength.java b/Mage.Sets/src/mage/sets/tempest/GiantStrength.java index d95a4f64e6b..0caeb159a03 100644 --- a/Mage.Sets/src/mage/sets/tempest/GiantStrength.java +++ b/Mage.Sets/src/mage/sets/tempest/GiantStrength.java @@ -49,7 +49,7 @@ public class GiantStrength extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Aura"); this.color.setRed(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/tempest/Grindstone.java b/Mage.Sets/src/mage/sets/tempest/Grindstone.java index 5aa6539e89f..b7a6f3098cf 100644 --- a/Mage.Sets/src/mage/sets/tempest/Grindstone.java +++ b/Mage.Sets/src/mage/sets/tempest/Grindstone.java @@ -56,7 +56,7 @@ public class Grindstone extends CardImpl { // {3}, {tap}: Target player puts the top two cards of his or her library into his or her graveyard. If both cards share a color, repeat this process. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GrindstoneEffect(), new ManaCostsImpl("{3}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/tempest/HeartwoodGiant.java b/Mage.Sets/src/mage/sets/tempest/HeartwoodGiant.java index b06737102f8..62b58da0836 100644 --- a/Mage.Sets/src/mage/sets/tempest/HeartwoodGiant.java +++ b/Mage.Sets/src/mage/sets/tempest/HeartwoodGiant.java @@ -65,7 +65,7 @@ public class HeartwoodGiant extends CardImpl { this.toughness = new MageInt(4); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/HerosResolve.java b/Mage.Sets/src/mage/sets/tempest/HerosResolve.java index a462476319e..cb1c1cec77e 100644 --- a/Mage.Sets/src/mage/sets/tempest/HerosResolve.java +++ b/Mage.Sets/src/mage/sets/tempest/HerosResolve.java @@ -50,7 +50,7 @@ public class HerosResolve extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Aura"); this.color.setWhite(true); -TargetPermanent auraTarget = new TargetCreaturePermanent(true); +TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/tempest/Intuition.java b/Mage.Sets/src/mage/sets/tempest/Intuition.java index d5994cb3fb7..00c089533ff 100644 --- a/Mage.Sets/src/mage/sets/tempest/Intuition.java +++ b/Mage.Sets/src/mage/sets/tempest/Intuition.java @@ -61,7 +61,7 @@ public class Intuition extends CardImpl { // Search your library for three cards and reveal them. Target opponent chooses one. Put that card into your hand and the rest into your graveyard. Then shuffle your library. this.getSpellAbility().addEffect(new IntuitionEffect()); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); } public Intuition(final Intuition card) { diff --git a/Mage.Sets/src/mage/sets/tempest/Lobotomy.java b/Mage.Sets/src/mage/sets/tempest/Lobotomy.java index 20c44d5ca23..b9a57f6effc 100644 --- a/Mage.Sets/src/mage/sets/tempest/Lobotomy.java +++ b/Mage.Sets/src/mage/sets/tempest/Lobotomy.java @@ -62,7 +62,7 @@ public class Lobotomy extends CardImpl { // Target player reveals his or her hand, then you choose a card other than a basic land card from it. Search that player's graveyard, hand, and library for all cards with the same name as the chosen card and exile them. Then that player shuffles his or her library. this.getSpellAbility().addEffect(new LobotomyEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public Lobotomy(final Lobotomy card) { diff --git a/Mage.Sets/src/mage/sets/tempest/MasterDecoy.java b/Mage.Sets/src/mage/sets/tempest/MasterDecoy.java index 9194f52c118..48cda64a6af 100644 --- a/Mage.Sets/src/mage/sets/tempest/MasterDecoy.java +++ b/Mage.Sets/src/mage/sets/tempest/MasterDecoy.java @@ -58,7 +58,7 @@ public class MasterDecoy extends CardImpl { this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/MoggRaider.java b/Mage.Sets/src/mage/sets/tempest/MoggRaider.java index 293c5a47d64..b8b059b1b7d 100644 --- a/Mage.Sets/src/mage/sets/tempest/MoggRaider.java +++ b/Mage.Sets/src/mage/sets/tempest/MoggRaider.java @@ -64,7 +64,7 @@ public class MoggRaider extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledPermanent(filter))); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/NaturalSpring.java b/Mage.Sets/src/mage/sets/tempest/NaturalSpring.java index eb784675f85..d4eb8af4f54 100644 --- a/Mage.Sets/src/mage/sets/tempest/NaturalSpring.java +++ b/Mage.Sets/src/mage/sets/tempest/NaturalSpring.java @@ -47,7 +47,7 @@ public class NaturalSpring extends CardImpl { // Target player gains 8 life. this.getSpellAbility().addEffect(new GainLifeTargetEffect(8)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public NaturalSpring(final NaturalSpring card) { diff --git a/Mage.Sets/src/mage/sets/tempest/Opportunist.java b/Mage.Sets/src/mage/sets/tempest/Opportunist.java index e0998ff5d00..21a6ee7263e 100644 --- a/Mage.Sets/src/mage/sets/tempest/Opportunist.java +++ b/Mage.Sets/src/mage/sets/tempest/Opportunist.java @@ -65,7 +65,7 @@ public class Opportunist extends CardImpl { // {T}: Opportunist deals 1 damage to target creature that was dealt damage this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/PuppetStrings.java b/Mage.Sets/src/mage/sets/tempest/PuppetStrings.java index 1e09409e7bb..92ddfcc896b 100644 --- a/Mage.Sets/src/mage/sets/tempest/PuppetStrings.java +++ b/Mage.Sets/src/mage/sets/tempest/PuppetStrings.java @@ -53,7 +53,7 @@ public class PuppetStrings extends CardImpl { // {2}, {tap}: You may tap or untap target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/RootwaterMatriarch.java b/Mage.Sets/src/mage/sets/tempest/RootwaterMatriarch.java index 8f40b5b68f5..1a0a2e02a6f 100644 --- a/Mage.Sets/src/mage/sets/tempest/RootwaterMatriarch.java +++ b/Mage.Sets/src/mage/sets/tempest/RootwaterMatriarch.java @@ -61,7 +61,7 @@ public class RootwaterMatriarch extends CardImpl { // {TAP}: Gain control of target creature for as long as that creature is enchanted ConditionalContinousEffect effect = new ConditionalContinousEffect(new GainControlTargetEffect(Duration.OneUse), EnchantedTargetCondition.getInstance(), "Gain control of target creature for as long as that creature is enchanted"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/SeekerOfSkybreak.java b/Mage.Sets/src/mage/sets/tempest/SeekerOfSkybreak.java index 097bd233b3d..0d006e5d8d5 100644 --- a/Mage.Sets/src/mage/sets/tempest/SeekerOfSkybreak.java +++ b/Mage.Sets/src/mage/sets/tempest/SeekerOfSkybreak.java @@ -54,7 +54,7 @@ public class SeekerOfSkybreak extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/ShimmeringWings.java b/Mage.Sets/src/mage/sets/tempest/ShimmeringWings.java index a77bfe9fc0e..03f8eff083a 100644 --- a/Mage.Sets/src/mage/sets/tempest/ShimmeringWings.java +++ b/Mage.Sets/src/mage/sets/tempest/ShimmeringWings.java @@ -54,7 +54,7 @@ public class ShimmeringWings extends CardImpl { this.expansionSetCode = "TMP"; this.subtype.add("Aura"); this.color.setBlue(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/tempest/SpikeDrone.java b/Mage.Sets/src/mage/sets/tempest/SpikeDrone.java index f0574df029c..ae719c78ccf 100644 --- a/Mage.Sets/src/mage/sets/tempest/SpikeDrone.java +++ b/Mage.Sets/src/mage/sets/tempest/SpikeDrone.java @@ -61,7 +61,7 @@ public class SpikeDrone extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)))); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance(1)), new GenericManaCost(2)); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/SpontaneousCombustion.java b/Mage.Sets/src/mage/sets/tempest/SpontaneousCombustion.java index c8e00773313..5d9baaad602 100644 --- a/Mage.Sets/src/mage/sets/tempest/SpontaneousCombustion.java +++ b/Mage.Sets/src/mage/sets/tempest/SpontaneousCombustion.java @@ -47,7 +47,7 @@ public class SpontaneousCombustion extends CardImpl { this.expansionSetCode = "TMP"; this.color.setRed(true); this.color.setBlack(true); - this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.getSpellAbility().addEffect(new DamageAllEffect(3, new FilterCreaturePermanent())); } diff --git a/Mage.Sets/src/mage/sets/tempest/SqueesToy.java b/Mage.Sets/src/mage/sets/tempest/SqueesToy.java index 3a7641e4582..3fb14172ca5 100644 --- a/Mage.Sets/src/mage/sets/tempest/SqueesToy.java +++ b/Mage.Sets/src/mage/sets/tempest/SqueesToy.java @@ -50,7 +50,7 @@ public class SqueesToy extends CardImpl { super(ownerId, 299, "Squee's Toy", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{1}"); this.expansionSetCode = "TMP"; Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/TimeEbb.java b/Mage.Sets/src/mage/sets/tempest/TimeEbb.java index 6d51c224f1e..30fc92487a3 100644 --- a/Mage.Sets/src/mage/sets/tempest/TimeEbb.java +++ b/Mage.Sets/src/mage/sets/tempest/TimeEbb.java @@ -45,7 +45,7 @@ public class TimeEbb extends CardImpl { this.expansionSetCode = "TMP"; this.color.setBlue(true); this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public TimeEbb(final TimeEbb card) { diff --git a/Mage.Sets/src/mage/sets/tempest/TortureChamber.java b/Mage.Sets/src/mage/sets/tempest/TortureChamber.java index 371a0295a19..47f6118b856 100644 --- a/Mage.Sets/src/mage/sets/tempest/TortureChamber.java +++ b/Mage.Sets/src/mage/sets/tempest/TortureChamber.java @@ -68,7 +68,7 @@ public class TortureChamber extends CardImpl { SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TortureChamberEffect2(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new TortureChamberCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/TradewindRider.java b/Mage.Sets/src/mage/sets/tempest/TradewindRider.java index 583c8855b34..ffe945e9a68 100644 --- a/Mage.Sets/src/mage/sets/tempest/TradewindRider.java +++ b/Mage.Sets/src/mage/sets/tempest/TradewindRider.java @@ -67,7 +67,7 @@ public class TradewindRider extends CardImpl { this.addAbility(FlyingAbility.getInstance()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, false))); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/Verdigris.java b/Mage.Sets/src/mage/sets/tempest/Verdigris.java index b74933b691d..9fc36c87520 100644 --- a/Mage.Sets/src/mage/sets/tempest/Verdigris.java +++ b/Mage.Sets/src/mage/sets/tempest/Verdigris.java @@ -53,7 +53,7 @@ public class Verdigris extends CardImpl { this.expansionSetCode = "TMP"; this.color.setGreen(true); this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); } public Verdigris(final Verdigris card) { diff --git a/Mage.Sets/src/mage/sets/tempest/WindDancer.java b/Mage.Sets/src/mage/sets/tempest/WindDancer.java index e8bcf240d95..ebfd6d34722 100644 --- a/Mage.Sets/src/mage/sets/tempest/WindDancer.java +++ b/Mage.Sets/src/mage/sets/tempest/WindDancer.java @@ -57,7 +57,7 @@ public class WindDancer extends CardImpl { this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/Afflict.java b/Mage.Sets/src/mage/sets/tenth/Afflict.java index e8b21b0a543..3f12740a3a1 100644 --- a/Mage.Sets/src/mage/sets/tenth/Afflict.java +++ b/Mage.Sets/src/mage/sets/tenth/Afflict.java @@ -48,7 +48,7 @@ public class Afflict extends CardImpl { this.expansionSetCode = "10E"; this.color.setBlack(true); this.getSpellAbility().addEffect(new BoostTargetEffect(-1, -1, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/tenth/AggressiveUrge.java b/Mage.Sets/src/mage/sets/tenth/AggressiveUrge.java index 55cee125920..381f1b68126 100644 --- a/Mage.Sets/src/mage/sets/tenth/AggressiveUrge.java +++ b/Mage.Sets/src/mage/sets/tenth/AggressiveUrge.java @@ -48,7 +48,7 @@ public class AggressiveUrge extends CardImpl { this.expansionSetCode = "10E"; this.color.setGreen(true); this.getSpellAbility().addEffect(new BoostTargetEffect(1, 1, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/tenth/AmbassadorLaquatus.java b/Mage.Sets/src/mage/sets/tenth/AmbassadorLaquatus.java index 232f2609175..ae628853fe3 100644 --- a/Mage.Sets/src/mage/sets/tenth/AmbassadorLaquatus.java +++ b/Mage.Sets/src/mage/sets/tenth/AmbassadorLaquatus.java @@ -59,7 +59,7 @@ public class AmbassadorLaquatus extends CardImpl { // {3}: Target player puts the top three cards of his or her library into his or her graveyard. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(3), new GenericManaCost(3)); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/AngelicBlessing.java b/Mage.Sets/src/mage/sets/tenth/AngelicBlessing.java index e39fb4e291f..e2d56e119d0 100644 --- a/Mage.Sets/src/mage/sets/tenth/AngelicBlessing.java +++ b/Mage.Sets/src/mage/sets/tenth/AngelicBlessing.java @@ -50,7 +50,7 @@ public class AngelicBlessing extends CardImpl { this.color.setWhite(true); this.getSpellAbility().addEffect(new BoostTargetEffect(3, 3, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public AngelicBlessing(final AngelicBlessing card) { diff --git a/Mage.Sets/src/mage/sets/tenth/ArcaneTeachings.java b/Mage.Sets/src/mage/sets/tenth/ArcaneTeachings.java index bd70c9e244c..1bdca96bb90 100644 --- a/Mage.Sets/src/mage/sets/tenth/ArcaneTeachings.java +++ b/Mage.Sets/src/mage/sets/tenth/ArcaneTeachings.java @@ -55,7 +55,7 @@ public class ArcaneTeachings extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Aura"); this.color.setRed(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/tenth/Assassinate.java b/Mage.Sets/src/mage/sets/tenth/Assassinate.java index a653be428d6..ff692077901 100644 --- a/Mage.Sets/src/mage/sets/tenth/Assassinate.java +++ b/Mage.Sets/src/mage/sets/tenth/Assassinate.java @@ -53,7 +53,7 @@ public class Assassinate extends CardImpl { super(ownerId, 128, "Assassinate", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{B}"); this.expansionSetCode = "10E"; this.color.setBlack(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/tenth/AvenCloudchaser.java b/Mage.Sets/src/mage/sets/tenth/AvenCloudchaser.java index 915dfda88fc..04276b8479f 100644 --- a/Mage.Sets/src/mage/sets/tenth/AvenCloudchaser.java +++ b/Mage.Sets/src/mage/sets/tenth/AvenCloudchaser.java @@ -62,7 +62,7 @@ public class AvenCloudchaser extends CardImpl { this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/BeaconOfImmortality.java b/Mage.Sets/src/mage/sets/tenth/BeaconOfImmortality.java index feb17e44bf2..a0a46a020ed 100644 --- a/Mage.Sets/src/mage/sets/tenth/BeaconOfImmortality.java +++ b/Mage.Sets/src/mage/sets/tenth/BeaconOfImmortality.java @@ -52,7 +52,7 @@ public class BeaconOfImmortality extends CardImpl { this.color.setWhite(true); // Double target player's life total. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new BeaconOfImmortalityEffect()); // Shuffle Beacon of Immortality into its owner's library. this.getSpellAbility().addEffect(ShuffleSpellEffect.getInstance()); diff --git a/Mage.Sets/src/mage/sets/tenth/BlanchwoodArmor.java b/Mage.Sets/src/mage/sets/tenth/BlanchwoodArmor.java index 49a3726c4cb..824c9a1b466 100644 --- a/Mage.Sets/src/mage/sets/tenth/BlanchwoodArmor.java +++ b/Mage.Sets/src/mage/sets/tenth/BlanchwoodArmor.java @@ -59,7 +59,7 @@ public class BlanchwoodArmor extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Aura"); this.color.setGreen(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/tenth/Boomerang.java b/Mage.Sets/src/mage/sets/tenth/Boomerang.java index b7b10905e6e..6d1f6824371 100644 --- a/Mage.Sets/src/mage/sets/tenth/Boomerang.java +++ b/Mage.Sets/src/mage/sets/tenth/Boomerang.java @@ -45,7 +45,7 @@ public class Boomerang extends CardImpl { this.expansionSetCode = "10E"; this.color.setBlue(true); this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(true)); + this.getSpellAbility().addTarget(new TargetPermanent()); } public Boomerang(final Boomerang card) { diff --git a/Mage.Sets/src/mage/sets/tenth/CraftyPathmage.java b/Mage.Sets/src/mage/sets/tenth/CraftyPathmage.java index 6d731312165..dee744ba2c2 100644 --- a/Mage.Sets/src/mage/sets/tenth/CraftyPathmage.java +++ b/Mage.Sets/src/mage/sets/tenth/CraftyPathmage.java @@ -66,7 +66,7 @@ public class CraftyPathmage extends CardImpl { // {tap}: Target creature with power 2 or less is unblockable this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UnblockableTargetEffect(), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/CreepingMold.java b/Mage.Sets/src/mage/sets/tenth/CreepingMold.java index 93948d5cc12..302e0f65336 100644 --- a/Mage.Sets/src/mage/sets/tenth/CreepingMold.java +++ b/Mage.Sets/src/mage/sets/tenth/CreepingMold.java @@ -57,7 +57,7 @@ public class CreepingMold extends CardImpl { this.expansionSetCode = "10E"; this.color.setGreen(true); this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); } public CreepingMold(final CreepingMold card) { diff --git a/Mage.Sets/src/mage/sets/tenth/CruelEdict.java b/Mage.Sets/src/mage/sets/tenth/CruelEdict.java index 59cdd40d32d..d94a0eca588 100644 --- a/Mage.Sets/src/mage/sets/tenth/CruelEdict.java +++ b/Mage.Sets/src/mage/sets/tenth/CruelEdict.java @@ -46,7 +46,7 @@ public class CruelEdict extends CardImpl { this.expansionSetCode = "10E"; this.color.setBlack(true); this.getSpellAbility().addEffect(new SacrificeEffect(new FilterCreaturePermanent(), 1, "Target opponent sacrifices a creature")); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); // Target opponent sacrifices a creature. } diff --git a/Mage.Sets/src/mage/sets/tenth/Deathmark.java b/Mage.Sets/src/mage/sets/tenth/Deathmark.java index ecd9445ad2f..eb2cca86238 100644 --- a/Mage.Sets/src/mage/sets/tenth/Deathmark.java +++ b/Mage.Sets/src/mage/sets/tenth/Deathmark.java @@ -57,7 +57,7 @@ public class Deathmark extends CardImpl { super(ownerId, 134, "Deathmark", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{B}"); this.expansionSetCode = "10E"; this.color.setBlack(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/tenth/Dehydration.java b/Mage.Sets/src/mage/sets/tenth/Dehydration.java index c84897a6c94..0518d4e34d1 100644 --- a/Mage.Sets/src/mage/sets/tenth/Dehydration.java +++ b/Mage.Sets/src/mage/sets/tenth/Dehydration.java @@ -54,7 +54,7 @@ public class Dehydration extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/tenth/Demolish.java b/Mage.Sets/src/mage/sets/tenth/Demolish.java index 3f01e0163ff..f3b95c03bba 100644 --- a/Mage.Sets/src/mage/sets/tenth/Demolish.java +++ b/Mage.Sets/src/mage/sets/tenth/Demolish.java @@ -56,7 +56,7 @@ public class Demolish extends CardImpl { super(ownerId, 196, "Demolish", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{R}"); this.expansionSetCode = "10E"; this.color.setRed(true); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/tenth/Demystify.java b/Mage.Sets/src/mage/sets/tenth/Demystify.java index b18b2aa78bc..5e9131a2fe2 100644 --- a/Mage.Sets/src/mage/sets/tenth/Demystify.java +++ b/Mage.Sets/src/mage/sets/tenth/Demystify.java @@ -54,7 +54,7 @@ public class Demystify extends CardImpl { this.expansionSetCode = "10E"; this.color.setWhite(true); this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); } public Demystify (final Demystify card) { diff --git a/Mage.Sets/src/mage/sets/tenth/Distress.java b/Mage.Sets/src/mage/sets/tenth/Distress.java index 066bfa2a5eb..82c98f06c6d 100644 --- a/Mage.Sets/src/mage/sets/tenth/Distress.java +++ b/Mage.Sets/src/mage/sets/tenth/Distress.java @@ -56,7 +56,7 @@ public class Distress extends CardImpl { this.color.setBlack(true); // Target player reveals his or her hand. You choose a nonland card from it. That player discards that card. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(filter, TargetController.ANY)); } diff --git a/Mage.Sets/src/mage/sets/tenth/Fear.java b/Mage.Sets/src/mage/sets/tenth/Fear.java index c18b5225c69..f88118e314e 100644 --- a/Mage.Sets/src/mage/sets/tenth/Fear.java +++ b/Mage.Sets/src/mage/sets/tenth/Fear.java @@ -54,7 +54,7 @@ public class Fear extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/tenth/FemerefArchers.java b/Mage.Sets/src/mage/sets/tenth/FemerefArchers.java index 7201ee5a9fa..56d59ef098d 100644 --- a/Mage.Sets/src/mage/sets/tenth/FemerefArchers.java +++ b/Mage.Sets/src/mage/sets/tenth/FemerefArchers.java @@ -64,7 +64,7 @@ public class FemerefArchers extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/FistsOfTheAnvil.java b/Mage.Sets/src/mage/sets/tenth/FistsOfTheAnvil.java index 35ef8935903..dc9f5990c25 100644 --- a/Mage.Sets/src/mage/sets/tenth/FistsOfTheAnvil.java +++ b/Mage.Sets/src/mage/sets/tenth/FistsOfTheAnvil.java @@ -47,7 +47,7 @@ public class FistsOfTheAnvil extends CardImpl { this.expansionSetCode = "10E"; this.color.setRed(true); this.getSpellAbility().addEffect(new BoostTargetEffect(4, 0, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public FistsOfTheAnvil(final FistsOfTheAnvil card) { diff --git a/Mage.Sets/src/mage/sets/tenth/FlamewaveInvoker.java b/Mage.Sets/src/mage/sets/tenth/FlamewaveInvoker.java index 369cf9f39db..303cd10798f 100644 --- a/Mage.Sets/src/mage/sets/tenth/FlamewaveInvoker.java +++ b/Mage.Sets/src/mage/sets/tenth/FlamewaveInvoker.java @@ -55,7 +55,7 @@ public class FlamewaveInvoker extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(5), new ManaCostsImpl("{7}{R}")); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/GhostWarden.java b/Mage.Sets/src/mage/sets/tenth/GhostWarden.java index b4236ecceca..9cef811df90 100644 --- a/Mage.Sets/src/mage/sets/tenth/GhostWarden.java +++ b/Mage.Sets/src/mage/sets/tenth/GhostWarden.java @@ -55,7 +55,7 @@ public class GhostWarden extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/GiantGrowth.java b/Mage.Sets/src/mage/sets/tenth/GiantGrowth.java index b83477df66e..8f2695d640a 100644 --- a/Mage.Sets/src/mage/sets/tenth/GiantGrowth.java +++ b/Mage.Sets/src/mage/sets/tenth/GiantGrowth.java @@ -46,7 +46,7 @@ public class GiantGrowth extends CardImpl { super(ownerId, 266, "Giant Growth", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{G}"); this.expansionSetCode = "10E"; this.color.setGreen(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(3, 3, Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/tenth/HateWeaver.java b/Mage.Sets/src/mage/sets/tenth/HateWeaver.java index 918d2566ecb..108da879950 100644 --- a/Mage.Sets/src/mage/sets/tenth/HateWeaver.java +++ b/Mage.Sets/src/mage/sets/tenth/HateWeaver.java @@ -68,7 +68,7 @@ public class HateWeaver extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(2)); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/HighwayRobber.java b/Mage.Sets/src/mage/sets/tenth/HighwayRobber.java index e296730ed75..dbbeec15b07 100644 --- a/Mage.Sets/src/mage/sets/tenth/HighwayRobber.java +++ b/Mage.Sets/src/mage/sets/tenth/HighwayRobber.java @@ -54,7 +54,7 @@ public class HighwayRobber extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new EntersBattlefieldTriggeredAbility(new GainLifeEffect(2)); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); ability.addEffect(new LoseLifeTargetEffect(2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/HolyStrength.java b/Mage.Sets/src/mage/sets/tenth/HolyStrength.java index 580e161e1b6..997d5781dfa 100644 --- a/Mage.Sets/src/mage/sets/tenth/HolyStrength.java +++ b/Mage.Sets/src/mage/sets/tenth/HolyStrength.java @@ -55,7 +55,7 @@ public class HolyStrength extends CardImpl { this.color.setWhite(true); this.subtype.add("Aura"); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/tenth/IcatianPriest.java b/Mage.Sets/src/mage/sets/tenth/IcatianPriest.java index cf4df9a2dbd..393ef518b78 100644 --- a/Mage.Sets/src/mage/sets/tenth/IcatianPriest.java +++ b/Mage.Sets/src/mage/sets/tenth/IcatianPriest.java @@ -56,7 +56,7 @@ public class IcatianPriest extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{1}{W}{W}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/IcyManipulator.java b/Mage.Sets/src/mage/sets/tenth/IcyManipulator.java index 15fd354cede..6e741a0b7a2 100644 --- a/Mage.Sets/src/mage/sets/tenth/IcyManipulator.java +++ b/Mage.Sets/src/mage/sets/tenth/IcyManipulator.java @@ -63,7 +63,7 @@ public class IcyManipulator extends CardImpl { this.expansionSetCode = "10E"; Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/Incinerate.java b/Mage.Sets/src/mage/sets/tenth/Incinerate.java index 48d7492d21d..a40fb17c050 100644 --- a/Mage.Sets/src/mage/sets/tenth/Incinerate.java +++ b/Mage.Sets/src/mage/sets/tenth/Incinerate.java @@ -55,7 +55,7 @@ public class Incinerate extends CardImpl { this.color.setRed(true); this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); this.getSpellAbility().addEffect(new IncinerateEffect()); this.addWatcher(new DamagedByWatcher()); } diff --git a/Mage.Sets/src/mage/sets/tenth/LavaAxe.java b/Mage.Sets/src/mage/sets/tenth/LavaAxe.java index 00eff98d617..8683a4bccde 100644 --- a/Mage.Sets/src/mage/sets/tenth/LavaAxe.java +++ b/Mage.Sets/src/mage/sets/tenth/LavaAxe.java @@ -45,7 +45,7 @@ public class LavaAxe extends CardImpl { super(ownerId, 215, "Lava Axe", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{R}"); this.expansionSetCode = "10E"; this.color.setRed(true); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new DamageTargetEffect(5)); } diff --git a/Mage.Sets/src/mage/sets/tenth/Megrim.java b/Mage.Sets/src/mage/sets/tenth/Megrim.java index 48a0bff411e..3acfd8e2e08 100644 --- a/Mage.Sets/src/mage/sets/tenth/Megrim.java +++ b/Mage.Sets/src/mage/sets/tenth/Megrim.java @@ -67,7 +67,7 @@ public class Megrim extends CardImpl { class MergimTriggeredAbility extends TriggeredAbilityImpl { MergimTriggeredAbility() { super(Zone.BATTLEFIELD, new DamageTargetEffect(2)); - this.addTarget(new TargetOpponent(true)); + this.addTarget(new TargetOpponent()); } MergimTriggeredAbility(final MergimTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/tenth/MightWeaver.java b/Mage.Sets/src/mage/sets/tenth/MightWeaver.java index 4a0c8524abd..7c9aa3e8a4e 100644 --- a/Mage.Sets/src/mage/sets/tenth/MightWeaver.java +++ b/Mage.Sets/src/mage/sets/tenth/MightWeaver.java @@ -69,7 +69,7 @@ public class MightWeaver extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/MindRot.java b/Mage.Sets/src/mage/sets/tenth/MindRot.java index af5beb133d3..5e4e609874b 100644 --- a/Mage.Sets/src/mage/sets/tenth/MindRot.java +++ b/Mage.Sets/src/mage/sets/tenth/MindRot.java @@ -45,7 +45,7 @@ public class MindRot extends CardImpl { super(ownerId, 159, "Mind Rot", Rarity.COMMON, new CardType[]{CardType.SORCERY},"{2}{B}"); this.expansionSetCode = "10E"; this.color.setBlack(true); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new DiscardTargetEffect(2)); } diff --git a/Mage.Sets/src/mage/sets/tenth/NantukoHusk.java b/Mage.Sets/src/mage/sets/tenth/NantukoHusk.java index d8fbd9b7963..c0e2490c5e1 100644 --- a/Mage.Sets/src/mage/sets/tenth/NantukoHusk.java +++ b/Mage.Sets/src/mage/sets/tenth/NantukoHusk.java @@ -54,7 +54,7 @@ public class NantukoHusk extends CardImpl { this.color.setBlack(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent()))); } public NantukoHusk(final NantukoHusk card) { diff --git a/Mage.Sets/src/mage/sets/tenth/Naturalize.java b/Mage.Sets/src/mage/sets/tenth/Naturalize.java index 63a49b771cb..87752d73349 100644 --- a/Mage.Sets/src/mage/sets/tenth/Naturalize.java +++ b/Mage.Sets/src/mage/sets/tenth/Naturalize.java @@ -56,7 +56,7 @@ public class Naturalize extends CardImpl { super(ownerId, 282, "Naturalize", Rarity.COMMON, new CardType[]{CardType.INSTANT},"{1}{G}"); this.expansionSetCode = "10E"; this.color.setGreen(true); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/tenth/Pacifism.java b/Mage.Sets/src/mage/sets/tenth/Pacifism.java index 11516ae387c..84360bc28de 100644 --- a/Mage.Sets/src/mage/sets/tenth/Pacifism.java +++ b/Mage.Sets/src/mage/sets/tenth/Pacifism.java @@ -55,7 +55,7 @@ public class Pacifism extends CardImpl { this.color.setWhite(true); this.subtype.add("Aura"); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Removal)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/tenth/Peek.java b/Mage.Sets/src/mage/sets/tenth/Peek.java index daa55a6a182..f0cb4100c14 100644 --- a/Mage.Sets/src/mage/sets/tenth/Peek.java +++ b/Mage.Sets/src/mage/sets/tenth/Peek.java @@ -54,7 +54,7 @@ public class Peek extends CardImpl { // Look at target player's hand. this.getSpellAbility().addEffect(new PeekEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/tenth/Persuasion.java b/Mage.Sets/src/mage/sets/tenth/Persuasion.java index c702cfc688b..c39b9526b1b 100644 --- a/Mage.Sets/src/mage/sets/tenth/Persuasion.java +++ b/Mage.Sets/src/mage/sets/tenth/Persuasion.java @@ -55,7 +55,7 @@ public class Persuasion extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/tenth/PhyrexianVault.java b/Mage.Sets/src/mage/sets/tenth/PhyrexianVault.java index c7f135faaca..c635a65f654 100644 --- a/Mage.Sets/src/mage/sets/tenth/PhyrexianVault.java +++ b/Mage.Sets/src/mage/sets/tenth/PhyrexianVault.java @@ -52,7 +52,7 @@ public class PhyrexianVault extends CardImpl { this.expansionSetCode = "10E"; Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/Puppeteer.java b/Mage.Sets/src/mage/sets/tenth/Puppeteer.java index 7e3a2e1ba6c..4ad3b524973 100644 --- a/Mage.Sets/src/mage/sets/tenth/Puppeteer.java +++ b/Mage.Sets/src/mage/sets/tenth/Puppeteer.java @@ -61,7 +61,7 @@ public class Puppeteer extends CardImpl { // {U}, {tap}: You may tap or untap target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.U)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/Quicksand.java b/Mage.Sets/src/mage/sets/tenth/Quicksand.java index 5105f1cdbd4..a72e0765eb8 100644 --- a/Mage.Sets/src/mage/sets/tenth/Quicksand.java +++ b/Mage.Sets/src/mage/sets/tenth/Quicksand.java @@ -64,7 +64,7 @@ public class Quicksand extends CardImpl { SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -2, Duration.EndOfTurn), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/RageWeaver.java b/Mage.Sets/src/mage/sets/tenth/RageWeaver.java index 35d61b585f6..12d25c529d7 100644 --- a/Mage.Sets/src/mage/sets/tenth/RageWeaver.java +++ b/Mage.Sets/src/mage/sets/tenth/RageWeaver.java @@ -69,7 +69,7 @@ public class RageWeaver extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/RavenousRats.java b/Mage.Sets/src/mage/sets/tenth/RavenousRats.java index 536431e53e9..e36162668fa 100644 --- a/Mage.Sets/src/mage/sets/tenth/RavenousRats.java +++ b/Mage.Sets/src/mage/sets/tenth/RavenousRats.java @@ -53,7 +53,7 @@ public class RavenousRats extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new EntersBattlefieldTriggeredAbility(new DiscardTargetEffect(1)); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/RazormaneMasticore.java b/Mage.Sets/src/mage/sets/tenth/RazormaneMasticore.java index cd7243b39bd..d07511add9d 100644 --- a/Mage.Sets/src/mage/sets/tenth/RazormaneMasticore.java +++ b/Mage.Sets/src/mage/sets/tenth/RazormaneMasticore.java @@ -67,7 +67,7 @@ public class RazormaneMasticore extends CardImpl { // At the beginning of your draw step, you may have Razormane Masticore deal 3 damage to target creature. Ability ability = new BeginningOfDrawTriggeredAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), TargetController.YOU, true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/Righteousness.java b/Mage.Sets/src/mage/sets/tenth/Righteousness.java index 57e45667b89..6b5133ec578 100644 --- a/Mage.Sets/src/mage/sets/tenth/Righteousness.java +++ b/Mage.Sets/src/mage/sets/tenth/Righteousness.java @@ -52,7 +52,7 @@ public class Righteousness extends CardImpl { this.color.setWhite(true); this.getSpellAbility().addEffect(new BoostTargetEffect(7, 7, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); } public Righteousness(final Righteousness card) { diff --git a/Mage.Sets/src/mage/sets/tenth/RobeOfMirrors.java b/Mage.Sets/src/mage/sets/tenth/RobeOfMirrors.java index 036b78c3584..a1746c64a85 100644 --- a/Mage.Sets/src/mage/sets/tenth/RobeOfMirrors.java +++ b/Mage.Sets/src/mage/sets/tenth/RobeOfMirrors.java @@ -53,7 +53,7 @@ public class RobeOfMirrors extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/tenth/RoyalAssassin.java b/Mage.Sets/src/mage/sets/tenth/RoyalAssassin.java index 8c96a961006..a262dabe26c 100644 --- a/Mage.Sets/src/mage/sets/tenth/RoyalAssassin.java +++ b/Mage.Sets/src/mage/sets/tenth/RoyalAssassin.java @@ -64,7 +64,7 @@ public class RoyalAssassin extends CardImpl { this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/SerrasEmbrace.java b/Mage.Sets/src/mage/sets/tenth/SerrasEmbrace.java index c36d416b6ae..6a00a869bb8 100644 --- a/Mage.Sets/src/mage/sets/tenth/SerrasEmbrace.java +++ b/Mage.Sets/src/mage/sets/tenth/SerrasEmbrace.java @@ -53,7 +53,7 @@ public class SerrasEmbrace extends CardImpl { this.expansionSetCode = "10E"; this.subtype.add("Aura"); this.color.setWhite(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/tenth/SkyWeaver.java b/Mage.Sets/src/mage/sets/tenth/SkyWeaver.java index 1b8fbed6047..3cbbcea4939 100644 --- a/Mage.Sets/src/mage/sets/tenth/SkyWeaver.java +++ b/Mage.Sets/src/mage/sets/tenth/SkyWeaver.java @@ -69,7 +69,7 @@ public class SkyWeaver extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/SoulFeast.java b/Mage.Sets/src/mage/sets/tenth/SoulFeast.java index 8904f7c5d74..43538a53118 100644 --- a/Mage.Sets/src/mage/sets/tenth/SoulFeast.java +++ b/Mage.Sets/src/mage/sets/tenth/SoulFeast.java @@ -46,7 +46,7 @@ public class SoulFeast extends CardImpl { this.expansionSetCode = "10E"; this.color.setBlack(true); this.getSpellAbility().addEffect(new LoseLifeTargetEffect(4)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new GainLifeEffect(4)); } diff --git a/Mage.Sets/src/mage/sets/tenth/Soulblast.java b/Mage.Sets/src/mage/sets/tenth/Soulblast.java index c11ff981bfe..4ba3877e339 100644 --- a/Mage.Sets/src/mage/sets/tenth/Soulblast.java +++ b/Mage.Sets/src/mage/sets/tenth/Soulblast.java @@ -60,7 +60,7 @@ public class Soulblast extends CardImpl { this.getSpellAbility().addCost(new SacrificeAllCost(filter)); // Soulblast deals damage to target creature or player equal to the total power of the sacrificed creatures. this.getSpellAbility().addEffect(new SoulblastEffect()); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); } public Soulblast(final Soulblast card) { diff --git a/Mage.Sets/src/mage/sets/tenth/SpiritWeaver.java b/Mage.Sets/src/mage/sets/tenth/SpiritWeaver.java index 3d1074752dd..d64f61bd4c0 100644 --- a/Mage.Sets/src/mage/sets/tenth/SpiritWeaver.java +++ b/Mage.Sets/src/mage/sets/tenth/SpiritWeaver.java @@ -68,7 +68,7 @@ public class SpiritWeaver extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(0, 1, Duration.EndOfTurn), new GenericManaCost(2)); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/SpittingEarth.java b/Mage.Sets/src/mage/sets/tenth/SpittingEarth.java index 5bb34bf7a59..9bade44fd8a 100644 --- a/Mage.Sets/src/mage/sets/tenth/SpittingEarth.java +++ b/Mage.Sets/src/mage/sets/tenth/SpittingEarth.java @@ -54,7 +54,7 @@ public class SpittingEarth extends CardImpl { this.expansionSetCode = "10E"; this.color.setRed(true); this.getSpellAbility().addEffect(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter))); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public SpittingEarth(final SpittingEarth card) { diff --git a/Mage.Sets/src/mage/sets/tenth/Terror.java b/Mage.Sets/src/mage/sets/tenth/Terror.java index b31077edf3a..3ccf4eb8d87 100644 --- a/Mage.Sets/src/mage/sets/tenth/Terror.java +++ b/Mage.Sets/src/mage/sets/tenth/Terror.java @@ -59,7 +59,7 @@ public class Terror extends CardImpl { this.color.setBlack(true); // Destroy target nonartifact, nonblack creature. It can't be regenerated. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); } diff --git a/Mage.Sets/src/mage/sets/tenth/Threaten.java b/Mage.Sets/src/mage/sets/tenth/Threaten.java index a1d71799a03..19922d04010 100644 --- a/Mage.Sets/src/mage/sets/tenth/Threaten.java +++ b/Mage.Sets/src/mage/sets/tenth/Threaten.java @@ -52,7 +52,7 @@ public class Threaten extends CardImpl { this.getSpellAbility().addEffect(new UntapTargetEffect()); this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public Threaten(final Threaten card) { diff --git a/Mage.Sets/src/mage/sets/tenth/ThrullSurgeon.java b/Mage.Sets/src/mage/sets/tenth/ThrullSurgeon.java index b983239628d..9fcfa2f6b85 100644 --- a/Mage.Sets/src/mage/sets/tenth/ThrullSurgeon.java +++ b/Mage.Sets/src/mage/sets/tenth/ThrullSurgeon.java @@ -66,7 +66,7 @@ public class ThrullSurgeon extends CardImpl { // {1}{B}, Sacrifice Thrull Surgeon: Look at target player's hand and choose a card from it. That player discards that card. Activate this ability only any time you could cast a sorcery. Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new ThrullSurgeonEffect(), new ManaCostsImpl("{1}{B}")); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/TimeStretch.java b/Mage.Sets/src/mage/sets/tenth/TimeStretch.java index f349bbbd4cb..dbfb0e694c6 100644 --- a/Mage.Sets/src/mage/sets/tenth/TimeStretch.java +++ b/Mage.Sets/src/mage/sets/tenth/TimeStretch.java @@ -51,7 +51,7 @@ public class TimeStretch extends CardImpl { this.color.setBlue(true); // Target player takes two extra turns after this one. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new TimeStretchEffect()); } diff --git a/Mage.Sets/src/mage/sets/tenth/Traumatize.java b/Mage.Sets/src/mage/sets/tenth/Traumatize.java index e9fbf9662e8..52ff17b6c9f 100644 --- a/Mage.Sets/src/mage/sets/tenth/Traumatize.java +++ b/Mage.Sets/src/mage/sets/tenth/Traumatize.java @@ -51,7 +51,7 @@ public class Traumatize extends CardImpl { super(ownerId, 119, "Traumatize", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{U}{U}"); this.expansionSetCode = "10E"; this.color.setBlue(true); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new TraumatizeEffect()); } diff --git a/Mage.Sets/src/mage/sets/tenth/UnholyStrength.java b/Mage.Sets/src/mage/sets/tenth/UnholyStrength.java index e86c79ff782..f5114d56d60 100644 --- a/Mage.Sets/src/mage/sets/tenth/UnholyStrength.java +++ b/Mage.Sets/src/mage/sets/tenth/UnholyStrength.java @@ -54,7 +54,7 @@ public class UnholyStrength extends CardImpl { this.color.setBlack(true); this.subtype.add("Aura"); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/tenth/Unsummon.java b/Mage.Sets/src/mage/sets/tenth/Unsummon.java index 32faba65d93..dcf84066ffc 100644 --- a/Mage.Sets/src/mage/sets/tenth/Unsummon.java +++ b/Mage.Sets/src/mage/sets/tenth/Unsummon.java @@ -45,7 +45,7 @@ public class Unsummon extends CardImpl { super(ownerId, 122, "Unsummon", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); this.expansionSetCode = "10E"; this.color.setBlue(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/tenth/VedalkenMastermind.java b/Mage.Sets/src/mage/sets/tenth/VedalkenMastermind.java index dbebaaf4cc4..7720d040789 100644 --- a/Mage.Sets/src/mage/sets/tenth/VedalkenMastermind.java +++ b/Mage.Sets/src/mage/sets/tenth/VedalkenMastermind.java @@ -58,7 +58,7 @@ public class VedalkenMastermind extends CardImpl { this.toughness = new MageInt(2); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ColoredManaCost(ColoredManaSymbol.U)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetControlledPermanent(true)); + ability.addTarget(new TargetControlledPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/ViridianShaman.java b/Mage.Sets/src/mage/sets/tenth/ViridianShaman.java index fea128a42f5..28e201812b3 100644 --- a/Mage.Sets/src/mage/sets/tenth/ViridianShaman.java +++ b/Mage.Sets/src/mage/sets/tenth/ViridianShaman.java @@ -60,7 +60,7 @@ public class ViridianShaman extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/thedark/BarlsCage.java b/Mage.Sets/src/mage/sets/thedark/BarlsCage.java index b93b911533f..520004dace0 100644 --- a/Mage.Sets/src/mage/sets/thedark/BarlsCage.java +++ b/Mage.Sets/src/mage/sets/thedark/BarlsCage.java @@ -49,7 +49,7 @@ public class BarlsCage extends CardImpl { // {3}: Target creature doesn't untap during its controller's next untap step. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SkipNextUntapTargetEffect("Target creature"), new GenericManaCost(3)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/thedark/GoblinDiggingTeam.java b/Mage.Sets/src/mage/sets/thedark/GoblinDiggingTeam.java index b3b23392336..0b0cbd48622 100644 --- a/Mage.Sets/src/mage/sets/thedark/GoblinDiggingTeam.java +++ b/Mage.Sets/src/mage/sets/thedark/GoblinDiggingTeam.java @@ -65,7 +65,7 @@ public class GoblinDiggingTeam extends CardImpl { // {tap}, Sacrifice Goblin Digging Team: Destroy target Wall. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/thedark/MazeOfIth.java b/Mage.Sets/src/mage/sets/thedark/MazeOfIth.java index 2135976b04a..dc8bb79f85d 100644 --- a/Mage.Sets/src/mage/sets/thedark/MazeOfIth.java +++ b/Mage.Sets/src/mage/sets/thedark/MazeOfIth.java @@ -60,7 +60,7 @@ public class MazeOfIth extends CardImpl { effect = new PreventDamageToTargetEffect(Duration.EndOfTurn, Integer.MAX_VALUE, true); effect.setText("and dealt by that creature this turn"); ability.addEffect(effect); - ability.addTarget(new TargetAttackingCreature(true)); + ability.addTarget(new TargetAttackingCreature()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/thedark/RagMan.java b/Mage.Sets/src/mage/sets/thedark/RagMan.java index 06f3cc1c025..b8952949003 100644 --- a/Mage.Sets/src/mage/sets/thedark/RagMan.java +++ b/Mage.Sets/src/mage/sets/thedark/RagMan.java @@ -69,7 +69,7 @@ public class RagMan extends CardImpl { Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new RevealHandTargetEffect(), new ManaCostsImpl("{B}{B}{B}"), MyTurnCondition.getInstance()); ability.addCost(new TapSourceCost()); ability.addEffect(new RagManDiscardEffect()); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/thedark/Venom.java b/Mage.Sets/src/mage/sets/thedark/Venom.java index e9ec266d822..3ba7367bf85 100644 --- a/Mage.Sets/src/mage/sets/thedark/Venom.java +++ b/Mage.Sets/src/mage/sets/thedark/Venom.java @@ -59,7 +59,7 @@ public class Venom extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/theros/AkroanHorse.java b/Mage.Sets/src/mage/sets/theros/AkroanHorse.java index d055cae1a7c..110f5542b21 100644 --- a/Mage.Sets/src/mage/sets/theros/AkroanHorse.java +++ b/Mage.Sets/src/mage/sets/theros/AkroanHorse.java @@ -104,7 +104,7 @@ class AkroanHorseChangeControlEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Target target = new TargetOpponent(true); + Target target = new TargetOpponent(); Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { if (controller.chooseTarget(outcome, target, source, game)) { diff --git a/Mage.Sets/src/mage/sets/theros/AqueousForm.java b/Mage.Sets/src/mage/sets/theros/AqueousForm.java index f2e78b7255e..62d98ad863a 100644 --- a/Mage.Sets/src/mage/sets/theros/AqueousForm.java +++ b/Mage.Sets/src/mage/sets/theros/AqueousForm.java @@ -58,7 +58,7 @@ public class AqueousForm extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/theros/ArborColossus.java b/Mage.Sets/src/mage/sets/theros/ArborColossus.java index a3ee3330d2f..9b3cf991c4c 100644 --- a/Mage.Sets/src/mage/sets/theros/ArborColossus.java +++ b/Mage.Sets/src/mage/sets/theros/ArborColossus.java @@ -72,7 +72,7 @@ public class ArborColossus extends CardImpl { this.addAbility(new MonstrosityAbility("{3}{G}{G}{G}", 3)); // When Arbor Colossus becomes monstrous, destroy target creature with flying an opponent controls. Ability ability = new BecomesMonstrousSourceTriggeredAbility(new DestroyTargetEffect()); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/theros/ArenaAthlete.java b/Mage.Sets/src/mage/sets/theros/ArenaAthlete.java index 70f15bae2c4..4b9651640d7 100644 --- a/Mage.Sets/src/mage/sets/theros/ArenaAthlete.java +++ b/Mage.Sets/src/mage/sets/theros/ArenaAthlete.java @@ -64,7 +64,7 @@ public class ArenaAthlete extends CardImpl { // Heroic Whenever you cast a spell that targets Arena Athlete, target creature an opponent controls can't block this turn. Ability ability = new HeroicAbility(new CantBlockTargetEffect(Duration.EndOfTurn)); - TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true); + TargetCreaturePermanent target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/theros/ArtisansSorrow.java b/Mage.Sets/src/mage/sets/theros/ArtisansSorrow.java index 55b529ab5de..d7332ff7009 100644 --- a/Mage.Sets/src/mage/sets/theros/ArtisansSorrow.java +++ b/Mage.Sets/src/mage/sets/theros/ArtisansSorrow.java @@ -57,7 +57,7 @@ public class ArtisansSorrow extends CardImpl { // Destroy target artifact or enchantment. Scry 2. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new ScryEffect(2)); } diff --git a/Mage.Sets/src/mage/sets/theros/AshenRider.java b/Mage.Sets/src/mage/sets/theros/AshenRider.java index 1f3856549e0..0ab38e6bd79 100644 --- a/Mage.Sets/src/mage/sets/theros/AshenRider.java +++ b/Mage.Sets/src/mage/sets/theros/AshenRider.java @@ -58,7 +58,7 @@ public class AshenRider extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Ashen Rider enters the battlefield or dies, exile target permanent. Ability ability = new EntersBattlefieldOrDiesSourceTriggeredAbility(new ExileTargetEffect(), false); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/theros/AshiokNightmareWeaver.java b/Mage.Sets/src/mage/sets/theros/AshiokNightmareWeaver.java index 46d0a5afef2..acd5e40a675 100644 --- a/Mage.Sets/src/mage/sets/theros/AshiokNightmareWeaver.java +++ b/Mage.Sets/src/mage/sets/theros/AshiokNightmareWeaver.java @@ -79,7 +79,7 @@ public class AshiokNightmareWeaver extends CardImpl { // +2: Exile the top three cards of target opponent's library. LoyaltyAbility ability = new LoyaltyAbility(new AshiokNightmareWeaverExileEffect(), 2); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); // -X: Put a creature card with converted mana cost X exiled with Ashiok, Nightmare Weaver onto the battlefield under your control. That creature is a Nightmare in addition to its other types. diff --git a/Mage.Sets/src/mage/sets/theros/BattlewiseValor.java b/Mage.Sets/src/mage/sets/theros/BattlewiseValor.java index fb1c6bb182e..88cf1141ec4 100644 --- a/Mage.Sets/src/mage/sets/theros/BattlewiseValor.java +++ b/Mage.Sets/src/mage/sets/theros/BattlewiseValor.java @@ -51,7 +51,7 @@ public class BattlewiseValor extends CardImpl { // Target creature gets +2/+2 until end of turn. Scry 1. this.getSpellAbility().addEffect(new BoostTargetEffect(2,2, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new ScryEffect(1)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public BattlewiseValor(final BattlewiseValor card) { diff --git a/Mage.Sets/src/mage/sets/theros/BoonOfErebos.java b/Mage.Sets/src/mage/sets/theros/BoonOfErebos.java index 5d53804cec2..17567151234 100644 --- a/Mage.Sets/src/mage/sets/theros/BoonOfErebos.java +++ b/Mage.Sets/src/mage/sets/theros/BoonOfErebos.java @@ -51,7 +51,7 @@ public class BoonOfErebos extends CardImpl { // Target creature gets +2/+0 until end of turn. Regenerate it. You lose 2 life. this.getSpellAbility().addEffect(new BoostTargetEffect(2,0, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new RegenerateTargetEffect()); this.getSpellAbility().addEffect(new LoseLifeSourceControllerEffect(2)); } diff --git a/Mage.Sets/src/mage/sets/theros/BowOfNylea.java b/Mage.Sets/src/mage/sets/theros/BowOfNylea.java index 4a44d2439a2..41f8a176d08 100644 --- a/Mage.Sets/src/mage/sets/theros/BowOfNylea.java +++ b/Mage.Sets/src/mage/sets/theros/BowOfNylea.java @@ -88,7 +88,7 @@ public class BowOfNylea extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl("{1}{G}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); // or Bow of Nylea deals 2 damage to target creature with flying; Mode mode = new Mode(); diff --git a/Mage.Sets/src/mage/sets/theros/BreachingHippocamp.java b/Mage.Sets/src/mage/sets/theros/BreachingHippocamp.java index 4c352347870..cace4010b5d 100644 --- a/Mage.Sets/src/mage/sets/theros/BreachingHippocamp.java +++ b/Mage.Sets/src/mage/sets/theros/BreachingHippocamp.java @@ -65,7 +65,7 @@ public class BreachingHippocamp extends CardImpl { this.addAbility(FlashAbility.getInstance()); // When Breaching Hippocamp enters the battlefield, untap another target creature you control. Ability ability = new EntersBattlefieldTriggeredAbility(new UntapTargetEffect(), false); - ability.addTarget(new TargetControlledCreaturePermanent(1,1,filter, false, true)); + ability.addTarget(new TargetControlledCreaturePermanent(1,1,filter, false)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/theros/ChainedToTheRocks.java b/Mage.Sets/src/mage/sets/theros/ChainedToTheRocks.java index 13687989928..a5d32299b34 100644 --- a/Mage.Sets/src/mage/sets/theros/ChainedToTheRocks.java +++ b/Mage.Sets/src/mage/sets/theros/ChainedToTheRocks.java @@ -103,7 +103,7 @@ public class ChainedToTheRocks extends CardImpl { this.color.setWhite(true); // Enchant Mountain you control - TargetPermanent auraTarget = new TargetPermanent(filter, true); + TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Exile)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/theros/ChosenByHeliod.java b/Mage.Sets/src/mage/sets/theros/ChosenByHeliod.java index 89e27cb2714..97d627c9729 100644 --- a/Mage.Sets/src/mage/sets/theros/ChosenByHeliod.java +++ b/Mage.Sets/src/mage/sets/theros/ChosenByHeliod.java @@ -58,7 +58,7 @@ public class ChosenByHeliod extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/theros/CracklingTriton.java b/Mage.Sets/src/mage/sets/theros/CracklingTriton.java index 6132403bb9f..e346bea0cd6 100644 --- a/Mage.Sets/src/mage/sets/theros/CracklingTriton.java +++ b/Mage.Sets/src/mage/sets/theros/CracklingTriton.java @@ -59,7 +59,7 @@ public class CracklingTriton extends CardImpl { // {2}{R}, Sacrifice Crackling Triton: Crackling Triton deals 2 damage to target creature or player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{2}{R}")); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreatureOrPlayer(true)); + ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/theros/CurseOfTheSwine.java b/Mage.Sets/src/mage/sets/theros/CurseOfTheSwine.java index 22204817651..3a12ca4317e 100644 --- a/Mage.Sets/src/mage/sets/theros/CurseOfTheSwine.java +++ b/Mage.Sets/src/mage/sets/theros/CurseOfTheSwine.java @@ -57,14 +57,14 @@ public class CurseOfTheSwine extends CardImpl { // Exile X target creatures. For each creature exiled this way, its controller puts a 2/2 green Boar creature token onto the battlefield. this.getSpellAbility().addEffect(new CurseOfTheSwineEffect()); // Correct number of targets will be set in adjustTargets - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } @Override public void adjustTargets(Ability ability, Game game) { if (ability instanceof SpellAbility) { ability.getTargets().clear(); - ability.addTarget(new TargetCreaturePermanent(ability.getManaCostsToPay().getX(), true)); + ability.addTarget(new TargetCreaturePermanent(ability.getManaCostsToPay().getX())); } } diff --git a/Mage.Sets/src/mage/sets/theros/DarkBetrayal.java b/Mage.Sets/src/mage/sets/theros/DarkBetrayal.java index 26fa97cbada..b58ecf9a45a 100644 --- a/Mage.Sets/src/mage/sets/theros/DarkBetrayal.java +++ b/Mage.Sets/src/mage/sets/theros/DarkBetrayal.java @@ -57,7 +57,7 @@ public class DarkBetrayal extends CardImpl { // Destroy target black creature. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); this.getSpellAbility().addTarget(target); } diff --git a/Mage.Sets/src/mage/sets/theros/DestructiveRevelry.java b/Mage.Sets/src/mage/sets/theros/DestructiveRevelry.java index e9e1287de42..6e9aa03b311 100644 --- a/Mage.Sets/src/mage/sets/theros/DestructiveRevelry.java +++ b/Mage.Sets/src/mage/sets/theros/DestructiveRevelry.java @@ -63,7 +63,7 @@ public class DestructiveRevelry extends CardImpl { // Destroy target artifact or enchantment. Destructive Revelry deals 2 damage to that permanent's controller. this.getSpellAbility().addEffect(new DestructiveRevelryEffect()); - Target target = new TargetPermanent(filter, true); + Target target = new TargetPermanent(filter); target.setRequired(true); this.getSpellAbility().addTarget(target); } diff --git a/Mage.Sets/src/mage/sets/theros/DiscipleOfPhenax.java b/Mage.Sets/src/mage/sets/theros/DiscipleOfPhenax.java index ffe7c31daee..780212b9f9a 100644 --- a/Mage.Sets/src/mage/sets/theros/DiscipleOfPhenax.java +++ b/Mage.Sets/src/mage/sets/theros/DiscipleOfPhenax.java @@ -69,7 +69,7 @@ public class DiscipleOfPhenax extends CardImpl { // When Disciple of Phenax enters the battlefield, target player reveals a number of cards // from his or her hand equal to your devotion to black. You choose one of them. That player discards that card. Ability ability = new EntersBattlefieldTriggeredAbility(new DiscipleOfPhenaxEffect(), false); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/theros/DragonMantle.java b/Mage.Sets/src/mage/sets/theros/DragonMantle.java index 8d3f7799106..2e51cff385e 100644 --- a/Mage.Sets/src/mage/sets/theros/DragonMantle.java +++ b/Mage.Sets/src/mage/sets/theros/DragonMantle.java @@ -62,7 +62,7 @@ public class DragonMantle extends CardImpl { this.color.setRed(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/theros/EpharasWarden.java b/Mage.Sets/src/mage/sets/theros/EpharasWarden.java index cc3723d5836..4abc0757b78 100644 --- a/Mage.Sets/src/mage/sets/theros/EpharasWarden.java +++ b/Mage.Sets/src/mage/sets/theros/EpharasWarden.java @@ -66,7 +66,7 @@ public class EpharasWarden extends CardImpl { // {T}: Tap target creature with power 3 or less. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/theros/FadeIntoAntiquity.java b/Mage.Sets/src/mage/sets/theros/FadeIntoAntiquity.java index ce887f30b3a..5e9fc40cc5e 100644 --- a/Mage.Sets/src/mage/sets/theros/FadeIntoAntiquity.java +++ b/Mage.Sets/src/mage/sets/theros/FadeIntoAntiquity.java @@ -57,7 +57,7 @@ public class FadeIntoAntiquity extends CardImpl { // Exile target artifact or enchantment. this.getSpellAbility().addEffect(new ExileTargetEffect()); - Target target = new TargetPermanent(filter, true); + Target target = new TargetPermanent(filter); target.setRequired(true); this.getSpellAbility().addTarget(target); } diff --git a/Mage.Sets/src/mage/sets/theros/FateForetold.java b/Mage.Sets/src/mage/sets/theros/FateForetold.java index 134b3e98fbc..669c0fa76eb 100644 --- a/Mage.Sets/src/mage/sets/theros/FateForetold.java +++ b/Mage.Sets/src/mage/sets/theros/FateForetold.java @@ -55,7 +55,7 @@ public class FateForetold extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/theros/FeralInvocation.java b/Mage.Sets/src/mage/sets/theros/FeralInvocation.java index 05ab3d14bc9..bcda73a1b0f 100644 --- a/Mage.Sets/src/mage/sets/theros/FeralInvocation.java +++ b/Mage.Sets/src/mage/sets/theros/FeralInvocation.java @@ -59,7 +59,7 @@ public class FeralInvocation extends CardImpl { // Flash this.addAbility(FlashAbility.getInstance()); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/theros/FlamecastWheel.java b/Mage.Sets/src/mage/sets/theros/FlamecastWheel.java index 799d4babc43..9e0b9fb387f 100644 --- a/Mage.Sets/src/mage/sets/theros/FlamecastWheel.java +++ b/Mage.Sets/src/mage/sets/theros/FlamecastWheel.java @@ -52,7 +52,7 @@ public class FlamecastWheel extends CardImpl { // {5}, {T}, Sacrifice Flamecast Wheel: Flamecast Wheel deals 3 damage to target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new GenericManaCost(5)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/theros/GiftOfImmortality.java b/Mage.Sets/src/mage/sets/theros/GiftOfImmortality.java index b6980ddd5fd..9b4f78f983d 100644 --- a/Mage.Sets/src/mage/sets/theros/GiftOfImmortality.java +++ b/Mage.Sets/src/mage/sets/theros/GiftOfImmortality.java @@ -62,7 +62,7 @@ public class GiftOfImmortality extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/theros/GlareOfHeresy.java b/Mage.Sets/src/mage/sets/theros/GlareOfHeresy.java index 978478dd922..75e1618b81a 100644 --- a/Mage.Sets/src/mage/sets/theros/GlareOfHeresy.java +++ b/Mage.Sets/src/mage/sets/theros/GlareOfHeresy.java @@ -56,7 +56,7 @@ public class GlareOfHeresy extends CardImpl { // Exile target white permanent. this.getSpellAbility().addEffect(new ExileTargetEffect()); - Target target = new TargetPermanent(filter, true); + Target target = new TargetPermanent(filter); target.setRequired(true); this.getSpellAbility().addTarget(target); } diff --git a/Mage.Sets/src/mage/sets/theros/GodsWilling.java b/Mage.Sets/src/mage/sets/theros/GodsWilling.java index d085f281b17..dff93c4093d 100644 --- a/Mage.Sets/src/mage/sets/theros/GodsWilling.java +++ b/Mage.Sets/src/mage/sets/theros/GodsWilling.java @@ -54,7 +54,7 @@ public class GodsWilling extends CardImpl { this.getSpellAbility().addEffect(new GainProtectionFromColorTargetEffect(Duration.EndOfTurn)); Choice colorChoice = new ChoiceColor(); this.getSpellAbility().addChoice(colorChoice); - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); this.getSpellAbility().addEffect(new ScryEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/theros/HeliodsEmissary.java b/Mage.Sets/src/mage/sets/theros/HeliodsEmissary.java index b073fdb3bcc..c2244ab1e46 100644 --- a/Mage.Sets/src/mage/sets/theros/HeliodsEmissary.java +++ b/Mage.Sets/src/mage/sets/theros/HeliodsEmissary.java @@ -72,12 +72,12 @@ public class HeliodsEmissary extends CardImpl { this.addAbility(new BestowAbility(this, "{6}{W}")); // Whenever Heliod's Emissary or enchanted creature attacks, tap target creature an opponent controls. Ability ability = new AttacksTriggeredAbility(new TapTargetEffect(), false); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); ability = new AttacksAttachedTriggeredAbility(new TapTargetEffect(), AttachmentType.AURA, false); - target = new TargetCreaturePermanent(filter, true); + target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/theros/HerosDownfall.java b/Mage.Sets/src/mage/sets/theros/HerosDownfall.java index e4cd5e9e186..1a061e3e8a1 100644 --- a/Mage.Sets/src/mage/sets/theros/HerosDownfall.java +++ b/Mage.Sets/src/mage/sets/theros/HerosDownfall.java @@ -57,7 +57,7 @@ public class HerosDownfall extends CardImpl { // Destroy target creature or planeswalker. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - Target target = new TargetPermanent(filter, true); + Target target = new TargetPermanent(filter); target.setRequired(true); this.getSpellAbility().addTarget(target); } diff --git a/Mage.Sets/src/mage/sets/theros/HuntTheHunter.java b/Mage.Sets/src/mage/sets/theros/HuntTheHunter.java index a303bc310d3..5ed877ffb2c 100644 --- a/Mage.Sets/src/mage/sets/theros/HuntTheHunter.java +++ b/Mage.Sets/src/mage/sets/theros/HuntTheHunter.java @@ -69,7 +69,7 @@ public class HuntTheHunter extends CardImpl { Effect effect = new BoostTargetEffect(2,2, Duration.EndOfTurn); effect.setApplyEffectsAfter(); this.getSpellAbility().addEffect(effect); - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(1,1,filterControlledGreen, false, true)); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(1,1,filterControlledGreen, false)); effect = new FightTargetsEffect(); effect.setText("It fights target green creature an opponent controls"); diff --git a/Mage.Sets/src/mage/sets/theros/KeepsakeGorgon.java b/Mage.Sets/src/mage/sets/theros/KeepsakeGorgon.java index 3039cd3677f..1dbf204078e 100644 --- a/Mage.Sets/src/mage/sets/theros/KeepsakeGorgon.java +++ b/Mage.Sets/src/mage/sets/theros/KeepsakeGorgon.java @@ -72,7 +72,7 @@ public class KeepsakeGorgon extends CardImpl { this.addAbility(new MonstrosityAbility("{5}{B}{B}", 1)); // When Keepsake Gorgon becomes monstrous, destroy target non-Gorgon creature an opponent controls. Ability ability = new BecomesMonstrousSourceTriggeredAbility(new DestroyTargetEffect()); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/theros/LabyrinthChampion.java b/Mage.Sets/src/mage/sets/theros/LabyrinthChampion.java index d0cfc0143fc..63e2f90a364 100644 --- a/Mage.Sets/src/mage/sets/theros/LabyrinthChampion.java +++ b/Mage.Sets/src/mage/sets/theros/LabyrinthChampion.java @@ -55,7 +55,7 @@ public class LabyrinthChampion extends CardImpl { // Heroic - Whenever you cast a spell that targets Labyrinth Champion, Labyrinth Champion deals 2 damage to target creature or player. Ability ability = new HeroicAbility(new DamageTargetEffect(2), false); - ability.addTarget(new TargetCreatureOrPlayer(true)); + ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/theros/LashOfTheWhip.java b/Mage.Sets/src/mage/sets/theros/LashOfTheWhip.java index 6212018fba3..25062d29204 100644 --- a/Mage.Sets/src/mage/sets/theros/LashOfTheWhip.java +++ b/Mage.Sets/src/mage/sets/theros/LashOfTheWhip.java @@ -49,7 +49,7 @@ public class LashOfTheWhip extends CardImpl { // Target creature gets -4/-4 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(-4,-4, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public LashOfTheWhip(final LashOfTheWhip card) { diff --git a/Mage.Sets/src/mage/sets/theros/LeoninSnarecaster.java b/Mage.Sets/src/mage/sets/theros/LeoninSnarecaster.java index 7e80f9efdc6..5fe6f484162 100644 --- a/Mage.Sets/src/mage/sets/theros/LeoninSnarecaster.java +++ b/Mage.Sets/src/mage/sets/theros/LeoninSnarecaster.java @@ -55,7 +55,7 @@ public class LeoninSnarecaster extends CardImpl { // When Leonin Snarecaster enters the battlefield, you may tap target creature. Ability ability = new EntersBattlefieldTriggeredAbility(new TapTargetEffect(), true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/theros/LoathsomeCatoblepas.java b/Mage.Sets/src/mage/sets/theros/LoathsomeCatoblepas.java index 5618f5262b7..5b738114720 100644 --- a/Mage.Sets/src/mage/sets/theros/LoathsomeCatoblepas.java +++ b/Mage.Sets/src/mage/sets/theros/LoathsomeCatoblepas.java @@ -70,7 +70,7 @@ public class LoathsomeCatoblepas extends CardImpl { this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new MustBeBlockedByAtLeastOneSourceEffect(), new ManaCostsImpl("{2}{G}"))); // When Loathsome Catoblepas dies, target creature an opponent controls gets -3/-3 until end of turn. Ability ability = new DiesTriggeredAbility(new BoostTargetEffect(-3,-3, Duration.EndOfTurn), false); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/theros/LostInALabyrinth.java b/Mage.Sets/src/mage/sets/theros/LostInALabyrinth.java index 602ca8eb3e7..5fcce3bd2cd 100644 --- a/Mage.Sets/src/mage/sets/theros/LostInALabyrinth.java +++ b/Mage.Sets/src/mage/sets/theros/LostInALabyrinth.java @@ -50,7 +50,7 @@ public class LostInALabyrinth extends CardImpl { // Target creature gets -3/-0 until end of turn. Scry 1. this.getSpellAbility().addEffect(new BoostTargetEffect(-3,-0, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new ScryEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/theros/MessengersSpeed.java b/Mage.Sets/src/mage/sets/theros/MessengersSpeed.java index c10495686b8..38fd73e321f 100644 --- a/Mage.Sets/src/mage/sets/theros/MessengersSpeed.java +++ b/Mage.Sets/src/mage/sets/theros/MessengersSpeed.java @@ -60,7 +60,7 @@ public class MessengersSpeed extends CardImpl { this.color.setRed(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/theros/MogissMarauder.java b/Mage.Sets/src/mage/sets/theros/MogissMarauder.java index bedc03139a6..b0d11163a81 100644 --- a/Mage.Sets/src/mage/sets/theros/MogissMarauder.java +++ b/Mage.Sets/src/mage/sets/theros/MogissMarauder.java @@ -65,7 +65,7 @@ public class MogissMarauder extends CardImpl { "up to X target creatures each gain intimidate"), false); ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn, "and haste until end of turn, where X is your devotion to black")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/theros/NyleaGodOfTheHunt.java b/Mage.Sets/src/mage/sets/theros/NyleaGodOfTheHunt.java index 7233705964c..c1b2ee646a2 100644 --- a/Mage.Sets/src/mage/sets/theros/NyleaGodOfTheHunt.java +++ b/Mage.Sets/src/mage/sets/theros/NyleaGodOfTheHunt.java @@ -75,7 +75,7 @@ public class NyleaGodOfTheHunt extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent(), true))); // {3}{G}: Target creature gets +2/+2 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2,2, Duration.EndOfTurn), new ManaCostsImpl("{3}{G}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/theros/OrdealOfErebos.java b/Mage.Sets/src/mage/sets/theros/OrdealOfErebos.java index 9146e35e65e..e5efca75cd0 100644 --- a/Mage.Sets/src/mage/sets/theros/OrdealOfErebos.java +++ b/Mage.Sets/src/mage/sets/theros/OrdealOfErebos.java @@ -62,7 +62,7 @@ public class OrdealOfErebos extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); @@ -75,7 +75,7 @@ public class OrdealOfErebos extends CardImpl { this.addAbility(ability); // When you sacrifice Ordeal of Erebos, target player discards two cards. ability = new SacrificeSourceTriggeredAbility(new DiscardTargetEffect(2), false); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/theros/OrdealOfHeliod.java b/Mage.Sets/src/mage/sets/theros/OrdealOfHeliod.java index 4e7d9923048..57bd57d8061 100644 --- a/Mage.Sets/src/mage/sets/theros/OrdealOfHeliod.java +++ b/Mage.Sets/src/mage/sets/theros/OrdealOfHeliod.java @@ -61,7 +61,7 @@ public class OrdealOfHeliod extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/theros/OrdealOfNylea.java b/Mage.Sets/src/mage/sets/theros/OrdealOfNylea.java index 62c6412b930..c3a6a9cdd11 100644 --- a/Mage.Sets/src/mage/sets/theros/OrdealOfNylea.java +++ b/Mage.Sets/src/mage/sets/theros/OrdealOfNylea.java @@ -63,7 +63,7 @@ public class OrdealOfNylea extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/theros/OrdealOfPurphoros.java b/Mage.Sets/src/mage/sets/theros/OrdealOfPurphoros.java index 0c98201e675..fb9cdd9bc79 100644 --- a/Mage.Sets/src/mage/sets/theros/OrdealOfPurphoros.java +++ b/Mage.Sets/src/mage/sets/theros/OrdealOfPurphoros.java @@ -62,7 +62,7 @@ public class OrdealOfPurphoros extends CardImpl { this.color.setRed(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/theros/OrdealOfThassa.java b/Mage.Sets/src/mage/sets/theros/OrdealOfThassa.java index b8df8c301e5..31523ea53d5 100644 --- a/Mage.Sets/src/mage/sets/theros/OrdealOfThassa.java +++ b/Mage.Sets/src/mage/sets/theros/OrdealOfThassa.java @@ -61,7 +61,7 @@ public class OrdealOfThassa extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/theros/PharikasCure.java b/Mage.Sets/src/mage/sets/theros/PharikasCure.java index ca491ce0f0b..dba2b721e30 100644 --- a/Mage.Sets/src/mage/sets/theros/PharikasCure.java +++ b/Mage.Sets/src/mage/sets/theros/PharikasCure.java @@ -49,7 +49,7 @@ public class PharikasCure extends CardImpl { // Pharika's Cure deals 2 damage to target creature and you gain 2 life. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new GainLifeEffect(2)); } diff --git a/Mage.Sets/src/mage/sets/theros/PortentOfBetrayal.java b/Mage.Sets/src/mage/sets/theros/PortentOfBetrayal.java index d6a403ab21d..e869a9a93de 100644 --- a/Mage.Sets/src/mage/sets/theros/PortentOfBetrayal.java +++ b/Mage.Sets/src/mage/sets/theros/PortentOfBetrayal.java @@ -58,7 +58,7 @@ public class PortentOfBetrayal extends CardImpl { effect.setText("Untap that creature"); this.getSpellAbility().addEffect(effect); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn, "It gains haste until end of turn")); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new ScryEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/theros/PsychicIntrusion.java b/Mage.Sets/src/mage/sets/theros/PsychicIntrusion.java index e12a22e1973..3e188afdf19 100644 --- a/Mage.Sets/src/mage/sets/theros/PsychicIntrusion.java +++ b/Mage.Sets/src/mage/sets/theros/PsychicIntrusion.java @@ -62,7 +62,7 @@ public class PsychicIntrusion extends CardImpl { // Target opponent reveals his or her hand. You choose a nonland card from that player's graveyard or hand and exile it. // You may cast that card for as long as it remains exiled, and you may spend mana as though it were mana of any color // to cast that spell. - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); this.getSpellAbility().addEffect(new PsychicIntrusionExileEffect()); } diff --git a/Mage.Sets/src/mage/sets/theros/RageOfPurphoros.java b/Mage.Sets/src/mage/sets/theros/RageOfPurphoros.java index 502f544d470..cdbecb6d210 100644 --- a/Mage.Sets/src/mage/sets/theros/RageOfPurphoros.java +++ b/Mage.Sets/src/mage/sets/theros/RageOfPurphoros.java @@ -57,7 +57,7 @@ public class RageOfPurphoros extends CardImpl { // Rage of Purphoros deals 4 damage to target creature. It can't be regenerated this turn. Scry 1. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new RageOfPurphorosEffect()); this.getSpellAbility().addEffect(new ScryEffect(1)); diff --git a/Mage.Sets/src/mage/sets/theros/ReturnedCentaur.java b/Mage.Sets/src/mage/sets/theros/ReturnedCentaur.java index 342eb910d3e..9218be3ffc5 100644 --- a/Mage.Sets/src/mage/sets/theros/ReturnedCentaur.java +++ b/Mage.Sets/src/mage/sets/theros/ReturnedCentaur.java @@ -55,7 +55,7 @@ public class ReturnedCentaur extends CardImpl { // When Returned Centaur enters the battlefield, target player puts the top four cards of his or her library into his or her graveyard. Ability ability = new EntersBattlefieldTriggeredAbility(new PutLibraryIntoGraveTargetEffect(4)); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/theros/SatyrPiper.java b/Mage.Sets/src/mage/sets/theros/SatyrPiper.java index bb061992a9c..68f3a63f3cc 100644 --- a/Mage.Sets/src/mage/sets/theros/SatyrPiper.java +++ b/Mage.Sets/src/mage/sets/theros/SatyrPiper.java @@ -58,7 +58,7 @@ public class SatyrPiper extends CardImpl { // {3}{G}: Target creature must be blocked this turn if able. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MustBeBlockedByAtLeastOneTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{3}{G}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/theros/Scourgemark.java b/Mage.Sets/src/mage/sets/theros/Scourgemark.java index add24d2a9f6..93e30b37ac7 100644 --- a/Mage.Sets/src/mage/sets/theros/Scourgemark.java +++ b/Mage.Sets/src/mage/sets/theros/Scourgemark.java @@ -58,7 +58,7 @@ public class Scourgemark extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/theros/ShipwreckSinger.java b/Mage.Sets/src/mage/sets/theros/ShipwreckSinger.java index efcc201516e..4973b6f4229 100644 --- a/Mage.Sets/src/mage/sets/theros/ShipwreckSinger.java +++ b/Mage.Sets/src/mage/sets/theros/ShipwreckSinger.java @@ -75,7 +75,7 @@ public class ShipwreckSinger extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {1}{U}: Target creature an opponent controls attacks this turn if able. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttacksIfAbleTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{1}{U}")); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/theros/ShreddingWinds.java b/Mage.Sets/src/mage/sets/theros/ShreddingWinds.java index 2e02b92857b..3b0337b3c26 100644 --- a/Mage.Sets/src/mage/sets/theros/ShreddingWinds.java +++ b/Mage.Sets/src/mage/sets/theros/ShreddingWinds.java @@ -57,7 +57,7 @@ public class ShreddingWinds extends CardImpl { // Shredding Winds deals 7 damage to target creature with flying. this.getSpellAbility().addEffect(new DamageTargetEffect(7)); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); this.getSpellAbility().addTarget(target); } diff --git a/Mage.Sets/src/mage/sets/theros/SipOfHemlock.java b/Mage.Sets/src/mage/sets/theros/SipOfHemlock.java index 3fdfec1931d..62d7e48f918 100644 --- a/Mage.Sets/src/mage/sets/theros/SipOfHemlock.java +++ b/Mage.Sets/src/mage/sets/theros/SipOfHemlock.java @@ -49,7 +49,7 @@ public class SipOfHemlock extends CardImpl { // Destroy target creature. Its controller loses 2 life. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new LoseLifeTargetControllerEffect(2)); } diff --git a/Mage.Sets/src/mage/sets/theros/SparkJolt.java b/Mage.Sets/src/mage/sets/theros/SparkJolt.java index 4bde3310454..24170ac704a 100644 --- a/Mage.Sets/src/mage/sets/theros/SparkJolt.java +++ b/Mage.Sets/src/mage/sets/theros/SparkJolt.java @@ -49,7 +49,7 @@ public class SparkJolt extends CardImpl { // Spark Jolt deals 1 damage to target creature or player. Scry 1. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); this.getSpellAbility().addEffect(new ScryEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/theros/SpearOfHeliod.java b/Mage.Sets/src/mage/sets/theros/SpearOfHeliod.java index aaa7efeb23d..7602d682c07 100644 --- a/Mage.Sets/src/mage/sets/theros/SpearOfHeliod.java +++ b/Mage.Sets/src/mage/sets/theros/SpearOfHeliod.java @@ -69,7 +69,7 @@ public class SpearOfHeliod extends CardImpl { // {1}{W}{W}, {T}: Destroy target creature that dealt damage to you this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{W}{W}")); ability.addCost(new TapSourceCost()); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/theros/SteamAugury.java b/Mage.Sets/src/mage/sets/theros/SteamAugury.java index 096376d19b6..421a9ae85e9 100644 --- a/Mage.Sets/src/mage/sets/theros/SteamAugury.java +++ b/Mage.Sets/src/mage/sets/theros/SteamAugury.java @@ -62,7 +62,7 @@ public class SteamAugury extends CardImpl { // Reveal the top five cards of your library and separate them into two piles. An opponent chooses one of those piles. Put that pile into your hand and the other into your graveyard. this.getSpellAbility().addEffect(new SteamAuguryEffect()); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); } diff --git a/Mage.Sets/src/mage/sets/theros/ThassaGodOfTheSea.java b/Mage.Sets/src/mage/sets/theros/ThassaGodOfTheSea.java index 97043266f06..78b9b50a604 100644 --- a/Mage.Sets/src/mage/sets/theros/ThassaGodOfTheSea.java +++ b/Mage.Sets/src/mage/sets/theros/ThassaGodOfTheSea.java @@ -80,7 +80,7 @@ public class ThassaGodOfTheSea extends CardImpl { // 1{U}: Target creature you control can't be blocked this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{1}{U}")); - ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/theros/ThassasBounty.java b/Mage.Sets/src/mage/sets/theros/ThassasBounty.java index 5b8899cf518..0a15b078181 100644 --- a/Mage.Sets/src/mage/sets/theros/ThassasBounty.java +++ b/Mage.Sets/src/mage/sets/theros/ThassasBounty.java @@ -50,7 +50,7 @@ public class ThassasBounty extends CardImpl { // Draw three cards. Target player puts the top three cards of his or her library into his or her graveyard. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(3)); this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public ThassasBounty(final ThassasBounty card) { diff --git a/Mage.Sets/src/mage/sets/theros/TimeToFeed.java b/Mage.Sets/src/mage/sets/theros/TimeToFeed.java index 420500d2713..8472578fee2 100644 --- a/Mage.Sets/src/mage/sets/theros/TimeToFeed.java +++ b/Mage.Sets/src/mage/sets/theros/TimeToFeed.java @@ -87,7 +87,7 @@ public class TimeToFeed extends CardImpl { Target target = new TargetCreaturePermanent(filter1); target.setRequired(true); this.getSpellAbility().addTarget(target); - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/sets/theros/TitansStrength.java b/Mage.Sets/src/mage/sets/theros/TitansStrength.java index 28d353e72c1..c01b32f639e 100644 --- a/Mage.Sets/src/mage/sets/theros/TitansStrength.java +++ b/Mage.Sets/src/mage/sets/theros/TitansStrength.java @@ -50,7 +50,7 @@ public class TitansStrength extends CardImpl { // Target creature gets +3/+1 until end of turn. Scry 1. this.getSpellAbility().addEffect(new BoostTargetEffect(3,1, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new ScryEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/theros/TriadOfFates.java b/Mage.Sets/src/mage/sets/theros/TriadOfFates.java index e74dff8357d..bfdb6985461 100644 --- a/Mage.Sets/src/mage/sets/theros/TriadOfFates.java +++ b/Mage.Sets/src/mage/sets/theros/TriadOfFates.java @@ -81,7 +81,7 @@ public class TriadOfFates extends CardImpl { // {1}, {T}: Put a fate counter on another target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.FATE.createInstance()), new ManaCostsImpl("{1}")); ability.addCost(new TapSourceCost()); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/theros/TymaretTheMurderKing.java b/Mage.Sets/src/mage/sets/theros/TymaretTheMurderKing.java index 9e1c5dfe72d..7873940e3bf 100644 --- a/Mage.Sets/src/mage/sets/theros/TymaretTheMurderKing.java +++ b/Mage.Sets/src/mage/sets/theros/TymaretTheMurderKing.java @@ -69,12 +69,12 @@ public class TymaretTheMurderKing extends CardImpl { // {1}{R}, Sacrifice another creature: Tymaret, the Murder King deals 2 damage to target player. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{1}{R}")); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1, filter, false, true))); - ability.addTarget(new TargetPlayer(true)); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1, filter, false))); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); // {1}{B}, Sacrifice a creature: Return Tymaret from your graveyard to your hand. ability = new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), new ManaCostsImpl("{1}{B}")); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1, new FilterControlledCreaturePermanent("a creature"), false, true))); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1, new FilterControlledCreaturePermanent("a creature"), false))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/theros/VanquishTheFoul.java b/Mage.Sets/src/mage/sets/theros/VanquishTheFoul.java index 734302f2406..37bf7d80141 100644 --- a/Mage.Sets/src/mage/sets/theros/VanquishTheFoul.java +++ b/Mage.Sets/src/mage/sets/theros/VanquishTheFoul.java @@ -58,7 +58,7 @@ public class VanquishTheFoul extends CardImpl { // Destroy target creature with power 4 or greater. Scry 1. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); this.getSpellAbility().addTarget(target); this.getSpellAbility().addEffect(new ScryEffect(1)); diff --git a/Mage.Sets/src/mage/sets/theros/VipersKiss.java b/Mage.Sets/src/mage/sets/theros/VipersKiss.java index 253a2060692..f87ce50b0eb 100644 --- a/Mage.Sets/src/mage/sets/theros/VipersKiss.java +++ b/Mage.Sets/src/mage/sets/theros/VipersKiss.java @@ -58,7 +58,7 @@ public class VipersKiss extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/theros/VoyagesEnd.java b/Mage.Sets/src/mage/sets/theros/VoyagesEnd.java index 81f2d8d187e..3fd05bc2c37 100644 --- a/Mage.Sets/src/mage/sets/theros/VoyagesEnd.java +++ b/Mage.Sets/src/mage/sets/theros/VoyagesEnd.java @@ -49,7 +49,7 @@ public class VoyagesEnd extends CardImpl { // Return target creature to its owner's hand. Scry 1. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new ScryEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/theros/WavecrashTriton.java b/Mage.Sets/src/mage/sets/theros/WavecrashTriton.java index 9e03a44659e..cb05b58b634 100644 --- a/Mage.Sets/src/mage/sets/theros/WavecrashTriton.java +++ b/Mage.Sets/src/mage/sets/theros/WavecrashTriton.java @@ -64,7 +64,7 @@ public class WavecrashTriton extends CardImpl { // Heroic - Whenever you cast a spell that targets Wavecrash Triton, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step. Ability ability = new HeroicAbility(new TapTargetEffect()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); ability.addEffect(new SkipNextUntapTargetEffect("That creature")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/theros/WhipOfErebos.java b/Mage.Sets/src/mage/sets/theros/WhipOfErebos.java index 5fb1960327b..b80e7eaa571 100644 --- a/Mage.Sets/src/mage/sets/theros/WhipOfErebos.java +++ b/Mage.Sets/src/mage/sets/theros/WhipOfErebos.java @@ -80,7 +80,7 @@ public class WhipOfErebos extends CardImpl { // Activate this ability only any time you could cast a sorcery. Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new WhipOfErebosEffect(), new ManaCostsImpl("{2}{B}{B}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard"), true)); + ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard"))); ability.addEffect(new WhipOfErebosReplacementEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/timeshifted/Desert.java b/Mage.Sets/src/mage/sets/timeshifted/Desert.java index 517dd4fa838..4c553750491 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/Desert.java +++ b/Mage.Sets/src/mage/sets/timeshifted/Desert.java @@ -65,7 +65,7 @@ public class Desert extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {tap}: Desert deals 1 damage to target attacking creature. Activate this ability only during the end of combat step. Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost(), IsEndOfCombatStep.getInstance(), null); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/timeshifted/FireWhip.java b/Mage.Sets/src/mage/sets/timeshifted/FireWhip.java index 04532a7377c..791f49fca2e 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/FireWhip.java +++ b/Mage.Sets/src/mage/sets/timeshifted/FireWhip.java @@ -62,7 +62,7 @@ public class FireWhip extends CardImpl { this.color.setRed(true); // Enchant creature you control - TargetPermanent auraTarget = new TargetControlledCreaturePermanent(true); + TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/timeshifted/FuneralCharm.java b/Mage.Sets/src/mage/sets/timeshifted/FuneralCharm.java index 2773fc31709..19b9d80b82c 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/FuneralCharm.java +++ b/Mage.Sets/src/mage/sets/timeshifted/FuneralCharm.java @@ -55,14 +55,14 @@ public class FuneralCharm extends CardImpl { // Choose one - Target player discards a card; or target creature gets +2/-1 until end of turn; or target creature gains swampwalk until end of turn. this.getSpellAbility().addEffect(new DiscardTargetEffect(1)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); Mode mode = new Mode(); mode.getEffects().add(new BoostTargetEffect(2, -1, Duration.EndOfTurn)); - mode.getTargets().add(new TargetCreaturePermanent(true)); + mode.getTargets().add(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); mode = new Mode(); mode.getEffects().add(new GainAbilityTargetEffect(new SwampwalkAbility(), Duration.EndOfTurn)); - mode.getTargets().add(new TargetCreaturePermanent(true)); + mode.getTargets().add(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/sets/timeshifted/GaeasBlessing.java b/Mage.Sets/src/mage/sets/timeshifted/GaeasBlessing.java index 20178355fe1..fd800bc0b16 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/GaeasBlessing.java +++ b/Mage.Sets/src/mage/sets/timeshifted/GaeasBlessing.java @@ -59,7 +59,7 @@ public class GaeasBlessing extends CardImpl { // Target player shuffles up to three target cards from his or her graveyard into his or her library. this.getSpellAbility().addEffect(new GaeasBlessingEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addTarget(new GaeasBlessingTarget()); // Draw a card. diff --git a/Mage.Sets/src/mage/sets/timeshifted/GrinningTotem.java b/Mage.Sets/src/mage/sets/timeshifted/GrinningTotem.java index ef845d1830f..d1cf17e2c91 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/GrinningTotem.java +++ b/Mage.Sets/src/mage/sets/timeshifted/GrinningTotem.java @@ -70,7 +70,7 @@ public class GrinningTotem extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GrinningTotemSearchAndExileEffect(), new ManaCostsImpl("{2}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); // Until the beginning of your next upkeep, you may play that card. ability.addEffect(new GrinningTotemMayPlayEffect()); // At the beginning of your next upkeep, if you haven't played it, put it into its owner's graveyard. diff --git a/Mage.Sets/src/mage/sets/timeshifted/Pendelhaven.java b/Mage.Sets/src/mage/sets/timeshifted/Pendelhaven.java index a6f9d9cde8e..b4afdac0edc 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/Pendelhaven.java +++ b/Mage.Sets/src/mage/sets/timeshifted/Pendelhaven.java @@ -66,7 +66,7 @@ public class Pendelhaven extends CardImpl { this.addAbility(new GreenManaAbility()); // {tap}: Target 1/1 creature gets +1/+2 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 2, Duration.EndOfTurn), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/timeshifted/SpikeFeeder.java b/Mage.Sets/src/mage/sets/timeshifted/SpikeFeeder.java index 0f2cda68c9a..d294b4bfd3f 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/SpikeFeeder.java +++ b/Mage.Sets/src/mage/sets/timeshifted/SpikeFeeder.java @@ -65,7 +65,7 @@ public class SpikeFeeder extends CardImpl { // {2}, Remove a +1/+1 counter from Spike Feeder: Put a +1/+1 counter on target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Remove a +1/+1 counter from Spike Feeder: You gain 2 life. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(2), new RemoveCountersSourceCost(CounterType.P1P1.createInstance()))); diff --git a/Mage.Sets/src/mage/sets/timeshifted/Stupor.java b/Mage.Sets/src/mage/sets/timeshifted/Stupor.java index cb4f7e5d7d1..1e9ac8706f0 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/Stupor.java +++ b/Mage.Sets/src/mage/sets/timeshifted/Stupor.java @@ -49,7 +49,7 @@ public class Stupor extends CardImpl { // Target opponent discards a card at random, then discards a card. this.getSpellAbility().addEffect(new DiscardTargetEffect(1, true)); this.getSpellAbility().addEffect(new DiscardTargetEffect(1)); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); } public Stupor(final Stupor card) { diff --git a/Mage.Sets/src/mage/sets/timeshifted/TormodsCrypt.java b/Mage.Sets/src/mage/sets/timeshifted/TormodsCrypt.java index fd9d269ca27..917c3dbe792 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/TormodsCrypt.java +++ b/Mage.Sets/src/mage/sets/timeshifted/TormodsCrypt.java @@ -51,7 +51,7 @@ public class TormodsCrypt extends CardImpl { // {tap}, Sacrifice Tormod's Crypt: Exile all cards from target player's graveyard. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileGraveyardAllTargetPlayerEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/timeshifted/ZhalfirinCommander.java b/Mage.Sets/src/mage/sets/timeshifted/ZhalfirinCommander.java index fa363d1710a..7ad81cdd262 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/ZhalfirinCommander.java +++ b/Mage.Sets/src/mage/sets/timeshifted/ZhalfirinCommander.java @@ -70,7 +70,7 @@ public class ZhalfirinCommander extends CardImpl { this.addAbility(new FlankingAbility()); // {1}{W}{W}: Target Knight creature gets +1/+1 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{1}{W}{W}")); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/timespiral/AncestralVision.java b/Mage.Sets/src/mage/sets/timespiral/AncestralVision.java index 794966f4260..a76e35201e5 100644 --- a/Mage.Sets/src/mage/sets/timespiral/AncestralVision.java +++ b/Mage.Sets/src/mage/sets/timespiral/AncestralVision.java @@ -49,7 +49,7 @@ public class AncestralVision extends CardImpl { // Suspend 4-{U} this.addAbility(new SuspendAbility(4, new ManaCostsImpl("U"), this)); // Target player draws three cards. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new DrawCardTargetEffect(3)); } diff --git a/Mage.Sets/src/mage/sets/timespiral/AspectOfMongoose.java b/Mage.Sets/src/mage/sets/timespiral/AspectOfMongoose.java index 081b95acdaa..b9a064f7d7b 100644 --- a/Mage.Sets/src/mage/sets/timespiral/AspectOfMongoose.java +++ b/Mage.Sets/src/mage/sets/timespiral/AspectOfMongoose.java @@ -60,7 +60,7 @@ public class AspectOfMongoose extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/timespiral/AssemblyWorker.java b/Mage.Sets/src/mage/sets/timespiral/AssemblyWorker.java index 52e1727a9f6..221de05930a 100644 --- a/Mage.Sets/src/mage/sets/timespiral/AssemblyWorker.java +++ b/Mage.Sets/src/mage/sets/timespiral/AssemblyWorker.java @@ -64,7 +64,7 @@ public class AssemblyWorker extends CardImpl { // {tap}: Target Assembly-Worker creature gets +1/+1 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new TapSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/timespiral/Bewilder.java b/Mage.Sets/src/mage/sets/timespiral/Bewilder.java index feb99d95c35..99c7ad90579 100644 --- a/Mage.Sets/src/mage/sets/timespiral/Bewilder.java +++ b/Mage.Sets/src/mage/sets/timespiral/Bewilder.java @@ -51,7 +51,7 @@ public class Bewilder extends CardImpl { // Target creature gets -3/-0 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(-3, 0, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/timespiral/CarefulConsideration.java b/Mage.Sets/src/mage/sets/timespiral/CarefulConsideration.java index 9975c24402c..bf53663fb89 100644 --- a/Mage.Sets/src/mage/sets/timespiral/CarefulConsideration.java +++ b/Mage.Sets/src/mage/sets/timespiral/CarefulConsideration.java @@ -54,7 +54,7 @@ public class CarefulConsideration extends CardImpl { new DrawDiscardTargetEffect(4,3), MyMainPhaseCondition.getInstance(), "Target player draws four cards, then discards three cards. If you cast this spell during your main phase, instead that player draws four cards, then discards two cards")); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public CarefulConsideration(final CarefulConsideration card) { diff --git a/Mage.Sets/src/mage/sets/timespiral/ClockworkHydra.java b/Mage.Sets/src/mage/sets/timespiral/ClockworkHydra.java index 317d4dc4446..245c75ec467 100644 --- a/Mage.Sets/src/mage/sets/timespiral/ClockworkHydra.java +++ b/Mage.Sets/src/mage/sets/timespiral/ClockworkHydra.java @@ -108,7 +108,7 @@ class ClockworkHydraEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null && permanent != null && permanent.getCounters().getCount(CounterType.P1P1) > 0) { permanent.removeCounters(CounterType.P1P1.createInstance(), game); - Target target = new TargetCreatureOrPlayer(true); + Target target = new TargetCreatureOrPlayer(); if (controller.chooseTarget(outcome, target, source, game)) { Effect effect = new DamageTargetEffect(1); effect.setTargetPointer(new FixedTarget(target.getFirstTarget())); diff --git a/Mage.Sets/src/mage/sets/timespiral/DarkWithering.java b/Mage.Sets/src/mage/sets/timespiral/DarkWithering.java index 9e658c7f3ba..cec87765fcf 100644 --- a/Mage.Sets/src/mage/sets/timespiral/DarkWithering.java +++ b/Mage.Sets/src/mage/sets/timespiral/DarkWithering.java @@ -60,7 +60,7 @@ public class DarkWithering extends CardImpl { this.color.setBlack(true); // Destroy target nonblack creature. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); // Madness {B} diff --git a/Mage.Sets/src/mage/sets/timespiral/DreadReturn.java b/Mage.Sets/src/mage/sets/timespiral/DreadReturn.java index 0b08ef1a6d7..58b8db8c224 100644 --- a/Mage.Sets/src/mage/sets/timespiral/DreadReturn.java +++ b/Mage.Sets/src/mage/sets/timespiral/DreadReturn.java @@ -56,7 +56,7 @@ public class DreadReturn extends CardImpl { this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect()); this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard"))); // Flashback-Sacrifice three creatures. - this.addAbility(new FlashbackAbility(new SacrificeTargetCost(new TargetControlledCreaturePermanent(3,3,new FilterControlledCreaturePermanent("three creatures"),true,true)), TimingRule.SORCERY)); + this.addAbility(new FlashbackAbility(new SacrificeTargetCost(new TargetControlledCreaturePermanent(3,3,new FilterControlledCreaturePermanent("three creatures"),true)), TimingRule.SORCERY)); } public DreadReturn(final DreadReturn card) { diff --git a/Mage.Sets/src/mage/sets/timespiral/EternitySnare.java b/Mage.Sets/src/mage/sets/timespiral/EternitySnare.java index 9d614971c15..5328c4d9732 100644 --- a/Mage.Sets/src/mage/sets/timespiral/EternitySnare.java +++ b/Mage.Sets/src/mage/sets/timespiral/EternitySnare.java @@ -57,7 +57,7 @@ public class EternitySnare extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/timespiral/GriffinGuide.java b/Mage.Sets/src/mage/sets/timespiral/GriffinGuide.java index ad13979b0da..ce6f7a18679 100644 --- a/Mage.Sets/src/mage/sets/timespiral/GriffinGuide.java +++ b/Mage.Sets/src/mage/sets/timespiral/GriffinGuide.java @@ -64,7 +64,7 @@ public class GriffinGuide extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/timespiral/GroundRift.java b/Mage.Sets/src/mage/sets/timespiral/GroundRift.java index 704f69a8a6b..868450ad016 100644 --- a/Mage.Sets/src/mage/sets/timespiral/GroundRift.java +++ b/Mage.Sets/src/mage/sets/timespiral/GroundRift.java @@ -60,7 +60,7 @@ public class GroundRift extends CardImpl { this.color.setRed(true); // Target creature without flying can't block this turn. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new CantBlockTargetEffect(Duration.EndOfTurn)); // Storm this.addAbility(new StormAbility()); diff --git a/Mage.Sets/src/mage/sets/timespiral/HarmonicSliver.java b/Mage.Sets/src/mage/sets/timespiral/HarmonicSliver.java index 33a4e09f5ae..258931585b8 100644 --- a/Mage.Sets/src/mage/sets/timespiral/HarmonicSliver.java +++ b/Mage.Sets/src/mage/sets/timespiral/HarmonicSliver.java @@ -74,7 +74,7 @@ public class HarmonicSliver extends CardImpl { // All Slivers have "When this permanent enters the battlefield, destroy target artifact or enchantment." Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false); - TargetPermanent target = new TargetPermanent(filter, true); + TargetPermanent target = new TargetPermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( diff --git a/Mage.Sets/src/mage/sets/timespiral/IgniteMemories.java b/Mage.Sets/src/mage/sets/timespiral/IgniteMemories.java index 3363f9ae0ab..8de89911f26 100644 --- a/Mage.Sets/src/mage/sets/timespiral/IgniteMemories.java +++ b/Mage.Sets/src/mage/sets/timespiral/IgniteMemories.java @@ -56,7 +56,7 @@ public class IgniteMemories extends CardImpl { this.color.setRed(true); // Target player reveals a card at random from his or her hand. Ignite Memories deals damage to that player equal to that card's converted mana cost. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new IgniteMemoriesEffect()); // Storm this.addAbility(new StormAbility()); diff --git a/Mage.Sets/src/mage/sets/timespiral/JayaBallardTaskMage.java b/Mage.Sets/src/mage/sets/timespiral/JayaBallardTaskMage.java index 0d41c191c2e..3eb940f6586 100644 --- a/Mage.Sets/src/mage/sets/timespiral/JayaBallardTaskMage.java +++ b/Mage.Sets/src/mage/sets/timespiral/JayaBallardTaskMage.java @@ -79,14 +79,14 @@ public class JayaBallardTaskMage extends CardImpl { // {R}, {tap}, Discard a card: Destroy target blue permanent. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{R}")); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); // {1}{R}, {tap}, Discard a card: Jaya Ballard, Task Mage deals 3 damage to target creature or player. A creature dealt damage this way can't be regenerated this turn. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new ManaCostsImpl("{1}{R}")); - ability.addTarget(new TargetCreatureOrPlayer(true)); + ability.addTarget(new TargetCreatureOrPlayer()); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addEffect(new CantRegenerateEffect()); diff --git a/Mage.Sets/src/mage/sets/timespiral/KaervekTheMerciless.java b/Mage.Sets/src/mage/sets/timespiral/KaervekTheMerciless.java index 9607cf6fa55..771a90c1ce2 100644 --- a/Mage.Sets/src/mage/sets/timespiral/KaervekTheMerciless.java +++ b/Mage.Sets/src/mage/sets/timespiral/KaervekTheMerciless.java @@ -66,7 +66,7 @@ public class KaervekTheMerciless extends CardImpl { // Whenever an opponent casts a spell, Kaervek the Merciless deals damage to target creature or player equal to that spell's converted mana cost. Ability ability = new SpellCastOpponentTriggeredAbility(Zone.BATTLEFIELD, new KaervekTheMercilessEffect(), new FilterSpell(), false, SetTargetPointer.SPELL); - ability.addTarget(new TargetCreatureOrPlayer(true)); + ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/timespiral/KrosanGrip.java b/Mage.Sets/src/mage/sets/timespiral/KrosanGrip.java index e5d9f071372..32db0ef21bf 100644 --- a/Mage.Sets/src/mage/sets/timespiral/KrosanGrip.java +++ b/Mage.Sets/src/mage/sets/timespiral/KrosanGrip.java @@ -61,7 +61,7 @@ public class KrosanGrip extends CardImpl { // Split second this.addAbility(new SplitSecondAbility()); // Destroy target artifact or enchantment. - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/timespiral/LightningAxe.java b/Mage.Sets/src/mage/sets/timespiral/LightningAxe.java index 20dcea6603b..743b6df8827 100644 --- a/Mage.Sets/src/mage/sets/timespiral/LightningAxe.java +++ b/Mage.Sets/src/mage/sets/timespiral/LightningAxe.java @@ -53,7 +53,7 @@ public class LightningAxe extends CardImpl { this.getSpellAbility().addCost(new OrCost(new DiscardCardCost(), new GenericManaCost(5),"discard a card or pay {5}")); // Lightning Axe deals 5 damage to target creature. this.getSpellAbility().addEffect(new DamageTargetEffect(5)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public LightningAxe(final LightningAxe card) { diff --git a/Mage.Sets/src/mage/sets/timespiral/MangaraOfCorondor.java b/Mage.Sets/src/mage/sets/timespiral/MangaraOfCorondor.java index 83f21f6d4c0..1f531d8f736 100644 --- a/Mage.Sets/src/mage/sets/timespiral/MangaraOfCorondor.java +++ b/Mage.Sets/src/mage/sets/timespiral/MangaraOfCorondor.java @@ -60,7 +60,7 @@ public class MangaraOfCorondor extends CardImpl { // {tap}: Exile Mangara of Corondor and target permanent. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileSourceEffect(Zone.BATTLEFIELD), new TapSourceCost()); ability.addEffect(new ExileTargetEffect()); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/timespiral/MightOfOldKrosa.java b/Mage.Sets/src/mage/sets/timespiral/MightOfOldKrosa.java index 700f07923bc..e55cad979d9 100644 --- a/Mage.Sets/src/mage/sets/timespiral/MightOfOldKrosa.java +++ b/Mage.Sets/src/mage/sets/timespiral/MightOfOldKrosa.java @@ -56,7 +56,7 @@ public class MightOfOldKrosa extends CardImpl { MyMainPhaseCondition.getInstance(), "Target creature gets +2/+2 until end of turn. If you cast this spell during your main phase, that creature gets +4/+4 until end of turn instead", true)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public MightOfOldKrosa(final MightOfOldKrosa card) { diff --git a/Mage.Sets/src/mage/sets/timespiral/Mindstab.java b/Mage.Sets/src/mage/sets/timespiral/Mindstab.java index bb6703c5037..ca2749054f9 100644 --- a/Mage.Sets/src/mage/sets/timespiral/Mindstab.java +++ b/Mage.Sets/src/mage/sets/timespiral/Mindstab.java @@ -50,7 +50,7 @@ public class Mindstab extends CardImpl { // Target player discards three cards. this.getSpellAbility().addEffect(new DiscardTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); // Suspend 4—{B} (Rather than cast this card from your hand, you may pay {B} and exile it with four time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost.) this.addAbility(new SuspendAbility(4, new ManaCostsImpl("{B}"), this)); diff --git a/Mage.Sets/src/mage/sets/timespiral/MomentaryBlink.java b/Mage.Sets/src/mage/sets/timespiral/MomentaryBlink.java index f4521fc606e..681ea1827f0 100644 --- a/Mage.Sets/src/mage/sets/timespiral/MomentaryBlink.java +++ b/Mage.Sets/src/mage/sets/timespiral/MomentaryBlink.java @@ -51,7 +51,7 @@ public class MomentaryBlink extends CardImpl { this.color.setWhite(true); // Exile target creature you control, then return it to the battlefield under its owner's control. - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); this.getSpellAbility().addEffect(new ExileTargetForSourceEffect("Momentary Blink")); this.getSpellAbility().addEffect(new ReturnToBattlefieldUnderYourControlTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/timespiral/Phthisis.java b/Mage.Sets/src/mage/sets/timespiral/Phthisis.java index 90ef0a58632..b448ca3af79 100644 --- a/Mage.Sets/src/mage/sets/timespiral/Phthisis.java +++ b/Mage.Sets/src/mage/sets/timespiral/Phthisis.java @@ -55,7 +55,7 @@ public class Phthisis extends CardImpl { // Destroy target creature. Its controller loses life equal to its power plus its toughness. this.getSpellAbility().addEffect(new PhthisisEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Suspend 5-{1}{B} this.addAbility(new SuspendAbility(5, new ManaCostsImpl("{1}{B}"), this)); diff --git a/Mage.Sets/src/mage/sets/timespiral/RiftBolt.java b/Mage.Sets/src/mage/sets/timespiral/RiftBolt.java index e4f488f79d7..b37156cd761 100644 --- a/Mage.Sets/src/mage/sets/timespiral/RiftBolt.java +++ b/Mage.Sets/src/mage/sets/timespiral/RiftBolt.java @@ -50,7 +50,7 @@ public class RiftBolt extends CardImpl { // Rift Bolt deals 3 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); // Suspend 1-{R} this.addAbility(new SuspendAbility(1, new ManaCostsImpl("{R}"), this)); diff --git a/Mage.Sets/src/mage/sets/timespiral/RiftwingCloudskate.java b/Mage.Sets/src/mage/sets/timespiral/RiftwingCloudskate.java index 5c5d8d9ed1a..f58289791db 100644 --- a/Mage.Sets/src/mage/sets/timespiral/RiftwingCloudskate.java +++ b/Mage.Sets/src/mage/sets/timespiral/RiftwingCloudskate.java @@ -59,7 +59,7 @@ public class RiftwingCloudskate extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Riftwing Cloudskate enters the battlefield, return target permanent to its owner's hand. Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect(), false); - ability.addTarget(new TargetPermanent(true)); + ability.addTarget(new TargetPermanent()); this.addAbility(ability); // Suspend 3-{1}{U} diff --git a/Mage.Sets/src/mage/sets/timespiral/StuffyDoll.java b/Mage.Sets/src/mage/sets/timespiral/StuffyDoll.java index c7085403a8a..65ab1b7341e 100644 --- a/Mage.Sets/src/mage/sets/timespiral/StuffyDoll.java +++ b/Mage.Sets/src/mage/sets/timespiral/StuffyDoll.java @@ -103,7 +103,7 @@ class StuffyDollChoosePlayerEffect extends OneShotEffect { Player player = game.getPlayer(source.getControllerId()); Permanent permanent = game.getPermanent(source.getSourceId()); if (player != null && permanent != null) { - TargetPlayer target = new TargetPlayer(true); + TargetPlayer target = new TargetPlayer(); target.setRequired(true); if (player.choose(this.outcome, target, source.getSourceId(), game)) { Player chosenPlayer = game.getPlayer(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/sets/timespiral/SuddenShock.java b/Mage.Sets/src/mage/sets/timespiral/SuddenShock.java index cd500ebd1a6..3f0802cd92c 100644 --- a/Mage.Sets/src/mage/sets/timespiral/SuddenShock.java +++ b/Mage.Sets/src/mage/sets/timespiral/SuddenShock.java @@ -51,7 +51,7 @@ public class SuddenShock extends CardImpl { this.addAbility(new SplitSecondAbility()); // Sudden Shock deals 2 damage to target creature or player. this.getSpellAbility().addEffect(new DamageTargetEffect(2, true)); - this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); } public SuddenShock(final SuddenShock card) { diff --git a/Mage.Sets/src/mage/sets/timespiral/SuddenSpoiling.java b/Mage.Sets/src/mage/sets/timespiral/SuddenSpoiling.java index 94a40b9e853..ab9a2ec973a 100644 --- a/Mage.Sets/src/mage/sets/timespiral/SuddenSpoiling.java +++ b/Mage.Sets/src/mage/sets/timespiral/SuddenSpoiling.java @@ -61,7 +61,7 @@ public class SuddenSpoiling extends CardImpl { this.addAbility(new SplitSecondAbility()); // Creatures target player controls become 0/2 and lose all abilities until end of turn. this.getSpellAbility().addEffect(new SuddenSpoilingEffect(Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } diff --git a/Mage.Sets/src/mage/sets/timespiral/TemporalIsolation.java b/Mage.Sets/src/mage/sets/timespiral/TemporalIsolation.java index 76e9cb7c50d..bd92298a0af 100644 --- a/Mage.Sets/src/mage/sets/timespiral/TemporalIsolation.java +++ b/Mage.Sets/src/mage/sets/timespiral/TemporalIsolation.java @@ -62,7 +62,7 @@ public class TemporalIsolation extends CardImpl { // Flash this.addAbility(FlashAbility.getInstance()); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/timespiral/ThallidGerminator.java b/Mage.Sets/src/mage/sets/timespiral/ThallidGerminator.java index 1adfebe2bdf..978a5a690da 100644 --- a/Mage.Sets/src/mage/sets/timespiral/ThallidGerminator.java +++ b/Mage.Sets/src/mage/sets/timespiral/ThallidGerminator.java @@ -78,7 +78,7 @@ public class ThallidGerminator extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1,1, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1, filter, false))); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/timespiral/WalkTheAeons.java b/Mage.Sets/src/mage/sets/timespiral/WalkTheAeons.java index 17766f4b19a..c91545836ca 100644 --- a/Mage.Sets/src/mage/sets/timespiral/WalkTheAeons.java +++ b/Mage.Sets/src/mage/sets/timespiral/WalkTheAeons.java @@ -65,7 +65,7 @@ public class WalkTheAeons extends CardImpl { // Target player takes an extra turn after this one. this.getSpellAbility().addEffect(new ExtraTurnEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public WalkTheAeons(final WalkTheAeons card) { diff --git a/Mage.Sets/src/mage/sets/timespiral/WipeAway.java b/Mage.Sets/src/mage/sets/timespiral/WipeAway.java index 1c03b6d0f6d..74bde676f06 100644 --- a/Mage.Sets/src/mage/sets/timespiral/WipeAway.java +++ b/Mage.Sets/src/mage/sets/timespiral/WipeAway.java @@ -50,7 +50,7 @@ public class WipeAway extends CardImpl { // Split second this.addAbility(new SplitSecondAbility()); // Return target permanent to its owner's hand. - this.getSpellAbility().addTarget(new TargetPermanent(true)); + this.getSpellAbility().addTarget(new TargetPermanent()); this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/torment/Accelerate.java b/Mage.Sets/src/mage/sets/torment/Accelerate.java index d8643917fe7..478f7e03310 100644 --- a/Mage.Sets/src/mage/sets/torment/Accelerate.java +++ b/Mage.Sets/src/mage/sets/torment/Accelerate.java @@ -52,7 +52,7 @@ public class Accelerate extends CardImpl { // Target creature gains haste until end of turn. this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/torment/DeepAnalysis.java b/Mage.Sets/src/mage/sets/torment/DeepAnalysis.java index 505539d28e4..e772e445d9c 100644 --- a/Mage.Sets/src/mage/sets/torment/DeepAnalysis.java +++ b/Mage.Sets/src/mage/sets/torment/DeepAnalysis.java @@ -56,7 +56,7 @@ public class DeepAnalysis extends CardImpl { // Target player draws two cards. this.getSpellAbility().addEffect(new DrawCardTargetEffect(2)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); // Flashback-{1}{U}, Pay 3 life. CostsImpl costs = new CostsImpl(); diff --git a/Mage.Sets/src/mage/sets/torment/FranticPurification.java b/Mage.Sets/src/mage/sets/torment/FranticPurification.java index eca1354032f..06c523440b5 100644 --- a/Mage.Sets/src/mage/sets/torment/FranticPurification.java +++ b/Mage.Sets/src/mage/sets/torment/FranticPurification.java @@ -59,7 +59,7 @@ public class FranticPurification extends CardImpl { // Destroy target enchantment. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); // Madness {W} this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{W}"))); diff --git a/Mage.Sets/src/mage/sets/torment/LaquatussChampion.java b/Mage.Sets/src/mage/sets/torment/LaquatussChampion.java index c2afc3916aa..17991e121fe 100644 --- a/Mage.Sets/src/mage/sets/torment/LaquatussChampion.java +++ b/Mage.Sets/src/mage/sets/torment/LaquatussChampion.java @@ -64,7 +64,7 @@ public class LaquatussChampion extends CardImpl { // When Laquatus's Champion enters the battlefield, target player loses 6 life. Ability ability = new EntersBattlefieldTriggeredAbility(new LaquatussChampionEntersEffect(), false); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); // When Laquatus's Champion leaves the battlefield, that player gains 6 life. this.addAbility(new LeavesBattlefieldTriggeredAbility(new LaquatussChampionLeavesEffect(), false)); diff --git a/Mage.Sets/src/mage/sets/torment/MesmericFiend.java b/Mage.Sets/src/mage/sets/torment/MesmericFiend.java index a37a5eaa9a7..92bd81a0704 100644 --- a/Mage.Sets/src/mage/sets/torment/MesmericFiend.java +++ b/Mage.Sets/src/mage/sets/torment/MesmericFiend.java @@ -66,7 +66,7 @@ public class MesmericFiend extends CardImpl { // When Mesmeric Fiend enters the battlefield, target opponent reveals his or her hand and you choose a nonland card from it. Exile that card. Ability ability = new EntersBattlefieldTriggeredAbility(new MesmericFiendExileEffect(), false); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); // When Mesmeric Fiend leaves the battlefield, return the exiled card to its owner's hand. diff --git a/Mage.Sets/src/mage/sets/torment/SoulScourge.java b/Mage.Sets/src/mage/sets/torment/SoulScourge.java index 5fadd549a63..76a799b9f97 100644 --- a/Mage.Sets/src/mage/sets/torment/SoulScourge.java +++ b/Mage.Sets/src/mage/sets/torment/SoulScourge.java @@ -63,7 +63,7 @@ public class SoulScourge extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Soul Scourge enters the battlefield, target player loses 3 life. Ability ability = new EntersBattlefieldTriggeredAbility(new SoulScourgeEntersEffect(), false); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); // When Soul Scourge leaves the battlefield, that player gains 3 life. this.addAbility(new LeavesBattlefieldTriggeredAbility(new SoulScourgeLeavesEffect(), false)); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/Attrition.java b/Mage.Sets/src/mage/sets/urzasdestiny/Attrition.java index 6ec80ba856d..b2b3b80e285 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/Attrition.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/Attrition.java @@ -62,8 +62,8 @@ public class Attrition extends CardImpl { //{B}, Sacrifice a creature: Destroy target nonblack creature. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{B}")); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/BloodshotCyclops.java b/Mage.Sets/src/mage/sets/urzasdestiny/BloodshotCyclops.java index 3e354f02240..779ea3f1768 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/BloodshotCyclops.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/BloodshotCyclops.java @@ -62,7 +62,7 @@ public class BloodshotCyclops extends CardImpl { // {T}, Sacrifice a creature: Bloodshot Cyclops deals damage equal to the sacrificed // creature's power to target creature or player. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BloodshotCyclopsEffect(), new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BloodshotCyclopsEffect(), new SacrificeTargetCost(new TargetControlledCreaturePermanent())); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/Extruder.java b/Mage.Sets/src/mage/sets/urzasdestiny/Extruder.java index ab18245369e..300007b8b70 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/Extruder.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/Extruder.java @@ -66,7 +66,7 @@ public class Extruder extends CardImpl { this.addAbility(new EchoAbility("{4}")); // Sacrifice an artifact: Put a +1/+1 counter on target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new SacrificeTargetCost(new TargetControlledPermanent(filter))); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/FodderCannon.java b/Mage.Sets/src/mage/sets/urzasdestiny/FodderCannon.java index e8a26a9f8a7..7373a9b3b4f 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/FodderCannon.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/FodderCannon.java @@ -54,9 +54,9 @@ public class FodderCannon extends CardImpl { // {4}, {tap}, Sacrifice a creature: Fodder Cannon deals 4 damage to target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4), new ManaCostsImpl("{4}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/HuntingMoa.java b/Mage.Sets/src/mage/sets/urzasdestiny/HuntingMoa.java index 9e44f2a193a..b6d780bbb67 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/HuntingMoa.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/HuntingMoa.java @@ -57,7 +57,7 @@ public class HuntingMoa extends CardImpl { this.addAbility(new EchoAbility("{2}{G}")); // When Hunting Moa enters the battlefield or dies, put a +1/+1 counter on target creature. Ability enterAbility = new EntersBattlefieldOrDiesSourceTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), false); - enterAbility.addTarget(new TargetCreaturePermanent(true)); + enterAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(enterAbility); } diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/KeldonVandals.java b/Mage.Sets/src/mage/sets/urzasdestiny/KeldonVandals.java index 4cd79b9efe6..dbc702184f7 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/KeldonVandals.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/KeldonVandals.java @@ -65,7 +65,7 @@ public class KeldonVandals extends CardImpl { this.addAbility(new EchoAbility("{2}{R}")); // When Keldon Vandals enters the battlefield, destroy target artifact. Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/Masticore.java b/Mage.Sets/src/mage/sets/urzasdestiny/Masticore.java index d33bd2e65c8..c05d43eb9ad 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/Masticore.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/Masticore.java @@ -64,7 +64,7 @@ public class Masticore extends CardImpl { // {2}: Masticore deals 1 damage to target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new GenericManaCost(2)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {2}: Regenerate Masticore. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new GenericManaCost(2))); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/SigilOfSleep.java b/Mage.Sets/src/mage/sets/urzasdestiny/SigilOfSleep.java index 5e739bc3327..98f3dc1ee3e 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/SigilOfSleep.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/SigilOfSleep.java @@ -60,7 +60,7 @@ public class SigilOfSleep extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); @@ -80,7 +80,7 @@ public class SigilOfSleep extends CardImpl { if (playerId != null) { FilterCreaturePermanent filter = new FilterCreaturePermanent("creature that player controls"); filter.add(new ControllerIdPredicate(playerId)); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setRequired(true); ability.getTargets().clear(); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/Treachery.java b/Mage.Sets/src/mage/sets/urzasdestiny/Treachery.java index d08ce10ff55..dd2996d0c40 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/Treachery.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/Treachery.java @@ -58,7 +58,7 @@ public class Treachery extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/YavimayaHollow.java b/Mage.Sets/src/mage/sets/urzasdestiny/YavimayaHollow.java index 13003b55fba..4ca528ca9f7 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/YavimayaHollow.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/YavimayaHollow.java @@ -56,7 +56,7 @@ public class YavimayaHollow extends CardImpl { // {G}, {tap}: Regenerate target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{G}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/AboutFace.java b/Mage.Sets/src/mage/sets/urzaslegacy/AboutFace.java index 6d2b918806d..8ead0ddde0b 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/AboutFace.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/AboutFace.java @@ -48,7 +48,7 @@ public class AboutFace extends CardImpl { this.color.setRed(true); this.getSpellAbility().addEffect(new SwitchPowerToughnessTargetEffect(Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public AboutFace(final AboutFace card) { diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/BoneShredder.java b/Mage.Sets/src/mage/sets/urzaslegacy/BoneShredder.java index 4f5f482410e..5f3d4b85768 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/BoneShredder.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/BoneShredder.java @@ -71,7 +71,7 @@ public class BoneShredder extends CardImpl { //When Bone Shredder enters the battlefield, destroy target nonartifact, nonblack creature. Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(false)); - Target target = new TargetCreaturePermanent(filter, true); + Target target = new TargetCreaturePermanent(filter); target.setTargetName("nonartifact, nonblack creature"); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/BrinkOfMadness.java b/Mage.Sets/src/mage/sets/urzaslegacy/BrinkOfMadness.java index 31e2e315187..57cc45d3a36 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/BrinkOfMadness.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/BrinkOfMadness.java @@ -59,7 +59,7 @@ public class BrinkOfMadness extends CardImpl { // At the beginning of your upkeep, if you have no cards in hand, sacrifice Brink of Madness and target opponent discards his or her hand. TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceEffect(), TargetController.YOU, false); ability.addEffect(new BrinkOfMadnessEffect()); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); CardsInHandCondition contition = new CardsInHandCondition(CardsInHandCondition.CountType.EQUAL_TO, 0); this.addAbility(new ConditionalTriggeredAbility(ability, contition, "At the beginning of your upkeep, if you have no cards in hand, sacrifice {this} and target opponent discards his or her hand")); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/BurstOfEnergy.java b/Mage.Sets/src/mage/sets/urzaslegacy/BurstOfEnergy.java index 66b1085e075..f6991e6c53d 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/BurstOfEnergy.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/BurstOfEnergy.java @@ -48,7 +48,7 @@ public class BurstOfEnergy extends CardImpl { // Untap target permanent. this.getSpellAbility().addEffect(new UntapTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(true)); + this.getSpellAbility().addTarget(new TargetPermanent()); } public BurstOfEnergy(final BurstOfEnergy card) { diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Cessation.java b/Mage.Sets/src/mage/sets/urzaslegacy/Cessation.java index 723295c97d4..47a2c116099 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Cessation.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Cessation.java @@ -57,7 +57,7 @@ public class Cessation extends CardImpl { this.color.setWhite(true); //Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/DevoutHarpist.java b/Mage.Sets/src/mage/sets/urzaslegacy/DevoutHarpist.java index d5ff34d28c9..8ce517422db 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/DevoutHarpist.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/DevoutHarpist.java @@ -67,7 +67,7 @@ public class DevoutHarpist extends CardImpl { // {tap}: Destroy target Aura attached to a creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Erase.java b/Mage.Sets/src/mage/sets/urzaslegacy/Erase.java index 83a20af3114..0c6ed5bd25d 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Erase.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Erase.java @@ -58,7 +58,7 @@ public class Erase extends CardImpl { public void build() { // Exile target enchantment. this.getSpellAbility().addEffect(new ExileTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); } public Erase(final Erase card) { diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/GhituWarCry.java b/Mage.Sets/src/mage/sets/urzaslegacy/GhituWarCry.java index 961fa7c7acc..412d255f505 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/GhituWarCry.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/GhituWarCry.java @@ -53,7 +53,7 @@ public class GhituWarCry extends CardImpl { // {R}: Target creature gets +1/+0 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}")); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/GraniteGrip.java b/Mage.Sets/src/mage/sets/urzaslegacy/GraniteGrip.java index c1b56ef06db..0c9c0410203 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/GraniteGrip.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/GraniteGrip.java @@ -63,7 +63,7 @@ public class GraniteGrip extends CardImpl { this.color.setRed(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/IronWill.java b/Mage.Sets/src/mage/sets/urzaslegacy/IronWill.java index 309539a9614..2e54f7b04c0 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/IronWill.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/IronWill.java @@ -51,7 +51,7 @@ public class IronWill extends CardImpl { // Target creature gets +0/+4 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(0, 4, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Cycling {2} this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/KingCrab.java b/Mage.Sets/src/mage/sets/urzaslegacy/KingCrab.java index 72c67640979..4a9126ca956 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/KingCrab.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/KingCrab.java @@ -67,7 +67,7 @@ public class KingCrab extends CardImpl { // {1}{U}, {tap}: Put target green creature on top of its owner's library. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), new ManaCostsImpl("{1}{U}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/MotherOfRunes.java b/Mage.Sets/src/mage/sets/urzaslegacy/MotherOfRunes.java index 55f2307a9a8..4bb9cc9fb34 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/MotherOfRunes.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/MotherOfRunes.java @@ -61,7 +61,7 @@ public class MotherOfRunes extends CardImpl { // {tap}: Target creature you control gains protection from the color of your choice until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainProtectionFromColorTargetEffect(Duration.EndOfTurn), new TapSourceCost()); ability.addChoice(new ChoiceColor()); - ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Opportunity.java b/Mage.Sets/src/mage/sets/urzaslegacy/Opportunity.java index 6df66466695..7e7396dcc3d 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Opportunity.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Opportunity.java @@ -48,7 +48,7 @@ public class Opportunity extends CardImpl { // Target player draws four cards. this.getSpellAbility().addEffect(new DrawCardTargetEffect(4)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public Opportunity(final Opportunity card) { diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Ostracize.java b/Mage.Sets/src/mage/sets/urzaslegacy/Ostracize.java index 8825914c4e3..9066035620a 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Ostracize.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Ostracize.java @@ -48,7 +48,7 @@ public class Ostracize extends CardImpl { this.color.setBlack(true); // Target opponent reveals his or her hand. You choose a creature card from it. That player discards that card. - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(new FilterCreatureCard("a creature card"))); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Parch.java b/Mage.Sets/src/mage/sets/urzaslegacy/Parch.java index 28434e43a2f..42904654103 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Parch.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Parch.java @@ -62,7 +62,7 @@ public class Parch extends CardImpl { this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); Mode mode = new Mode(); mode.getEffects().add(new DamageTargetEffect(4)); - mode.getTargets().add(new TargetCreaturePermanent(filter, true)); + mode.getTargets().add(new TargetCreaturePermanent(filter)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianBroodlings.java b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianBroodlings.java index 96a05b30190..1d51fd44f77 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianBroodlings.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianBroodlings.java @@ -58,7 +58,7 @@ public class PhyrexianBroodlings extends CardImpl { // {1}, Sacrifice a creature: Put a +1/+1 counter on Phyrexian Broodlings. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new TapSourceCost()); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); } public PhyrexianBroodlings(final PhyrexianBroodlings card) { diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDebaser.java b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDebaser.java index ee4a6b5405c..93c440e40a4 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDebaser.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDebaser.java @@ -63,7 +63,7 @@ public class PhyrexianDebaser extends CardImpl { // {tap}, Sacrifice Phyrexian Debaser: Target creature gets -2/-2 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDefiler.java b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDefiler.java index 90ef3c25cf9..976eb072f49 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDefiler.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDefiler.java @@ -59,7 +59,7 @@ public class PhyrexianDefiler extends CardImpl { // {tap}, Sacrifice Phyrexian Defiler: Target creature gets -3/-3 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-3, -3, Duration.EndOfTurn), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDenouncer.java b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDenouncer.java index 607bfffc9cf..5a11658c4d7 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDenouncer.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDenouncer.java @@ -59,7 +59,7 @@ public class PhyrexianDenouncer extends CardImpl { // {tap}, Sacrifice Phyrexian Denouncer: Target creature gets -1/-1 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianPlaguelord.java b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianPlaguelord.java index 86652210cad..e90655b1fba 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianPlaguelord.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianPlaguelord.java @@ -63,13 +63,13 @@ public class PhyrexianPlaguelord extends CardImpl { new BoostTargetEffect(-4, -4, Duration.EndOfTurn), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Sacrifice a creature: Target creature gets -1/-1 until end of turn. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), - new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); - ability.addTarget(new TargetCreaturePermanent(true)); + new SacrificeTargetCost(new TargetControlledCreaturePermanent())); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/RadiantsJudgment.java b/Mage.Sets/src/mage/sets/urzaslegacy/RadiantsJudgment.java index ea95e126235..2ed53dd33df 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/RadiantsJudgment.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/RadiantsJudgment.java @@ -57,7 +57,7 @@ public class RadiantsJudgment extends CardImpl { // Destroy target creature with power 4 or greater. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); // Cycling {2} this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Rancor.java b/Mage.Sets/src/mage/sets/urzaslegacy/Rancor.java index cebe04649e5..ae08d0fe3fc 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Rancor.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Rancor.java @@ -56,7 +56,7 @@ public class Rancor extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Repopulate.java b/Mage.Sets/src/mage/sets/urzaslegacy/Repopulate.java index 683e15155a2..3a43f24f62a 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Repopulate.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Repopulate.java @@ -58,7 +58,7 @@ public class Repopulate extends CardImpl { this.color.setGreen(true); // Shuffle all creature cards from target player's graveyard into that player's library. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new RepopulateEffect()); // Cycling {2} this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/RingOfGix.java b/Mage.Sets/src/mage/sets/urzaslegacy/RingOfGix.java index a0bc2ce95c9..dea88f37dfc 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/RingOfGix.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/RingOfGix.java @@ -68,7 +68,7 @@ public class RingOfGix extends CardImpl { // {1}, {tap}: Tap target artifact, creature, or land. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{1}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/SilkNet.java b/Mage.Sets/src/mage/sets/urzaslegacy/SilkNet.java index 02b52c41155..1124c6a20a4 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/SilkNet.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/SilkNet.java @@ -52,7 +52,7 @@ public class SilkNet extends CardImpl { // Target creature gets +1/+1 and gains reach until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(1, 1, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(ReachAbility.getInstance(), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public SilkNet(final SilkNet card) { diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/SleepersGuile.java b/Mage.Sets/src/mage/sets/urzaslegacy/SleepersGuile.java index 33914d63086..77bf7968794 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/SleepersGuile.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/SleepersGuile.java @@ -59,7 +59,7 @@ public class SleepersGuile extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/SlowMotion.java b/Mage.Sets/src/mage/sets/urzaslegacy/SlowMotion.java index 809b21a4c08..3593a25e684 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/SlowMotion.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/SlowMotion.java @@ -63,7 +63,7 @@ public class SlowMotion extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Sluggishness.java b/Mage.Sets/src/mage/sets/urzaslegacy/Sluggishness.java index fa9279168d2..1d17c6ca012 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Sluggishness.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Sluggishness.java @@ -59,7 +59,7 @@ public class Sluggishness extends CardImpl { this.color.setRed(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Snap.java b/Mage.Sets/src/mage/sets/urzaslegacy/Snap.java index fa592d2ad9f..e076d9eb28a 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Snap.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Snap.java @@ -49,7 +49,7 @@ public class Snap extends CardImpl { // Return target creature to its owner's hand. Untap up to two lands. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new UntapLandsEffect(2)); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/WeatherseedElf.java b/Mage.Sets/src/mage/sets/urzaslegacy/WeatherseedElf.java index 484dac642fa..ab7392d5f14 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/WeatherseedElf.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/WeatherseedElf.java @@ -60,7 +60,7 @@ public class WeatherseedElf extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new ForestwalkAbility(), Duration.EndOfTurn), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/WingSnare.java b/Mage.Sets/src/mage/sets/urzaslegacy/WingSnare.java index a92b30573d8..99ab3270c48 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/WingSnare.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/WingSnare.java @@ -57,7 +57,7 @@ public class WingSnare extends CardImpl { // Destroy target creature with flying. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); } public WingSnare(final WingSnare card) { diff --git a/Mage.Sets/src/mage/sets/urzassaga/AbyssalHorror.java b/Mage.Sets/src/mage/sets/urzassaga/AbyssalHorror.java index 73121b7fd94..53c27942baf 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/AbyssalHorror.java +++ b/Mage.Sets/src/mage/sets/urzassaga/AbyssalHorror.java @@ -55,7 +55,7 @@ public class AbyssalHorror extends CardImpl { this.addAbility(FlyingAbility.getInstance()); Ability ability = new EntersBattlefieldTriggeredAbility(new DiscardTargetEffect(2)); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/BarrinMasterWizard.java b/Mage.Sets/src/mage/sets/urzassaga/BarrinMasterWizard.java index 3baca757598..8c0229a5f86 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/BarrinMasterWizard.java +++ b/Mage.Sets/src/mage/sets/urzassaga/BarrinMasterWizard.java @@ -58,8 +58,8 @@ public class BarrinMasterWizard extends CardImpl { //{2}, Sacrifice a permanent: Return target creature to its owner's hand. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{2}")); - ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(true))); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent())); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/Bravado.java b/Mage.Sets/src/mage/sets/urzassaga/Bravado.java index 8985ccc8661..06b83cedfd2 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Bravado.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Bravado.java @@ -55,7 +55,7 @@ public class Bravado extends CardImpl { this.color.setRed(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Breach.java b/Mage.Sets/src/mage/sets/urzassaga/Breach.java index cb184f2f5f8..10625e07603 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Breach.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Breach.java @@ -53,7 +53,7 @@ public class Breach extends CardImpl { // Target creature gets +2/+0 and gains fear until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(2, 0, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FearAbility.getInstance(), Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public Breach(final Breach card) { diff --git a/Mage.Sets/src/mage/sets/urzassaga/BrilliantHalo.java b/Mage.Sets/src/mage/sets/urzassaga/BrilliantHalo.java index 1f332f2504b..d44930dbaa4 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/BrilliantHalo.java +++ b/Mage.Sets/src/mage/sets/urzassaga/BrilliantHalo.java @@ -55,7 +55,7 @@ public class BrilliantHalo extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Bulwark.java b/Mage.Sets/src/mage/sets/urzassaga/Bulwark.java index 666d4915cf9..dee1a4edf0e 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Bulwark.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Bulwark.java @@ -55,7 +55,7 @@ public class Bulwark extends CardImpl { // At the beginning of your upkeep, Bulwark deals X damage to target opponent, where X is // the number of cards in your hand minus the number of cards in that player's hand. Ability ability = new BeginningOfUpkeepTriggeredAbility(new BulwarkDamageEffect(), TargetController.YOU, false); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/CarpetOfFlowers.java b/Mage.Sets/src/mage/sets/urzassaga/CarpetOfFlowers.java index b5693f60118..b6e0c1cf8e2 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/CarpetOfFlowers.java +++ b/Mage.Sets/src/mage/sets/urzassaga/CarpetOfFlowers.java @@ -82,7 +82,7 @@ class CarpetOfFlowersTriggeredAbility extends TriggeredAbilityImpl { public CarpetOfFlowersTriggeredAbility() { super(Zone.BATTLEFIELD, new CarpetOfFlowersEffect(), true); this.addChoice(new ChoiceColor()); - this.addTarget(new TargetOpponent(true)); + this.addTarget(new TargetOpponent()); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/ClawsOfGix.java b/Mage.Sets/src/mage/sets/urzassaga/ClawsOfGix.java index de8c4d66a92..448f5e9b6bb 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/ClawsOfGix.java +++ b/Mage.Sets/src/mage/sets/urzassaga/ClawsOfGix.java @@ -52,7 +52,7 @@ public class ClawsOfGix extends CardImpl { //{1}, Sacrifice a permanent: You gain 1 life. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new GenericManaCost(1)); - ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(true))); + ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/Clear.java b/Mage.Sets/src/mage/sets/urzassaga/Clear.java index bd410c808e0..f6df98c6f61 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Clear.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Clear.java @@ -56,7 +56,7 @@ public class Clear extends CardImpl { this.expansionSetCode = "USG"; this.color.setWhite(true); this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/CloakOfMists.java b/Mage.Sets/src/mage/sets/urzassaga/CloakOfMists.java index 33916d1b995..5c319d88935 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/CloakOfMists.java +++ b/Mage.Sets/src/mage/sets/urzassaga/CloakOfMists.java @@ -55,7 +55,7 @@ public class CloakOfMists extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Confiscate.java b/Mage.Sets/src/mage/sets/urzassaga/Confiscate.java index fc80cb4bf32..31776a8b428 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Confiscate.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Confiscate.java @@ -55,7 +55,7 @@ public class Confiscate extends CardImpl { this.color.setBlue(true); // Enchant permanent - TargetPermanent auraTarget = new TargetPermanent(true); + TargetPermanent auraTarget = new TargetPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Congregate.java b/Mage.Sets/src/mage/sets/urzassaga/Congregate.java index 39017687625..328b5f5c728 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Congregate.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Congregate.java @@ -50,7 +50,7 @@ public class Congregate extends CardImpl { // Target player gains 2 life for each creature on the battlefield. this.getSpellAbility().addEffect(new GainLifeTargetEffect(new PermanentsOnBattlefieldCount(new FilterCreaturePermanent(), 2))); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public Congregate(final Congregate card) { diff --git a/Mage.Sets/src/mage/sets/urzassaga/DarkHatchling.java b/Mage.Sets/src/mage/sets/urzassaga/DarkHatchling.java index aa2564f52f6..b8252fb3815 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/DarkHatchling.java +++ b/Mage.Sets/src/mage/sets/urzassaga/DarkHatchling.java @@ -67,7 +67,7 @@ public class DarkHatchling extends CardImpl { // When Dark Hatchling enters the battlefield, destroy target nonblack creature. It can't be regenerated. Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(true)); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/EasternPaladin.java b/Mage.Sets/src/mage/sets/urzassaga/EasternPaladin.java index 96ba447fe1d..5cb86ee3f74 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/EasternPaladin.java +++ b/Mage.Sets/src/mage/sets/urzassaga/EasternPaladin.java @@ -66,7 +66,7 @@ public class EasternPaladin extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{B}{B}")); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/Expunge.java b/Mage.Sets/src/mage/sets/urzassaga/Expunge.java index 1c6ddf73879..16ed868e80a 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Expunge.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Expunge.java @@ -60,7 +60,7 @@ public class Expunge extends CardImpl { this.color.setBlack(true); // Destroy target nonartifact, nonblack creature. It can't be regenerated. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); // Cycling {2} ({2}, Discard this card: Draw a card.) this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); diff --git a/Mage.Sets/src/mage/sets/urzassaga/GaeasEmbrace.java b/Mage.Sets/src/mage/sets/urzassaga/GaeasEmbrace.java index b6626472576..ce035365e87 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/GaeasEmbrace.java +++ b/Mage.Sets/src/mage/sets/urzassaga/GaeasEmbrace.java @@ -60,7 +60,7 @@ public class GaeasEmbrace extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/GoblinCadets.java b/Mage.Sets/src/mage/sets/urzassaga/GoblinCadets.java index ba565f970a0..b8b5d85b82f 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/GoblinCadets.java +++ b/Mage.Sets/src/mage/sets/urzassaga/GoblinCadets.java @@ -60,7 +60,7 @@ public class GoblinCadets extends CardImpl { // Whenever Goblin Cadets blocks or becomes blocked, target opponent gains control of it. Ability ability = new BlocksOrBecomesBlockedTriggeredAbility(new GoblinCadetsChangeControlEffect(), false); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/IntrepidHero.java b/Mage.Sets/src/mage/sets/urzassaga/IntrepidHero.java index 5b318ca6cf0..4da9e11dd7f 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/IntrepidHero.java +++ b/Mage.Sets/src/mage/sets/urzassaga/IntrepidHero.java @@ -66,7 +66,7 @@ public class IntrepidHero extends CardImpl { // {tap}: Destroy target creature with power 4 or greater. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/Pariah.java b/Mage.Sets/src/mage/sets/urzassaga/Pariah.java index dd5f73b348b..f5ac3d9fdd3 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Pariah.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Pariah.java @@ -59,7 +59,7 @@ public class Pariah extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/urzassaga/PhyrexianTower.java b/Mage.Sets/src/mage/sets/urzassaga/PhyrexianTower.java index 0b533dcade6..b01f622138a 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/PhyrexianTower.java +++ b/Mage.Sets/src/mage/sets/urzassaga/PhyrexianTower.java @@ -56,7 +56,7 @@ public class PhyrexianTower extends CardImpl { // {tap}, Sacrifice a creature: Add {B}{B} to your mana pool. Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(2), new TapSourceCost()); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/Reflexes.java b/Mage.Sets/src/mage/sets/urzassaga/Reflexes.java index 2ea633f194b..5544aa4ff71 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Reflexes.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Reflexes.java @@ -54,7 +54,7 @@ public class Reflexes extends CardImpl { this.color.setRed(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/Rescind.java b/Mage.Sets/src/mage/sets/urzassaga/Rescind.java index 0a3714e3eb6..ef4b4d0cfc0 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Rescind.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Rescind.java @@ -47,7 +47,7 @@ public class Rescind extends CardImpl { this.expansionSetCode = "USG"; this.color.setBlue(true); this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(true)); + this.getSpellAbility().addTarget(new TargetPermanent()); this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/Scrap.java b/Mage.Sets/src/mage/sets/urzassaga/Scrap.java index 0acf713e4ab..67ea827179a 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Scrap.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Scrap.java @@ -56,7 +56,7 @@ public class Scrap extends CardImpl { this.expansionSetCode = "USG"; this.color.setRed(true); this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/Sicken.java b/Mage.Sets/src/mage/sets/urzassaga/Sicken.java index ae2f730a77a..21e2407ddfd 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Sicken.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Sicken.java @@ -55,7 +55,7 @@ public class Sicken extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Neutral)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/SternProctor.java b/Mage.Sets/src/mage/sets/urzassaga/SternProctor.java index 550cc45b969..99866750baf 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/SternProctor.java +++ b/Mage.Sets/src/mage/sets/urzassaga/SternProctor.java @@ -66,7 +66,7 @@ public class SternProctor extends CardImpl { // When Stern Proctor enters the battlefield, return target artifact or enchantment to its owner's hand. Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect(), false); - TargetPermanent target = new TargetPermanent(filter, true); + TargetPermanent target = new TargetPermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/urzassaga/StrokeOfGenius.java b/Mage.Sets/src/mage/sets/urzassaga/StrokeOfGenius.java index aeab1c2602d..97ccc7be094 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/StrokeOfGenius.java +++ b/Mage.Sets/src/mage/sets/urzassaga/StrokeOfGenius.java @@ -47,7 +47,7 @@ public class StrokeOfGenius extends CardImpl { this.expansionSetCode = "USG"; this.color.setBlue(true); this.getSpellAbility().addEffect(new DrawCardTargetEffect(new ManacostVariableValue())); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public StrokeOfGenius (final StrokeOfGenius card) { diff --git a/Mage.Sets/src/mage/sets/urzassaga/Turnabout.java b/Mage.Sets/src/mage/sets/urzassaga/Turnabout.java index 78ec0bc537f..49a11973eca 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Turnabout.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Turnabout.java @@ -61,7 +61,7 @@ public class Turnabout extends CardImpl { this.color.setBlue(true); // Choose artifact, creature, or land. Tap all untapped permanents of the chosen type target player controls, or untap all tapped permanents of that type that player controls. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new TurnaboutEffect()); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/VampiricEmbrace.java b/Mage.Sets/src/mage/sets/urzassaga/VampiricEmbrace.java index 7f7d0e7f027..1f65b1b7515 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/VampiricEmbrace.java +++ b/Mage.Sets/src/mage/sets/urzassaga/VampiricEmbrace.java @@ -61,7 +61,7 @@ public class VampiricEmbrace extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/urzassaga/WesternPaladin.java b/Mage.Sets/src/mage/sets/urzassaga/WesternPaladin.java index d60fb30aedb..f53200ef7ce 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/WesternPaladin.java +++ b/Mage.Sets/src/mage/sets/urzassaga/WesternPaladin.java @@ -66,7 +66,7 @@ public class WesternPaladin extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{B}{B}")); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/ZephidsEmbrace.java b/Mage.Sets/src/mage/sets/urzassaga/ZephidsEmbrace.java index 1382b6bd634..5720bf7c617 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/ZephidsEmbrace.java +++ b/Mage.Sets/src/mage/sets/urzassaga/ZephidsEmbrace.java @@ -61,7 +61,7 @@ public class ZephidsEmbrace extends CardImpl { this.color.setBlue(true); this.subtype.add("Aura"); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/visions/Coercion.java b/Mage.Sets/src/mage/sets/visions/Coercion.java index adfea5628fb..5d1ef12e92a 100644 --- a/Mage.Sets/src/mage/sets/visions/Coercion.java +++ b/Mage.Sets/src/mage/sets/visions/Coercion.java @@ -47,7 +47,7 @@ public class Coercion extends CardImpl { this.color.setBlack(true); // Target opponent reveals his or her hand. You choose a card from it. That player discards that card. - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/visions/DarajaGriffin.java b/Mage.Sets/src/mage/sets/visions/DarajaGriffin.java index ae2b345d3dd..b61e74da054 100644 --- a/Mage.Sets/src/mage/sets/visions/DarajaGriffin.java +++ b/Mage.Sets/src/mage/sets/visions/DarajaGriffin.java @@ -68,7 +68,7 @@ public class DarajaGriffin extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Sacrifice Daraja Griffin: Destroy target black creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/visions/DragonMask.java b/Mage.Sets/src/mage/sets/visions/DragonMask.java index 219f799f33d..1b3a7d71085 100644 --- a/Mage.Sets/src/mage/sets/visions/DragonMask.java +++ b/Mage.Sets/src/mage/sets/visions/DragonMask.java @@ -57,7 +57,7 @@ public class DragonMask extends CardImpl { // {3}, {tap}: Target creature you control gets +2/+2 until end of turn. Return it to its owner's hand at the beginning of the next end step. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); Effect returnEffect = new CreateDelayedTriggeredAbilityEffect(new AtEndOfTurnDelayedTriggeredAbility(new ReturnToHandTargetEffect())); returnEffect.setText("Return it to its owner's hand at the beginning of the next end step"); ability.addEffect(returnEffect); diff --git a/Mage.Sets/src/mage/sets/visions/ManOWar.java b/Mage.Sets/src/mage/sets/visions/ManOWar.java index 1f1da15201f..d2d3c2bb607 100644 --- a/Mage.Sets/src/mage/sets/visions/ManOWar.java +++ b/Mage.Sets/src/mage/sets/visions/ManOWar.java @@ -54,7 +54,7 @@ public class ManOWar extends CardImpl { // When Man-o'-War enters the battlefield, return target creature to its owner's hand. Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/visions/Necrosavant.java b/Mage.Sets/src/mage/sets/visions/Necrosavant.java index ceca3edda33..026bcc39ba5 100644 --- a/Mage.Sets/src/mage/sets/visions/Necrosavant.java +++ b/Mage.Sets/src/mage/sets/visions/Necrosavant.java @@ -59,7 +59,7 @@ public class Necrosavant extends CardImpl { // {3}{B}{B}, Sacrifice a creature: Return Necrosavant from your graveyard to the battlefield. Activate this ability only during your upkeep. Ability ability = new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(), new ManaCostsImpl("{3}{B}{B}")); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); ability.addCost(new OnlyDuringUpkeepCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/visions/QuirionRanger.java b/Mage.Sets/src/mage/sets/visions/QuirionRanger.java index 2327c114ecf..d27e189990b 100644 --- a/Mage.Sets/src/mage/sets/visions/QuirionRanger.java +++ b/Mage.Sets/src/mage/sets/visions/QuirionRanger.java @@ -65,7 +65,7 @@ public class QuirionRanger extends CardImpl { // Return a Forest you control to its owner's hand: Untap target creature. Activate this ability only once each turn. Ability ability = new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ReturnToHandTargetCost(new TargetControlledPermanent(filter))); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/visions/ResistanceFighter.java b/Mage.Sets/src/mage/sets/visions/ResistanceFighter.java index ed9561fd9e0..42e6477a52c 100644 --- a/Mage.Sets/src/mage/sets/visions/ResistanceFighter.java +++ b/Mage.Sets/src/mage/sets/visions/ResistanceFighter.java @@ -58,7 +58,7 @@ public class ResistanceFighter extends CardImpl { // Sacrifice Resistance Fighter: Prevent all combat damage target creature would deal this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageByTargetEffect(Duration.EndOfTurn, true), new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/visions/WandOfDenial.java b/Mage.Sets/src/mage/sets/visions/WandOfDenial.java index af8a403933b..01044803616 100644 --- a/Mage.Sets/src/mage/sets/visions/WandOfDenial.java +++ b/Mage.Sets/src/mage/sets/visions/WandOfDenial.java @@ -56,7 +56,7 @@ public class WandOfDenial extends CardImpl { // {tap}: Look at the top card of target player's library. If it's a nonland card, you may pay 2 life. If you do, put it into that player's graveyard. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WandOfDenialEffect(), new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/weatherlight/Abduction.java b/Mage.Sets/src/mage/sets/weatherlight/Abduction.java index e18bbd4c4b5..8fcb792bee8 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/Abduction.java +++ b/Mage.Sets/src/mage/sets/weatherlight/Abduction.java @@ -58,7 +58,7 @@ public class Abduction extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/weatherlight/FatalBlow.java b/Mage.Sets/src/mage/sets/weatherlight/FatalBlow.java index e6d3457d072..e0182ddf483 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/FatalBlow.java +++ b/Mage.Sets/src/mage/sets/weatherlight/FatalBlow.java @@ -56,7 +56,7 @@ public class FatalBlow extends CardImpl { // Destroy target creature that was dealt damage this turn. It can't be regenerated. this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); } public FatalBlow(final FatalBlow card) { diff --git a/Mage.Sets/src/mage/sets/weatherlight/FitOfRage.java b/Mage.Sets/src/mage/sets/weatherlight/FitOfRage.java index be0297d7562..40ab76c054e 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/FitOfRage.java +++ b/Mage.Sets/src/mage/sets/weatherlight/FitOfRage.java @@ -50,7 +50,7 @@ public class FitOfRage extends CardImpl { this.color.setRed(true); // Target creature gets +3/+3 and gains first strike until end of turn. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(3, 3, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/weatherlight/JabarisBanner.java b/Mage.Sets/src/mage/sets/weatherlight/JabarisBanner.java index 9c64cbce7ea..ffec7eb9102 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/JabarisBanner.java +++ b/Mage.Sets/src/mage/sets/weatherlight/JabarisBanner.java @@ -55,7 +55,7 @@ public class JabarisBanner extends CardImpl { // {1}, {tap}: Target creature gains flanking until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(new FlankingAbility(), Duration.EndOfTurn), new ManaCostsImpl("{1}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/worldwake/AEtherTradewinds.java b/Mage.Sets/src/mage/sets/worldwake/AEtherTradewinds.java index bc86f39cf3e..ee9919c5fb4 100644 --- a/Mage.Sets/src/mage/sets/worldwake/AEtherTradewinds.java +++ b/Mage.Sets/src/mage/sets/worldwake/AEtherTradewinds.java @@ -59,8 +59,8 @@ public class AEtherTradewinds extends CardImpl { this.color.setBlue(true); // Return target permanent you control and target permanent you don't control to their owners' hands. - this.getSpellAbility().addTarget(new TargetControlledPermanent(true)); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetControlledPermanent()); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new AEtherTradewindsEffect()); } diff --git a/Mage.Sets/src/mage/sets/worldwake/AdmonitionAngel.java b/Mage.Sets/src/mage/sets/worldwake/AdmonitionAngel.java index 80c768be663..ece4530e945 100644 --- a/Mage.Sets/src/mage/sets/worldwake/AdmonitionAngel.java +++ b/Mage.Sets/src/mage/sets/worldwake/AdmonitionAngel.java @@ -74,7 +74,7 @@ public class AdmonitionAngel extends CardImpl { // Landfall - Whenever a land enters the battlefield under your control, you may exile target nonland permanent other than Admonition Angel. TriggeredAbility ability = new LandfallAbility(Zone.BATTLEFIELD, new ExileTargetForSourceEffect("Admonition Angel Exile"), true); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); // When Admonition Angel leaves the battlefield, return all cards exiled with it to the battlefield under their owners' control. diff --git a/Mage.Sets/src/mage/sets/worldwake/BazaarTrader.java b/Mage.Sets/src/mage/sets/worldwake/BazaarTrader.java index d83f8e1612c..c583628c5be 100644 --- a/Mage.Sets/src/mage/sets/worldwake/BazaarTrader.java +++ b/Mage.Sets/src/mage/sets/worldwake/BazaarTrader.java @@ -76,7 +76,7 @@ public class BazaarTrader extends CardImpl { // {tap}: Target player gains control of target artifact, creature, or land you control. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BazaarTraderEffect(), new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); ability.addTarget(new TargetControlledPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/worldwake/BloodhuskRitualist.java b/Mage.Sets/src/mage/sets/worldwake/BloodhuskRitualist.java index 8b3668647f0..00a6b030fa8 100644 --- a/Mage.Sets/src/mage/sets/worldwake/BloodhuskRitualist.java +++ b/Mage.Sets/src/mage/sets/worldwake/BloodhuskRitualist.java @@ -65,7 +65,7 @@ public class BloodhuskRitualist extends CardImpl { new EntersBattlefieldTriggeredAbility(new DiscardTargetEffect(new MultikickerCount())), KickedCondition.getInstance(), ""); - ability.addTarget(new TargetOpponent(true)); + ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/worldwake/BojukaBog.java b/Mage.Sets/src/mage/sets/worldwake/BojukaBog.java index f4d47cc18cc..a143853484b 100644 --- a/Mage.Sets/src/mage/sets/worldwake/BojukaBog.java +++ b/Mage.Sets/src/mage/sets/worldwake/BojukaBog.java @@ -51,7 +51,7 @@ public class BojukaBog extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); // When Bojuka Bog enters the battlefield, exile all cards from target player's graveyard. EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new ExileGraveyardAllTargetPlayerEffect()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); // {T}: Add {B} to your mana pool. this.addAbility(new BlackManaAbility()); diff --git a/Mage.Sets/src/mage/sets/worldwake/BrinkOfDisaster.java b/Mage.Sets/src/mage/sets/worldwake/BrinkOfDisaster.java index 89d7c5439c8..52796725118 100644 --- a/Mage.Sets/src/mage/sets/worldwake/BrinkOfDisaster.java +++ b/Mage.Sets/src/mage/sets/worldwake/BrinkOfDisaster.java @@ -69,7 +69,7 @@ public class BrinkOfDisaster extends CardImpl { this.color.setBlack(true); // Enchant creature or land - TargetPermanent auraTarget = new TargetPermanent(true); + TargetPermanent auraTarget = new TargetPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); diff --git a/Mage.Sets/src/mage/sets/worldwake/BullRush.java b/Mage.Sets/src/mage/sets/worldwake/BullRush.java index 9c795ba98b9..8dd1e2b49be 100644 --- a/Mage.Sets/src/mage/sets/worldwake/BullRush.java +++ b/Mage.Sets/src/mage/sets/worldwake/BullRush.java @@ -47,7 +47,7 @@ public class BullRush extends CardImpl { this.expansionSetCode = "WWK"; this.color.setRed(true); this.getSpellAbility().addEffect(new BoostTargetEffect(2, 0, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public BullRush (final BullRush card) { diff --git a/Mage.Sets/src/mage/sets/worldwake/CanopyCover.java b/Mage.Sets/src/mage/sets/worldwake/CanopyCover.java index a7b26bab2c4..f05548e03c6 100644 --- a/Mage.Sets/src/mage/sets/worldwake/CanopyCover.java +++ b/Mage.Sets/src/mage/sets/worldwake/CanopyCover.java @@ -64,7 +64,7 @@ public class CanopyCover extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/worldwake/CausticCrawler.java b/Mage.Sets/src/mage/sets/worldwake/CausticCrawler.java index 27d0056f73d..daf311a496a 100644 --- a/Mage.Sets/src/mage/sets/worldwake/CausticCrawler.java +++ b/Mage.Sets/src/mage/sets/worldwake/CausticCrawler.java @@ -53,7 +53,7 @@ public class CausticCrawler extends CardImpl { this.toughness = new MageInt(3); LandfallAbility ability = new LandfallAbility(new BoostTargetEffect(-1, -1, Duration.EndOfTurn), true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/worldwake/ClawsOfValakut.java b/Mage.Sets/src/mage/sets/worldwake/ClawsOfValakut.java index 55b55dfc55b..7e4e31955a5 100644 --- a/Mage.Sets/src/mage/sets/worldwake/ClawsOfValakut.java +++ b/Mage.Sets/src/mage/sets/worldwake/ClawsOfValakut.java @@ -70,7 +70,7 @@ public class ClawsOfValakut extends CardImpl { this.subtype.add("Aura"); this.color.setRed(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/worldwake/CosisRavager.java b/Mage.Sets/src/mage/sets/worldwake/CosisRavager.java index 2ec8d1c7cd5..b0ba1f4c694 100644 --- a/Mage.Sets/src/mage/sets/worldwake/CosisRavager.java +++ b/Mage.Sets/src/mage/sets/worldwake/CosisRavager.java @@ -52,7 +52,7 @@ public class CosisRavager extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); Ability ability = new LandfallAbility(new DamageTargetEffect(1), false); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/worldwake/DeadReckoning.java b/Mage.Sets/src/mage/sets/worldwake/DeadReckoning.java index 2363e624f5e..309759e2acf 100644 --- a/Mage.Sets/src/mage/sets/worldwake/DeadReckoning.java +++ b/Mage.Sets/src/mage/sets/worldwake/DeadReckoning.java @@ -91,7 +91,7 @@ class DeadReckoningEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player you = game.getPlayer(source.getControllerId()); TargetCardInYourGraveyard target1 = new TargetCardInYourGraveyard(new FilterCreatureCard("creature card in your graveyard")); - TargetCreaturePermanent target2 = new TargetCreaturePermanent(true); + TargetCreaturePermanent target2 = new TargetCreaturePermanent(); if (you != null) { if (target1.canChoose(source.getControllerId(), game) diff --git a/Mage.Sets/src/mage/sets/worldwake/DeathforgeShaman.java b/Mage.Sets/src/mage/sets/worldwake/DeathforgeShaman.java index 7f4099e38a1..0cd93aee4c2 100644 --- a/Mage.Sets/src/mage/sets/worldwake/DeathforgeShaman.java +++ b/Mage.Sets/src/mage/sets/worldwake/DeathforgeShaman.java @@ -64,7 +64,7 @@ public class DeathforgeShaman extends CardImpl { // When Deathforge Shaman enters the battlefield, it deals damage to target player equal to twice the number of times it was kicked. Ability ability = new EntersBattlefieldTriggeredAbility(new DeathforgeShamanEffect()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/worldwake/FeralContest.java b/Mage.Sets/src/mage/sets/worldwake/FeralContest.java index 478fa85b44f..c6a4fd8493d 100644 --- a/Mage.Sets/src/mage/sets/worldwake/FeralContest.java +++ b/Mage.Sets/src/mage/sets/worldwake/FeralContest.java @@ -57,10 +57,10 @@ public class FeralContest extends CardImpl { // Put a +1/+1 counter on target creature you control. this.getSpellAbility().addEffect(new AddCountersTargetEffect(CounterType.P1P1.createInstance())); - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); // Another target creature blocks it this turn if able. this.getSpellAbility().addEffect(new FeralContestEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public FeralContest(final FeralContest card) { diff --git a/Mage.Sets/src/mage/sets/worldwake/GrotagThrasher.java b/Mage.Sets/src/mage/sets/worldwake/GrotagThrasher.java index 2ffc47c52b3..710503a8df6 100644 --- a/Mage.Sets/src/mage/sets/worldwake/GrotagThrasher.java +++ b/Mage.Sets/src/mage/sets/worldwake/GrotagThrasher.java @@ -55,7 +55,7 @@ public class GrotagThrasher extends CardImpl { // Whenever Grotag Thrasher attacks, target creature can't block this turn. AttacksTriggeredAbility ability = new AttacksTriggeredAbility(new CantBlockTargetEffect(Duration.EndOfTurn), false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/worldwake/Groundswell.java b/Mage.Sets/src/mage/sets/worldwake/Groundswell.java index ad744c1ae20..4e1f387359c 100644 --- a/Mage.Sets/src/mage/sets/worldwake/Groundswell.java +++ b/Mage.Sets/src/mage/sets/worldwake/Groundswell.java @@ -56,7 +56,7 @@ public class Groundswell extends CardImpl { this.expansionSetCode = "WWK"; this.color.setGreen(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new GroundswellEffect(Duration.EndOfTurn)); this.addWatcher(new LandfallWatcher()); diff --git a/Mage.Sets/src/mage/sets/worldwake/HalimarExcavator.java b/Mage.Sets/src/mage/sets/worldwake/HalimarExcavator.java index 65d41f1a281..5e378f28dac 100644 --- a/Mage.Sets/src/mage/sets/worldwake/HalimarExcavator.java +++ b/Mage.Sets/src/mage/sets/worldwake/HalimarExcavator.java @@ -67,7 +67,7 @@ public class HalimarExcavator extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(3); Ability ability = new AllyEntersBattlefieldTriggeredAbility(new PutLibraryIntoGraveTargetEffect(new PermanentsOnBattlefieldCount(filter)), false); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/worldwake/HammerOfRuin.java b/Mage.Sets/src/mage/sets/worldwake/HammerOfRuin.java index d41be663017..f5d846b43f8 100644 --- a/Mage.Sets/src/mage/sets/worldwake/HammerOfRuin.java +++ b/Mage.Sets/src/mage/sets/worldwake/HammerOfRuin.java @@ -107,7 +107,7 @@ class HammerOfRuinTriggeredAbility extends TriggeredAbilityImpl { filter.setMessage("creature controlled by " + game.getPlayer(event.getTargetId()).getName()); this.getTargets().clear(); - this.addTarget(new TargetPermanent(filter, true)); + this.addTarget(new TargetPermanent(filter)); return true; } } diff --git a/Mage.Sets/src/mage/sets/worldwake/IonasJudgment.java b/Mage.Sets/src/mage/sets/worldwake/IonasJudgment.java index 7cd28a81e5e..faaf1804c39 100644 --- a/Mage.Sets/src/mage/sets/worldwake/IonasJudgment.java +++ b/Mage.Sets/src/mage/sets/worldwake/IonasJudgment.java @@ -56,7 +56,7 @@ public class IonasJudgment extends CardImpl { this.expansionSetCode = "WWK"; this.color.setWhite(true); this.getSpellAbility().addEffect(new ExileTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); } diff --git a/Mage.Sets/src/mage/sets/worldwake/JaceTheMindSculptor.java b/Mage.Sets/src/mage/sets/worldwake/JaceTheMindSculptor.java index 65b8552a6c9..68e6e9fa089 100644 --- a/Mage.Sets/src/mage/sets/worldwake/JaceTheMindSculptor.java +++ b/Mage.Sets/src/mage/sets/worldwake/JaceTheMindSculptor.java @@ -66,18 +66,18 @@ public class JaceTheMindSculptor extends CardImpl { LoyaltyAbility ability1 = new LoyaltyAbility(new JaceTheMindSculptorEffect1(), 2); - ability1.addTarget(new TargetPlayer(true)); + ability1.addTarget(new TargetPlayer()); this.addAbility(ability1); LoyaltyAbility ability2 = new LoyaltyAbility(new JaceTheMindSculptorEffect2(), 0); this.addAbility(ability2); LoyaltyAbility ability3 = new LoyaltyAbility(new ReturnToHandTargetEffect(), -1); - ability3.addTarget(new TargetCreaturePermanent(true)); + ability3.addTarget(new TargetCreaturePermanent()); this.addAbility(ability3); LoyaltyAbility ability4 = new LoyaltyAbility(new JaceTheMindSculptorEffect3(), -12); - ability4.addTarget(new TargetPlayer(true)); + ability4.addTarget(new TargetPlayer()); this.addAbility(ability4); } diff --git a/Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java b/Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java index 89d283733a1..a0690be87c4 100644 --- a/Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java +++ b/Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java @@ -78,7 +78,7 @@ class KalastriaHighbornTriggeredAbility extends TriggeredAbilityImpl { KalastriaHighbornTriggeredAbility ( ) { super(Zone.ALL, new LoseLifeTargetEffect(2), false); this.addCost(new ManaCostsImpl("{B}")); - this.addTarget(new TargetPlayer(true)); + this.addTarget(new TargetPlayer()); this.getEffects().add(new GainLifeEffect(2)); } diff --git a/Mage.Sets/src/mage/sets/worldwake/MiresToll.java b/Mage.Sets/src/mage/sets/worldwake/MiresToll.java index 789788ec1ed..01f2dd2e006 100644 --- a/Mage.Sets/src/mage/sets/worldwake/MiresToll.java +++ b/Mage.Sets/src/mage/sets/worldwake/MiresToll.java @@ -59,7 +59,7 @@ public class MiresToll extends CardImpl { this.color.setBlack(true); // Target player reveals a number of cards from his or her hand equal to the number of Swamps you control. You choose one of them. That player discards that card. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(TargetController.ANY, new PermanentsOnBattlefieldCount(filter))); } diff --git a/Mage.Sets/src/mage/sets/worldwake/MordantDragon.java b/Mage.Sets/src/mage/sets/worldwake/MordantDragon.java index 4488104df4a..c857cfd12e0 100644 --- a/Mage.Sets/src/mage/sets/worldwake/MordantDragon.java +++ b/Mage.Sets/src/mage/sets/worldwake/MordantDragon.java @@ -99,7 +99,7 @@ class MordantDragonEffect extends OneShotEffect { if (amount > 0) { FilterCreaturePermanent filter = new FilterCreaturePermanent("creature " + player.getName() + " controls"); filter.add(new ControllerIdPredicate(player.getId())); - TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true); + TargetCreaturePermanent target = new TargetCreaturePermanent(filter); if (target.canChoose(source.getControllerId(), game) && target.choose(Outcome.Damage, source.getControllerId(), source.getId(), game)) { UUID creature = target.getFirstTarget(); if (creature != null) { diff --git a/Mage.Sets/src/mage/sets/worldwake/NaturesClaim.java b/Mage.Sets/src/mage/sets/worldwake/NaturesClaim.java index 16502e76818..90eb54b9007 100644 --- a/Mage.Sets/src/mage/sets/worldwake/NaturesClaim.java +++ b/Mage.Sets/src/mage/sets/worldwake/NaturesClaim.java @@ -65,7 +65,7 @@ public class NaturesClaim extends CardImpl { this.color.setGreen(true); this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new NaturesClaimEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); } public NaturesClaim (final NaturesClaim card) { diff --git a/Mage.Sets/src/mage/sets/worldwake/RestForTheWeary.java b/Mage.Sets/src/mage/sets/worldwake/RestForTheWeary.java index e685f833760..3bc9a48a1c4 100644 --- a/Mage.Sets/src/mage/sets/worldwake/RestForTheWeary.java +++ b/Mage.Sets/src/mage/sets/worldwake/RestForTheWeary.java @@ -53,7 +53,7 @@ public class RestForTheWeary extends CardImpl { // Landfall - If you had a land enter the battlefield under your control this turn, that player gains 8 life instead. this.addWatcher(new LandfallWatcher()); this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new GainLifeTargetEffect(8), new GainLifeTargetEffect(4), LandfallCondition.getInstance(), "Target player gains 4 life. Landfall - If you had a land enter the battlefield under your control this turn, that player gains 8 life instead")); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public RestForTheWeary(final RestForTheWeary card) { diff --git a/Mage.Sets/src/mage/sets/worldwake/ScribNibblers.java b/Mage.Sets/src/mage/sets/worldwake/ScribNibblers.java index 4beb9f3ce2c..71deb979b39 100644 --- a/Mage.Sets/src/mage/sets/worldwake/ScribNibblers.java +++ b/Mage.Sets/src/mage/sets/worldwake/ScribNibblers.java @@ -63,7 +63,7 @@ public class ScribNibblers extends CardImpl { // {tap}: Exile the top card of target player's library. If it's a land card, you gain 1 life. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScribNibblersEffect(), new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); // Landfall - Whenever a land enters the battlefield under your control, you may untap Scrib Nibblers. diff --git a/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java b/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java index 3faed42f34b..5bea9198425 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java +++ b/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java @@ -62,7 +62,7 @@ public class SearingBlaze extends CardImpl { // Searing Blaze deals 1 damage to target player and 1 damage to target creature that player controls. // Landfall - If you had a land enter the battlefield under your control this turn, Searing Blaze deals 3 damage to that player and 3 damage to that creature instead. - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addTarget(new SearingBlazeTarget()); this.getSpellAbility().addEffect(new SearingBlazeEffect()); this.addWatcher(new LandfallWatcher()); diff --git a/Mage.Sets/src/mage/sets/worldwake/SejiriSteppe.java b/Mage.Sets/src/mage/sets/worldwake/SejiriSteppe.java index e57c386f1e2..1d2b52d6f60 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SejiriSteppe.java +++ b/Mage.Sets/src/mage/sets/worldwake/SejiriSteppe.java @@ -51,7 +51,7 @@ public class SejiriSteppe extends CardImpl { this.expansionSetCode = "WWK"; this.addAbility(new EntersBattlefieldTappedAbility()); EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new GainProtectionFromColorTargetEffect(Duration.EndOfTurn), false); - ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); ability.addChoice(new ChoiceColor()); this.addAbility(ability); this.addAbility(new WhiteManaAbility()); diff --git a/Mage.Sets/src/mage/sets/worldwake/SmolderingSpires.java b/Mage.Sets/src/mage/sets/worldwake/SmolderingSpires.java index 47d20219496..24ca9ef6877 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SmolderingSpires.java +++ b/Mage.Sets/src/mage/sets/worldwake/SmolderingSpires.java @@ -52,7 +52,7 @@ public class SmolderingSpires extends CardImpl { this.addAbility(new RedManaAbility()); // When Smoldering Spires enters the battlefield, target creature can't block this turn. EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new CantBlockTargetEffect(Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/worldwake/Smother.java b/Mage.Sets/src/mage/sets/worldwake/Smother.java index f4f3d15727b..0050b199de7 100644 --- a/Mage.Sets/src/mage/sets/worldwake/Smother.java +++ b/Mage.Sets/src/mage/sets/worldwake/Smother.java @@ -55,7 +55,7 @@ public class Smother extends CardImpl { this.color.setBlack(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); } diff --git a/Mage.Sets/src/mage/sets/worldwake/SurrakarBanisher.java b/Mage.Sets/src/mage/sets/worldwake/SurrakarBanisher.java index bad9ee75b1b..1b997d8135d 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SurrakarBanisher.java +++ b/Mage.Sets/src/mage/sets/worldwake/SurrakarBanisher.java @@ -61,7 +61,7 @@ public class SurrakarBanisher extends CardImpl { this.toughness = new MageInt(3); Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect(), true); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/worldwake/TideforceElemental.java b/Mage.Sets/src/mage/sets/worldwake/TideforceElemental.java index e51ac938423..279d8aef2a2 100644 --- a/Mage.Sets/src/mage/sets/worldwake/TideforceElemental.java +++ b/Mage.Sets/src/mage/sets/worldwake/TideforceElemental.java @@ -73,7 +73,7 @@ public class TideforceElemental extends CardImpl { new MayTapOrUntapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.U)); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); // Landfall - Whenever a land enters the battlefield under your control, you may untap Tideforce Elemental. this.addAbility(new LandfallAbility(new UntapSourceEffect(), true)); diff --git a/Mage.Sets/src/mage/sets/worldwake/TombHex.java b/Mage.Sets/src/mage/sets/worldwake/TombHex.java index 2fa35a77276..cea357df5cd 100644 --- a/Mage.Sets/src/mage/sets/worldwake/TombHex.java +++ b/Mage.Sets/src/mage/sets/worldwake/TombHex.java @@ -55,7 +55,7 @@ public class TombHex extends CardImpl { // Landfall - If you had a land enter the battlefield under your control this turn, that creature gets -4/-4 until end of turn instead. this.addWatcher(new LandfallWatcher()); this.getSpellAbility().addEffect(new ConditionalContinousEffect(new BoostTargetEffect(-4, -4, Duration.EndOfTurn), new BoostTargetEffect(-2, -2, Duration.EndOfTurn), LandfallCondition.getInstance(), "Target creature gets -2/-2 until end of turn. Landfall - If you had a land enter the battlefield under your control this turn, that creature gets -4/-4 until end of turn instead", true)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public TombHex(final TombHex card) { diff --git a/Mage.Sets/src/mage/sets/worldwake/Twitch.java b/Mage.Sets/src/mage/sets/worldwake/Twitch.java index 1428c60c202..6a1ef5cf4ea 100644 --- a/Mage.Sets/src/mage/sets/worldwake/Twitch.java +++ b/Mage.Sets/src/mage/sets/worldwake/Twitch.java @@ -62,7 +62,7 @@ public class Twitch extends CardImpl { // You may tap or untap target artifact, creature, or land. // Draw a card. this.getSpellAbility().addEffect(new MayTapOrUntapTargetEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/worldwake/UrgeToFeed.java b/Mage.Sets/src/mage/sets/worldwake/UrgeToFeed.java index 6e89e16b3a8..0bb098da55e 100644 --- a/Mage.Sets/src/mage/sets/worldwake/UrgeToFeed.java +++ b/Mage.Sets/src/mage/sets/worldwake/UrgeToFeed.java @@ -63,7 +63,7 @@ public class UrgeToFeed extends CardImpl { // Target creature gets -3/-3 until end of turn. You may tap any number of untapped Vampire creatures you control. If you do, put a +1/+1 counter on each of those Vampires. this.getSpellAbility().addEffect(new BoostTargetEffect(-3, -3, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new UrgeToFeedEffect()); } @@ -98,7 +98,7 @@ class UrgeToFeedEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true); + TargetCreaturePermanent target = new TargetCreaturePermanent(filter); while (true) { target.clearChosen(); if (target.canChoose(source.getControllerId(), game) && target.choose(Outcome.Tap, source.getControllerId(), source.getId(), game)) { diff --git a/Mage.Sets/src/mage/sets/worldwake/VaporSnare.java b/Mage.Sets/src/mage/sets/worldwake/VaporSnare.java index f4a9d226b14..f7b9905cbe8 100644 --- a/Mage.Sets/src/mage/sets/worldwake/VaporSnare.java +++ b/Mage.Sets/src/mage/sets/worldwake/VaporSnare.java @@ -60,7 +60,7 @@ public class VaporSnare extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/worldwake/VeteransReflexes.java b/Mage.Sets/src/mage/sets/worldwake/VeteransReflexes.java index e52be68231a..60cb7aefa06 100644 --- a/Mage.Sets/src/mage/sets/worldwake/VeteransReflexes.java +++ b/Mage.Sets/src/mage/sets/worldwake/VeteransReflexes.java @@ -49,7 +49,7 @@ public class VeteransReflexes extends CardImpl { this.color.setWhite(true); this.getSpellAbility().addEffect(new BoostTargetEffect(1, 1, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new UntapTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public VeteransReflexes (final VeteransReflexes card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/AdventuringGear.java b/Mage.Sets/src/mage/sets/zendikar/AdventuringGear.java index 8a7bf1cf982..88447a01d5a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/AdventuringGear.java +++ b/Mage.Sets/src/mage/sets/zendikar/AdventuringGear.java @@ -73,7 +73,7 @@ class AdventuringGearAbility extends LandfallAbility { public AdventuringGearAbility() { super(null, false); this.addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); - this.addTarget(new TargetCreaturePermanent(true)); + this.addTarget(new TargetCreaturePermanent()); } public AdventuringGearAbility(final AdventuringGearAbility ability) { diff --git a/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java b/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java index 97567662cf0..8828fc67718 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java @@ -56,7 +56,7 @@ public class ArchiveTrap extends CardImpl { this.subtype.add("Trap"); this.color.setBlue(true); - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(13)); this.getSpellAbility().addAlternativeCost(new ArchiveTrapAlternativeCost()); this.addWatcher(new ArchiveTrapWatcher()); diff --git a/Mage.Sets/src/mage/sets/zendikar/BalaGedThief.java b/Mage.Sets/src/mage/sets/zendikar/BalaGedThief.java index 10e864476a1..28ab242ab3a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BalaGedThief.java +++ b/Mage.Sets/src/mage/sets/zendikar/BalaGedThief.java @@ -77,7 +77,7 @@ public class BalaGedThief extends CardImpl { // Whenever Bala Ged Thief or another Ally enters the battlefield under your control, target player reveals a number of cards from his or her hand equal to the number of Allies you control. You choose one of them. That player discards that card. Ability ability = new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new BalaGedThiefEffect(), filter, false); - TargetPlayer target = new TargetPlayer(true); + TargetPlayer target = new TargetPlayer(); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/zendikar/BloodTribute.java b/Mage.Sets/src/mage/sets/zendikar/BloodTribute.java index 11197f14a60..b62db9aee3a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/BloodTribute.java +++ b/Mage.Sets/src/mage/sets/zendikar/BloodTribute.java @@ -74,7 +74,7 @@ public class BloodTribute extends CardImpl { this.addAbility(new KickerAbility(cost)); // Target opponent loses half his or her life, rounded up. - this.getSpellAbility().addTarget(new TargetOpponent(true)); + this.getSpellAbility().addTarget(new TargetOpponent()); this.getSpellAbility().addEffect(new BloodTributeLoseLifeEffect()); // If Blood Tribute was kicked, you gain life equal to the life lost this way. diff --git a/Mage.Sets/src/mage/sets/zendikar/CallerOfGales.java b/Mage.Sets/src/mage/sets/zendikar/CallerOfGales.java index f7d39d12462..52297772f1f 100644 --- a/Mage.Sets/src/mage/sets/zendikar/CallerOfGales.java +++ b/Mage.Sets/src/mage/sets/zendikar/CallerOfGales.java @@ -60,7 +60,7 @@ public class CallerOfGales extends CardImpl { this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{U}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/CarnageAltar.java b/Mage.Sets/src/mage/sets/zendikar/CarnageAltar.java index 18e4deabdde..b08ac5a0f8c 100644 --- a/Mage.Sets/src/mage/sets/zendikar/CarnageAltar.java +++ b/Mage.Sets/src/mage/sets/zendikar/CarnageAltar.java @@ -49,7 +49,7 @@ public class CarnageAltar extends CardImpl { this.expansionSetCode = "ZEN"; SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(3)); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/CelestialMantle.java b/Mage.Sets/src/mage/sets/zendikar/CelestialMantle.java index 3afb33aebe9..39ce256a430 100644 --- a/Mage.Sets/src/mage/sets/zendikar/CelestialMantle.java +++ b/Mage.Sets/src/mage/sets/zendikar/CelestialMantle.java @@ -60,7 +60,7 @@ public class CelestialMantle extends CardImpl { this.subtype.add("Aura"); this.color.setWhite(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/zendikar/Disfigure.java b/Mage.Sets/src/mage/sets/zendikar/Disfigure.java index 5b77928e47d..853a7942357 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Disfigure.java +++ b/Mage.Sets/src/mage/sets/zendikar/Disfigure.java @@ -47,7 +47,7 @@ public class Disfigure extends CardImpl { this.color.setBlack(true); this.getSpellAbility().addEffect(new BoostTargetEffect(-2, -2, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public Disfigure(final Disfigure card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/EldraziMonument.java b/Mage.Sets/src/mage/sets/zendikar/EldraziMonument.java index 2f04af59150..fd9bfa46d93 100644 --- a/Mage.Sets/src/mage/sets/zendikar/EldraziMonument.java +++ b/Mage.Sets/src/mage/sets/zendikar/EldraziMonument.java @@ -103,7 +103,7 @@ class EldraziMonumentEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - TargetControlledPermanent target = new TargetControlledCreaturePermanent(true); + TargetControlledPermanent target = new TargetControlledCreaturePermanent(); target.setRequired(true); Player player = game.getPlayer(source.getControllerId()); if (target.canChoose(source.getControllerId(), game)) { diff --git a/Mage.Sets/src/mage/sets/zendikar/Electropotence.java b/Mage.Sets/src/mage/sets/zendikar/Electropotence.java index ad1f357b713..28526792817 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Electropotence.java +++ b/Mage.Sets/src/mage/sets/zendikar/Electropotence.java @@ -58,7 +58,7 @@ public class Electropotence extends CardImpl { // Whenever a creature enters the battlefield under your control, you may pay {2}{R}. If you do, that creature deals damage equal to its power to target creature or player. Ability ability = new ElectropotenceTriggeredAbility(); - ability.addTarget(new TargetCreatureOrPlayer(true)); + ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/FeastOfBlood.java b/Mage.Sets/src/mage/sets/zendikar/FeastOfBlood.java index 0e9d536722b..7e21bf4629f 100644 --- a/Mage.Sets/src/mage/sets/zendikar/FeastOfBlood.java +++ b/Mage.Sets/src/mage/sets/zendikar/FeastOfBlood.java @@ -55,7 +55,7 @@ public class FeastOfBlood extends CardImpl { // Cast Feast of Blood only if you control two or more Vampires. this.getSpellAbility().addCost(new FeastOfBloodCost()); // Destroy target creature. You gain 4 life. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new GainLifeEffect(4)); } diff --git a/Mage.Sets/src/mage/sets/zendikar/GatekeeperOfMalakir.java b/Mage.Sets/src/mage/sets/zendikar/GatekeeperOfMalakir.java index d6bf2053996..5d8c50d6e14 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GatekeeperOfMalakir.java +++ b/Mage.Sets/src/mage/sets/zendikar/GatekeeperOfMalakir.java @@ -72,7 +72,7 @@ public class GatekeeperOfMalakir extends CardImpl { EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new SacrificeEffect(filter, 1, "target player")); Ability conditionalAbility = new ConditionalTriggeredAbility(ability, KickedCondition.getInstance(), "When {this} enters the battlefield, if it was kicked, target player sacrifices a creature."); - conditionalAbility.addTarget(new TargetPlayer(true)); + conditionalAbility.addTarget(new TargetPlayer()); this.addAbility(conditionalAbility); } diff --git a/Mage.Sets/src/mage/sets/zendikar/Gigantiform.java b/Mage.Sets/src/mage/sets/zendikar/Gigantiform.java index 5a221088fc7..2fc26068f3b 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Gigantiform.java +++ b/Mage.Sets/src/mage/sets/zendikar/Gigantiform.java @@ -74,7 +74,7 @@ public class Gigantiform extends CardImpl { this.addAbility(new KickerAbility("{4}")); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/zendikar/GoblinShortcutter.java b/Mage.Sets/src/mage/sets/zendikar/GoblinShortcutter.java index dab43b5e98e..a01364ddd24 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GoblinShortcutter.java +++ b/Mage.Sets/src/mage/sets/zendikar/GoblinShortcutter.java @@ -56,7 +56,7 @@ public class GoblinShortcutter extends CardImpl { // When Goblin Shortcutter enters the battlefield, target creature can't block this turn. Ability ability = new EntersBattlefieldTriggeredAbility(new CantBlockTargetEffect(Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/GoblinWarPaint.java b/Mage.Sets/src/mage/sets/zendikar/GoblinWarPaint.java index 76719f35276..2fcd9e72e96 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GoblinWarPaint.java +++ b/Mage.Sets/src/mage/sets/zendikar/GoblinWarPaint.java @@ -61,7 +61,7 @@ public class GoblinWarPaint extends CardImpl { this.color.setRed(true); - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/zendikar/GrapplingHook.java b/Mage.Sets/src/mage/sets/zendikar/GrapplingHook.java index ec2b267506e..21373847ab2 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GrapplingHook.java +++ b/Mage.Sets/src/mage/sets/zendikar/GrapplingHook.java @@ -62,7 +62,7 @@ public class GrapplingHook extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DoubleStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); // Whenever equipped creature attacks, you may have target creature block it this turn if able. Ability ability = new AttacksAttachedTriggeredAbility(new GrapplingHookEffect(), true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Equip {4} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(4))); diff --git a/Mage.Sets/src/mage/sets/zendikar/HagraDiabolist.java b/Mage.Sets/src/mage/sets/zendikar/HagraDiabolist.java index 5fa8e0e6f98..5c4ac47398f 100644 --- a/Mage.Sets/src/mage/sets/zendikar/HagraDiabolist.java +++ b/Mage.Sets/src/mage/sets/zendikar/HagraDiabolist.java @@ -68,7 +68,7 @@ public class HagraDiabolist extends CardImpl { this.toughness = new MageInt(2); Ability ability = new AllyEntersBattlefieldTriggeredAbility(new LoseLifeTargetEffect(new PermanentsOnBattlefieldCount(filter)), true); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/HaloHunter.java b/Mage.Sets/src/mage/sets/zendikar/HaloHunter.java index 474041a4e15..d6be086a32c 100644 --- a/Mage.Sets/src/mage/sets/zendikar/HaloHunter.java +++ b/Mage.Sets/src/mage/sets/zendikar/HaloHunter.java @@ -63,7 +63,7 @@ public class HaloHunter extends CardImpl { this.addAbility(IntimidateAbility.getInstance()); Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/HeartstabberMosquito.java b/Mage.Sets/src/mage/sets/zendikar/HeartstabberMosquito.java index a0af51df154..9fb5972e815 100644 --- a/Mage.Sets/src/mage/sets/zendikar/HeartstabberMosquito.java +++ b/Mage.Sets/src/mage/sets/zendikar/HeartstabberMosquito.java @@ -64,7 +64,7 @@ public class HeartstabberMosquito extends CardImpl { // When Heartstabber Mosquito enters the battlefield, if it was kicked, destroy target creature. EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(new ConditionalTriggeredAbility(ability, KickedCondition.getInstance(), "When {this} enters the battlefield, if it was kicked, destroy target creature.")); } diff --git a/Mage.Sets/src/mage/sets/zendikar/HedronCrab.java b/Mage.Sets/src/mage/sets/zendikar/HedronCrab.java index d2133a49c39..7c5021ed16b 100644 --- a/Mage.Sets/src/mage/sets/zendikar/HedronCrab.java +++ b/Mage.Sets/src/mage/sets/zendikar/HedronCrab.java @@ -52,7 +52,7 @@ public class HedronCrab extends CardImpl { this.toughness = new MageInt(2); // Landfall - Whenever a land enters the battlefield under your control, target player puts the top three cards of his or her library into his or her graveyard. LandfallAbility ability = new LandfallAbility(new PutLibraryIntoGraveTargetEffect(3), false); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/HideousEnd.java b/Mage.Sets/src/mage/sets/zendikar/HideousEnd.java index 4d36bf36ca2..69f61d2e237 100644 --- a/Mage.Sets/src/mage/sets/zendikar/HideousEnd.java +++ b/Mage.Sets/src/mage/sets/zendikar/HideousEnd.java @@ -58,7 +58,7 @@ public class HideousEnd extends CardImpl { this.color.setBlack(true); // Destroy target nonblack creature. Its controller loses 2 life. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new LoseLifeTargetControllerEffect(2)); } diff --git a/Mage.Sets/src/mage/sets/zendikar/InfernoTrap.java b/Mage.Sets/src/mage/sets/zendikar/InfernoTrap.java index bba456eebe9..e494a9f9c52 100644 --- a/Mage.Sets/src/mage/sets/zendikar/InfernoTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/InfernoTrap.java @@ -62,7 +62,7 @@ public class InfernoTrap extends CardImpl { // Inferno Trap deals 4 damage to target creature. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public InfernoTrap(final InfernoTrap card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/JourneyToNowhere.java b/Mage.Sets/src/mage/sets/zendikar/JourneyToNowhere.java index 4083ad3d628..35cac52f6ec 100644 --- a/Mage.Sets/src/mage/sets/zendikar/JourneyToNowhere.java +++ b/Mage.Sets/src/mage/sets/zendikar/JourneyToNowhere.java @@ -56,7 +56,7 @@ public class JourneyToNowhere extends CardImpl { FilterCreaturePermanent filter = new FilterCreaturePermanent(); filter.add(new AnotherPredicate()); Ability ability1 = new EntersBattlefieldTriggeredAbility(new ExileTargetForSourceEffect("Journey to Nowhere exile"), false); - Target target = new TargetPermanent(filter, true); + Target target = new TargetPermanent(filter); target.setRequired(true); ability1.addTarget(target); this.addAbility(ability1); diff --git a/Mage.Sets/src/mage/sets/zendikar/KalitasBloodchiefOfGhet.java b/Mage.Sets/src/mage/sets/zendikar/KalitasBloodchiefOfGhet.java index 97b0e87e647..5ee1c2e514c 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KalitasBloodchiefOfGhet.java +++ b/Mage.Sets/src/mage/sets/zendikar/KalitasBloodchiefOfGhet.java @@ -66,7 +66,7 @@ public class KalitasBloodchiefOfGhet extends CardImpl { // {B}{B}{B}, {T}: Destroy target creature. If that creature dies this way, put a black Vampire creature token onto the battlefield. Its power is equal to that creature's power and its toughness is equal to that creature's toughness. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new KalitasDestroyEffect(), new ManaCostsImpl("{B}{B}{B}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/KorAeronaut.java b/Mage.Sets/src/mage/sets/zendikar/KorAeronaut.java index 9b671c523fe..5d55d2fd922 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KorAeronaut.java +++ b/Mage.Sets/src/mage/sets/zendikar/KorAeronaut.java @@ -64,7 +64,7 @@ public class KorAeronaut extends CardImpl { this.addAbility(FlyingAbility.getInstance()); EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(new ConditionalTriggeredAbility(ability, new LockedInCondition(KickedCondition.getInstance()), "When {this} enters the battlefield, if it was kicked, target creature gains flying until end of turn.")); } diff --git a/Mage.Sets/src/mage/sets/zendikar/KorHookmaster.java b/Mage.Sets/src/mage/sets/zendikar/KorHookmaster.java index cd5a03e0522..19a41fc4e28 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KorHookmaster.java +++ b/Mage.Sets/src/mage/sets/zendikar/KorHookmaster.java @@ -64,7 +64,7 @@ public class KorHookmaster extends CardImpl { EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new TapTargetEffect()); ability.addEffect(new SkipNextUntapTargetEffect()); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/KorOutfitter.java b/Mage.Sets/src/mage/sets/zendikar/KorOutfitter.java index d5909f4be50..b668f4369ce 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KorOutfitter.java +++ b/Mage.Sets/src/mage/sets/zendikar/KorOutfitter.java @@ -68,7 +68,7 @@ public class KorOutfitter extends CardImpl { // When Kor Outfitter enters the battlefield, you may attach target Equipment you control to target creature you control. Ability ability = new EntersBattlefieldTriggeredAbility(new EquipEffect(), true); ability.addTarget(new TargetControlledPermanent(filter)); - ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/KorSanctifiers.java b/Mage.Sets/src/mage/sets/zendikar/KorSanctifiers.java index cbaf834046e..028a6e443ae 100644 --- a/Mage.Sets/src/mage/sets/zendikar/KorSanctifiers.java +++ b/Mage.Sets/src/mage/sets/zendikar/KorSanctifiers.java @@ -71,7 +71,7 @@ public class KorSanctifiers extends CardImpl { // When Kor Sanctifiers enters the battlefield, if it was kicked, destroy target artifact or enchantment. EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false); - ability.addTarget(new TargetPermanent(filter, true)); + ability.addTarget(new TargetPermanent(filter)); this.addAbility(new ConditionalTriggeredAbility(ability, KickedCondition.getInstance(), "When {this} enters the battlefield, if it was kicked, destroy target artifact or enchantment.")); } diff --git a/Mage.Sets/src/mage/sets/zendikar/MagmaRift.java b/Mage.Sets/src/mage/sets/zendikar/MagmaRift.java index 3153f06132b..226b18c1ffd 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MagmaRift.java +++ b/Mage.Sets/src/mage/sets/zendikar/MagmaRift.java @@ -56,7 +56,7 @@ public class MagmaRift extends CardImpl { // Magma Rift deals 5 damage to target creature. this.getSpellAbility().addEffect(new DamageTargetEffect(5)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } public MagmaRift(final MagmaRift card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/MarkOfMutiny.java b/Mage.Sets/src/mage/sets/zendikar/MarkOfMutiny.java index 2ce6245d302..6f017fb55e2 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MarkOfMutiny.java +++ b/Mage.Sets/src/mage/sets/zendikar/MarkOfMutiny.java @@ -52,7 +52,7 @@ public class MarkOfMutiny extends CardImpl { this.expansionSetCode = "ZEN"; this.color.setRed(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addEffect(new AddCountersTargetEffect(CounterType.P1P1.createInstance())); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/zendikar/MarshCasualties.java b/Mage.Sets/src/mage/sets/zendikar/MarshCasualties.java index 3fcfa2ecfd4..ca0c2d595ef 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MarshCasualties.java +++ b/Mage.Sets/src/mage/sets/zendikar/MarshCasualties.java @@ -65,7 +65,7 @@ public class MarshCasualties extends CardImpl { new MarshCasualtiesEffect(-1, -1), KickedCondition.getInstance(), ruleText)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public MarshCasualties(final MarshCasualties card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/MerfolkSeastalkers.java b/Mage.Sets/src/mage/sets/zendikar/MerfolkSeastalkers.java index b28401ced46..1d8a10446d7 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MerfolkSeastalkers.java +++ b/Mage.Sets/src/mage/sets/zendikar/MerfolkSeastalkers.java @@ -67,7 +67,7 @@ public class MerfolkSeastalkers extends CardImpl { this.addAbility(new IslandwalkAbility()); SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{2}{U}")); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/MindSludge.java b/Mage.Sets/src/mage/sets/zendikar/MindSludge.java index 1fdea24ee60..65084de8f4e 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MindSludge.java +++ b/Mage.Sets/src/mage/sets/zendikar/MindSludge.java @@ -58,7 +58,7 @@ public class MindSludge extends CardImpl { this.color.setBlack(true); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new DiscardTargetEffect(new PermanentsOnBattlefieldCount(filter))); } diff --git a/Mage.Sets/src/mage/sets/zendikar/MireBlight.java b/Mage.Sets/src/mage/sets/zendikar/MireBlight.java index 14b9fd272d4..a8f12dbb7f3 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MireBlight.java +++ b/Mage.Sets/src/mage/sets/zendikar/MireBlight.java @@ -59,7 +59,7 @@ public class MireBlight extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/zendikar/MoldShambler.java b/Mage.Sets/src/mage/sets/zendikar/MoldShambler.java index 00c2300e1ef..d83cea15572 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MoldShambler.java +++ b/Mage.Sets/src/mage/sets/zendikar/MoldShambler.java @@ -71,7 +71,7 @@ public class MoldShambler extends CardImpl { // When Mold Shambler enters the battlefield, if it was kicked, destroy target noncreature permanent. EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false); - Target target = new TargetPermanent(filter, true); + Target target = new TargetPermanent(filter); target.setRequired(true); ability.addTarget(target); this.addAbility(new ConditionalTriggeredAbility(ability, new LockedInCondition(KickedCondition.getInstance()), "When {this} enters the battlefield, if it was kicked, destroy target noncreature permanent.")); diff --git a/Mage.Sets/src/mage/sets/zendikar/MurasaPyromancer.java b/Mage.Sets/src/mage/sets/zendikar/MurasaPyromancer.java index 209bbc1dfaa..75e2f54e6cf 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MurasaPyromancer.java +++ b/Mage.Sets/src/mage/sets/zendikar/MurasaPyromancer.java @@ -68,7 +68,7 @@ public class MurasaPyromancer extends CardImpl { this.toughness = new MageInt(2); Ability ability = new AllyEntersBattlefieldTriggeredAbility(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)), true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/NarrowEscape.java b/Mage.Sets/src/mage/sets/zendikar/NarrowEscape.java index d2d3943e064..e15e07d2b31 100644 --- a/Mage.Sets/src/mage/sets/zendikar/NarrowEscape.java +++ b/Mage.Sets/src/mage/sets/zendikar/NarrowEscape.java @@ -46,7 +46,7 @@ public class NarrowEscape extends CardImpl { super(ownerId, 27, "Narrow Escape", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{W}"); this.expansionSetCode = "ZEN"; this.color.setWhite(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); this.getSpellAbility().addEffect(new GainLifeEffect(4)); } diff --git a/Mage.Sets/src/mage/sets/zendikar/NeedlebiteTrap.java b/Mage.Sets/src/mage/sets/zendikar/NeedlebiteTrap.java index ac8378e7c0f..861eef51997 100644 --- a/Mage.Sets/src/mage/sets/zendikar/NeedlebiteTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/NeedlebiteTrap.java @@ -63,7 +63,7 @@ public class NeedlebiteTrap extends CardImpl { // Target player loses 5 life and you gain 5 life. this.getSpellAbility().addEffect(new LoseLifeTargetEffect(5)); this.getSpellAbility().addEffect(new GainLifeEffect(5)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public NeedlebiteTrap(final NeedlebiteTrap card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/NimbusWings.java b/Mage.Sets/src/mage/sets/zendikar/NimbusWings.java index 110523cb8b3..a55081f1527 100644 --- a/Mage.Sets/src/mage/sets/zendikar/NimbusWings.java +++ b/Mage.Sets/src/mage/sets/zendikar/NimbusWings.java @@ -59,7 +59,7 @@ public class NimbusWings extends CardImpl { this.color.setWhite(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/zendikar/NobleVestige.java b/Mage.Sets/src/mage/sets/zendikar/NobleVestige.java index 36561d815d8..91eeca3164c 100644 --- a/Mage.Sets/src/mage/sets/zendikar/NobleVestige.java +++ b/Mage.Sets/src/mage/sets/zendikar/NobleVestige.java @@ -58,7 +58,7 @@ public class NobleVestige extends CardImpl { this.addAbility(FlyingAbility.getInstance()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/ObNixilisTheFallen.java b/Mage.Sets/src/mage/sets/zendikar/ObNixilisTheFallen.java index 0606099936b..78dfef2c37b 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ObNixilisTheFallen.java +++ b/Mage.Sets/src/mage/sets/zendikar/ObNixilisTheFallen.java @@ -58,7 +58,7 @@ public class ObNixilisTheFallen extends CardImpl { Ability ability = new LandfallAbility(new LoseLifeTargetEffect(3), true); ability.addEffect(new AddCountersSourceEffect(CounterType.P1P1.createInstance(3))); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/OranRiefRecluse.java b/Mage.Sets/src/mage/sets/zendikar/OranRiefRecluse.java index 4baaf2f88c4..86ddc084931 100644 --- a/Mage.Sets/src/mage/sets/zendikar/OranRiefRecluse.java +++ b/Mage.Sets/src/mage/sets/zendikar/OranRiefRecluse.java @@ -72,7 +72,7 @@ public class OranRiefRecluse extends CardImpl { // When Oran-Rief Recluse enters the battlefield, if it was kicked, destroy target creature with flying. EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false); - ability.addTarget(new TargetCreaturePermanent(filter, true)); + ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(new ConditionalTriggeredAbility(ability, KickedCondition.getInstance(), "When {this} enters the battlefield, if it was kicked, destroy target creature with flying.")); } diff --git a/Mage.Sets/src/mage/sets/zendikar/ParalyzingGrasp.java b/Mage.Sets/src/mage/sets/zendikar/ParalyzingGrasp.java index 8aed1532270..0e1a0c6cccd 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ParalyzingGrasp.java +++ b/Mage.Sets/src/mage/sets/zendikar/ParalyzingGrasp.java @@ -54,7 +54,7 @@ public class ParalyzingGrasp extends CardImpl { this.color.setBlue(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); diff --git a/Mage.Sets/src/mage/sets/zendikar/PiranhaMarsh.java b/Mage.Sets/src/mage/sets/zendikar/PiranhaMarsh.java index 1ef7db71b90..7cef1dc5e16 100644 --- a/Mage.Sets/src/mage/sets/zendikar/PiranhaMarsh.java +++ b/Mage.Sets/src/mage/sets/zendikar/PiranhaMarsh.java @@ -50,7 +50,7 @@ public class PiranhaMarsh extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); this.addAbility(new BlackManaAbility()); EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new LoseLifeTargetEffect(1)); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/PredatoryUrge.java b/Mage.Sets/src/mage/sets/zendikar/PredatoryUrge.java index 4fcc66c8730..2bcb75b8d0c 100644 --- a/Mage.Sets/src/mage/sets/zendikar/PredatoryUrge.java +++ b/Mage.Sets/src/mage/sets/zendikar/PredatoryUrge.java @@ -61,7 +61,7 @@ public class PredatoryUrge extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); @@ -69,7 +69,7 @@ public class PredatoryUrge extends CardImpl { // Enchanted creature has "{tap}: This creature deals damage equal to its power to target creature. // That creature deals damage equal to its power to this creature." ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PredatoryUrgeEffect(), new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/sets/zendikar/PrimalBellow.java b/Mage.Sets/src/mage/sets/zendikar/PrimalBellow.java index 4701de97743..20ea99489a8 100644 --- a/Mage.Sets/src/mage/sets/zendikar/PrimalBellow.java +++ b/Mage.Sets/src/mage/sets/zendikar/PrimalBellow.java @@ -60,7 +60,7 @@ public class PrimalBellow extends CardImpl { this.color.setGreen(true); PermanentsOnBattlefieldCount value = new PermanentsOnBattlefieldCount(filter); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(value, value, Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/zendikar/QuestForAncientSecrets.java b/Mage.Sets/src/mage/sets/zendikar/QuestForAncientSecrets.java index 7bd434bd005..5b5082a38e6 100644 --- a/Mage.Sets/src/mage/sets/zendikar/QuestForAncientSecrets.java +++ b/Mage.Sets/src/mage/sets/zendikar/QuestForAncientSecrets.java @@ -67,7 +67,7 @@ public class QuestForAncientSecrets extends CardImpl { new QuestForAncientSecretsEffect(), new RemoveCountersSourceCost(CounterType.QUEST.createInstance(5))); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/QuestForTheGemblades.java b/Mage.Sets/src/mage/sets/zendikar/QuestForTheGemblades.java index 62029cafe11..7f21d09812b 100644 --- a/Mage.Sets/src/mage/sets/zendikar/QuestForTheGemblades.java +++ b/Mage.Sets/src/mage/sets/zendikar/QuestForTheGemblades.java @@ -64,7 +64,7 @@ public class QuestForTheGemblades extends CardImpl { new AddCountersTargetEffect(CounterType.P1P1.createInstance(4)), new RemoveCountersSourceCost(CounterType.QUEST.createInstance())); ability.addCost(new SacrificeSourceCost()); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/QuestForTheHolyRelic.java b/Mage.Sets/src/mage/sets/zendikar/QuestForTheHolyRelic.java index 00998fe5810..2d1008c2622 100644 --- a/Mage.Sets/src/mage/sets/zendikar/QuestForTheHolyRelic.java +++ b/Mage.Sets/src/mage/sets/zendikar/QuestForTheHolyRelic.java @@ -121,7 +121,7 @@ class QuestForTheHolyRelicEffect extends OneShotEffect { card.putOntoBattlefield(game, Zone.LIBRARY, source.getId(), source.getControllerId()); Permanent equipment = game.getPermanent(card.getId()); - Target targetCreature = new TargetControlledCreaturePermanent(true); + Target targetCreature = new TargetControlledCreaturePermanent(); if (equipment != null && player.choose(Outcome.BoostCreature, targetCreature, source.getSourceId(), game)) { Permanent permanent = game.getPermanent(targetCreature.getFirstTarget()); permanent.addAttachment(equipment.getId(), game); diff --git a/Mage.Sets/src/mage/sets/zendikar/RavenousTrap.java b/Mage.Sets/src/mage/sets/zendikar/RavenousTrap.java index 9da66fe0613..1a690766e22 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RavenousTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/RavenousTrap.java @@ -65,7 +65,7 @@ public class RavenousTrap extends CardImpl { // Exile all cards from target player's graveyard. this.getSpellAbility().addEffect(new ExileGraveyardAllTargetPlayerEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public RavenousTrap(final RavenousTrap card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/RecklessScholar.java b/Mage.Sets/src/mage/sets/zendikar/RecklessScholar.java index 777e3a9f454..efbb3375a9f 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RecklessScholar.java +++ b/Mage.Sets/src/mage/sets/zendikar/RecklessScholar.java @@ -58,7 +58,7 @@ public class RecklessScholar extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardTargetEffect(1), new TapSourceCost()); ability.addEffect(new DiscardTargetEffect(1)); - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/RelicCrush.java b/Mage.Sets/src/mage/sets/zendikar/RelicCrush.java index fb50b70bf19..5b42c2e6ca0 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RelicCrush.java +++ b/Mage.Sets/src/mage/sets/zendikar/RelicCrush.java @@ -63,7 +63,7 @@ public class RelicCrush extends CardImpl { // Destroy target artifact or enchantment and up to one other target artifact or enchantment. this.getSpellAbility().addEffect(new RelicCrushEffect()); - this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); + this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addTarget(new TargetPermanent(0, 1, filter, false)); } diff --git a/Mage.Sets/src/mage/sets/zendikar/RiteOfReplication.java b/Mage.Sets/src/mage/sets/zendikar/RiteOfReplication.java index 01d860dc366..143bbfc6fff 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RiteOfReplication.java +++ b/Mage.Sets/src/mage/sets/zendikar/RiteOfReplication.java @@ -60,7 +60,7 @@ public class RiteOfReplication extends CardImpl { this.addAbility(new KickerAbility("{5}")); // Put a token that's a copy of target creature onto the battlefield. If Rite of Replication was kicked, put five of those tokens onto the battlefield instead. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new RiteOfReplicationEffect(5), new RiteOfReplicationEffect(1), KickedCondition.getInstance(), "Put a token that's a copy of target creature onto the battlefield. If {this} was kicked, put five of those tokens onto the battlefield instead")); diff --git a/Mage.Sets/src/mage/sets/zendikar/RoilElemental.java b/Mage.Sets/src/mage/sets/zendikar/RoilElemental.java index 3b5755c98c8..00336ecd7a1 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RoilElemental.java +++ b/Mage.Sets/src/mage/sets/zendikar/RoilElemental.java @@ -70,7 +70,7 @@ public class RoilElemental extends CardImpl { // Landfall - Whenever a land enters the battlefield under your control, you may gain control of target creature for as long as you control Roil Elemental. ConditionalContinousEffect effect = new ConditionalContinousEffect(new GainControlTargetEffect(Duration.Custom), new ControlsPermanentCondition(filter), rule); Ability ability = new LandfallAbility(Zone.BATTLEFIELD, effect, true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java b/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java index 626becd41ff..7a8f5090562 100644 --- a/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java +++ b/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java @@ -63,7 +63,7 @@ public class RuneflareTrap extends CardImpl { // Runeflare Trap deals damage to target player equal to the number of cards in that player's hand. this.getSpellAbility().addEffect(new DamageTargetEffect(new TargetPlayerCardsInHandCount())); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } diff --git a/Mage.Sets/src/mage/sets/zendikar/SadisticSacrament.java b/Mage.Sets/src/mage/sets/zendikar/SadisticSacrament.java index 5eed9059f68..af599542b99 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SadisticSacrament.java +++ b/Mage.Sets/src/mage/sets/zendikar/SadisticSacrament.java @@ -69,7 +69,7 @@ public class SadisticSacrament extends CardImpl { new SadisticSacramentEffect(3), KickedCondition.getInstance(), ruleText)); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public SadisticSacrament(final SadisticSacrament card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/SavageSilhouette.java b/Mage.Sets/src/mage/sets/zendikar/SavageSilhouette.java index bf9dd9e7183..890fa199a59 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SavageSilhouette.java +++ b/Mage.Sets/src/mage/sets/zendikar/SavageSilhouette.java @@ -61,7 +61,7 @@ public class SavageSilhouette extends CardImpl { this.color.setGreen(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(true); + TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/sets/zendikar/SlaughterCry.java b/Mage.Sets/src/mage/sets/zendikar/SlaughterCry.java index 1ee074be59c..b7aabd1f075 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SlaughterCry.java +++ b/Mage.Sets/src/mage/sets/zendikar/SlaughterCry.java @@ -49,7 +49,7 @@ public class SlaughterCry extends CardImpl { this.color.setRed(true); - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(3, 0, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/zendikar/SoaringSeacliff.java b/Mage.Sets/src/mage/sets/zendikar/SoaringSeacliff.java index a155bbc5496..ef74f7ab959 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SoaringSeacliff.java +++ b/Mage.Sets/src/mage/sets/zendikar/SoaringSeacliff.java @@ -52,7 +52,7 @@ public class SoaringSeacliff extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); this.addAbility(new BlueManaAbility()); EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/SorinMarkov.java b/Mage.Sets/src/mage/sets/zendikar/SorinMarkov.java index 267a53eb7da..1c69ad1d876 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SorinMarkov.java +++ b/Mage.Sets/src/mage/sets/zendikar/SorinMarkov.java @@ -71,12 +71,12 @@ public class SorinMarkov extends CardImpl { // -3: Target opponent's life total becomes 10. LoyaltyAbility ability2 = new LoyaltyAbility(new SorinMarkovEffect(), -3); - ability2.addTarget(new TargetOpponent(true)); + ability2.addTarget(new TargetOpponent()); this.addAbility(ability2); // -7: You control target player during that player's next turn. LoyaltyAbility ability3 = new LoyaltyAbility(new ControlTargetPlayerNextTurnEffect(), -7); - ability3.addTarget(new TargetPlayer(true)); + ability3.addTarget(new TargetPlayer()); this.addAbility(ability3); } diff --git a/Mage.Sets/src/mage/sets/zendikar/TeeteringPeaks.java b/Mage.Sets/src/mage/sets/zendikar/TeeteringPeaks.java index 72e5ee6f94c..515ac0bde88 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TeeteringPeaks.java +++ b/Mage.Sets/src/mage/sets/zendikar/TeeteringPeaks.java @@ -51,7 +51,7 @@ public class TeeteringPeaks extends CardImpl { this.expansionSetCode = "ZEN"; this.addAbility(new EntersBattlefieldTappedAbility()); Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(2, 0, Duration.EndOfTurn), false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); this.addAbility(new RedManaAbility()); } diff --git a/Mage.Sets/src/mage/sets/zendikar/TorchSlinger.java b/Mage.Sets/src/mage/sets/zendikar/TorchSlinger.java index f36c459be6a..d0ab599e601 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TorchSlinger.java +++ b/Mage.Sets/src/mage/sets/zendikar/TorchSlinger.java @@ -61,7 +61,7 @@ public class TorchSlinger extends CardImpl { // When Torch Slinger enters the battlefield, if it was kicked, it deals 2 damage to target creature. EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(2), false); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(new ConditionalTriggeredAbility(ability, KickedCondition.getInstance(), "When {this} enters the battlefield, if it was kicked, it deals 2 damage to target creature.")); } diff --git a/Mage.Sets/src/mage/sets/zendikar/TrapfindersTrick.java b/Mage.Sets/src/mage/sets/zendikar/TrapfindersTrick.java index 3279a64662a..92b1487b80e 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TrapfindersTrick.java +++ b/Mage.Sets/src/mage/sets/zendikar/TrapfindersTrick.java @@ -55,7 +55,7 @@ public class TrapfindersTrick extends CardImpl { // Target player reveals his or her hand and discards all Trap cards. this.getSpellAbility().addEffect(new TrapfindersTrickEffect()); - this.getSpellAbility().addTarget(new TargetPlayer(true)); + this.getSpellAbility().addTarget(new TargetPlayer()); } public TrapfindersTrick(final TrapfindersTrick card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/TurntimberBasilisk.java b/Mage.Sets/src/mage/sets/zendikar/TurntimberBasilisk.java index 9c6663c6944..90ecd914d43 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TurntimberBasilisk.java +++ b/Mage.Sets/src/mage/sets/zendikar/TurntimberBasilisk.java @@ -55,7 +55,7 @@ public class TurntimberBasilisk extends CardImpl { this.addAbility(DeathtouchAbility.getInstance()); // Landfall - Whenever a land enters the battlefield under your control, you may have target creature block Turntimber Basilisk this turn if able. LandfallAbility ability = new LandfallAbility(new MustBeBlockedByTargetSourceEffect(), true); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/TurntimberGrove.java b/Mage.Sets/src/mage/sets/zendikar/TurntimberGrove.java index fe89e099bc2..b5d3ec33abe 100644 --- a/Mage.Sets/src/mage/sets/zendikar/TurntimberGrove.java +++ b/Mage.Sets/src/mage/sets/zendikar/TurntimberGrove.java @@ -51,7 +51,7 @@ public class TurntimberGrove extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); this.addAbility(new GreenManaAbility()); EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn)); - ability.addTarget(new TargetCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/UnstableFooting.java b/Mage.Sets/src/mage/sets/zendikar/UnstableFooting.java index 40f8310e894..3f4b9489352 100644 --- a/Mage.Sets/src/mage/sets/zendikar/UnstableFooting.java +++ b/Mage.Sets/src/mage/sets/zendikar/UnstableFooting.java @@ -76,7 +76,7 @@ public class UnstableFooting extends CardImpl { if (ability instanceof SpellAbility) { ability.getTargets().clear(); if (KickedCondition.getInstance().apply(game, ability)) { - ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer()); } } } diff --git a/Mage.Sets/src/mage/sets/zendikar/ValakutTheMoltenPinnacle.java b/Mage.Sets/src/mage/sets/zendikar/ValakutTheMoltenPinnacle.java index bafc4bbff78..62172cb3070 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ValakutTheMoltenPinnacle.java +++ b/Mage.Sets/src/mage/sets/zendikar/ValakutTheMoltenPinnacle.java @@ -87,7 +87,7 @@ class ValakutTheMoltenPinnacleTriggeredAbility extends TriggeredAbilityImpl { ValakutTheMoltenPinnacleTriggeredAbility () { super(Zone.BATTLEFIELD, new DamageTargetEffect(3), true); - this.addTarget(new TargetCreatureOrPlayer(true)); + this.addTarget(new TargetCreatureOrPlayer()); } ValakutTheMoltenPinnacleTriggeredAbility(ValakutTheMoltenPinnacleTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/zendikar/VampireHexmage.java b/Mage.Sets/src/mage/sets/zendikar/VampireHexmage.java index 5df960ece58..af36336c078 100644 --- a/Mage.Sets/src/mage/sets/zendikar/VampireHexmage.java +++ b/Mage.Sets/src/mage/sets/zendikar/VampireHexmage.java @@ -64,7 +64,7 @@ public class VampireHexmage extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); SimpleActivatedAbility vampireHexmageAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VampireHexmageEffect(), new SacrificeSourceCost()); - vampireHexmageAbility.addTarget(new TargetPermanent(true)); + vampireHexmageAbility.addTarget(new TargetPermanent()); this.addAbility(vampireHexmageAbility); } diff --git a/Mage.Sets/src/mage/sets/zendikar/VampiresBite.java b/Mage.Sets/src/mage/sets/zendikar/VampiresBite.java index 0aaaaf860b3..fad2070ba0d 100644 --- a/Mage.Sets/src/mage/sets/zendikar/VampiresBite.java +++ b/Mage.Sets/src/mage/sets/zendikar/VampiresBite.java @@ -58,7 +58,7 @@ public class VampiresBite extends CardImpl { this.addAbility(new KickerAbility("{2}{B}")); // Target creature gets +3/+0 until end of turn. If Vampire's Bite was kicked, that creature gains lifelink until end of turn. - this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(3, 0, Duration.EndOfTurn)); ContinuousEffect effect = new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn); this.getSpellAbility().addEffect(new ConditionalContinousEffect(effect, new LockedInCondition(KickedCondition.getInstance()), "If {this} was kicked, that creature gains lifelink until end of turn")); diff --git a/Mage.Sets/src/mage/sets/zendikar/VinesOfVastwood.java b/Mage.Sets/src/mage/sets/zendikar/VinesOfVastwood.java index 0c04b978af8..795aadd1e9f 100644 --- a/Mage.Sets/src/mage/sets/zendikar/VinesOfVastwood.java +++ b/Mage.Sets/src/mage/sets/zendikar/VinesOfVastwood.java @@ -58,7 +58,7 @@ public class VinesOfVastwood extends CardImpl { this.addAbility(new KickerAbility("{G}")); // Target creature can't be the target of spells or abilities your opponents control this turn. - TargetCreaturePermanent target = new TargetCreaturePermanent(true); + TargetCreaturePermanent target = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(target); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HexproofAbility.getInstance(), Duration.EndOfTurn)); diff --git a/Mage/src/mage/abilities/Modes.java b/Mage/src/mage/abilities/Modes.java index 6b499e7eb71..ce752177616 100644 --- a/Mage/src/mage/abilities/Modes.java +++ b/Mage/src/mage/abilities/Modes.java @@ -148,14 +148,16 @@ public class Modes extends LinkedHashMap { // If there is more than one other player who could make such a choice, the spell or ability’s controller decides which of those players will make the choice. UUID playerId = null; if (modeChooser == TargetController.OPPONENT) { - TargetOpponent targetOpponent = new TargetOpponent(true); + TargetOpponent targetOpponent = new TargetOpponent(); if (targetOpponent.choose(Outcome.Benefit, source.getControllerId(), source.getSourceId(), game)) { playerId = targetOpponent.getFirstTarget(); } - } - if (playerId == null ) { + } else { playerId = source.getControllerId(); } + if (playerId == null) { + return false; + } Player player = game.getPlayer(playerId); // player chooses modes manually diff --git a/Mage/src/mage/abilities/effects/common/CipherEffect.java b/Mage/src/mage/abilities/effects/common/CipherEffect.java index 2799e795eec..09003c6225b 100644 --- a/Mage/src/mage/abilities/effects/common/CipherEffect.java +++ b/Mage/src/mage/abilities/effects/common/CipherEffect.java @@ -86,7 +86,7 @@ public class CipherEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - TargetControlledCreaturePermanent target = new TargetControlledCreaturePermanent(true); + TargetControlledCreaturePermanent target = new TargetControlledCreaturePermanent(); if (controller != null) { if (target.canChoose(source.getControllerId(), game) && controller.chooseUse(outcome, "Cipher this spell to a creature?", game)) { diff --git a/Mage/src/mage/abilities/keyword/EquipAbility.java b/Mage/src/mage/abilities/keyword/EquipAbility.java index cde5b484f6f..5316e6ff92c 100644 --- a/Mage/src/mage/abilities/keyword/EquipAbility.java +++ b/Mage/src/mage/abilities/keyword/EquipAbility.java @@ -46,7 +46,7 @@ import mage.target.common.TargetControlledCreaturePermanent; public class EquipAbility extends ActivatedAbilityImpl { public EquipAbility(Outcome outcome, Cost cost) { - this(outcome, cost, new TargetControlledCreaturePermanent(true)); + this(outcome, cost, new TargetControlledCreaturePermanent()); } public EquipAbility(Outcome outcome, Cost cost, Target target) { diff --git a/Mage/src/mage/abilities/keyword/HauntAbility.java b/Mage/src/mage/abilities/keyword/HauntAbility.java index e21b8459029..7f4bd40612c 100644 --- a/Mage/src/mage/abilities/keyword/HauntAbility.java +++ b/Mage/src/mage/abilities/keyword/HauntAbility.java @@ -125,7 +125,7 @@ class HauntExileAbility extends ZoneChangeTriggeredAbility { public HauntExileAbility() { super(Zone.BATTLEFIELD, Zone.GRAVEYARD, new HauntEffect(), null, false); this.setRuleAtTheTop(true); - this.addTarget(new TargetCreaturePermanent(true)); + this.addTarget(new TargetCreaturePermanent()); } diff --git a/Mage/src/mage/abilities/keyword/ScavengeAbility.java b/Mage/src/mage/abilities/keyword/ScavengeAbility.java index ed61b7589f3..b5a79f1520e 100644 --- a/Mage/src/mage/abilities/keyword/ScavengeAbility.java +++ b/Mage/src/mage/abilities/keyword/ScavengeAbility.java @@ -65,7 +65,7 @@ public class ScavengeAbility extends ActivatedAbilityImpl { super(Zone.GRAVEYARD, new ScavengeEffect(), costs); this.timing = TimingRule.SORCERY; this.addCost(new ExileSourceFromGraveCost()); - this.addTarget(new TargetCreaturePermanent(true)); + this.addTarget(new TargetCreaturePermanent()); } public ScavengeAbility(final ScavengeAbility ability) { diff --git a/Mage/src/mage/abilities/keyword/TributeAbility.java b/Mage/src/mage/abilities/keyword/TributeAbility.java index ea22c38e706..547068d3fa3 100644 --- a/Mage/src/mage/abilities/keyword/TributeAbility.java +++ b/Mage/src/mage/abilities/keyword/TributeAbility.java @@ -107,7 +107,7 @@ class TributeEffect extends OneShotEffect { if (game.getOpponents(controller.getId()).size() == 1) { opponentId = game.getOpponents(controller.getId()).iterator().next(); } else { - Target target = new TargetOpponent(true); + Target target = new TargetOpponent(); controller.choose(outcome, target, source.getSourceId(), game); opponentId = target.getFirstTarget(); } diff --git a/Mage/src/mage/target/TargetPermanent.java b/Mage/src/mage/target/TargetPermanent.java index 164dd659b93..4549e9dfa56 100644 --- a/Mage/src/mage/target/TargetPermanent.java +++ b/Mage/src/mage/target/TargetPermanent.java @@ -50,21 +50,11 @@ public class TargetPermanent extends TargetObject { public TargetPermanent() { this(1, 1, new FilterPermanent(), false); } - - public TargetPermanent(boolean required) { - this(1, 1, new FilterPermanent(), false); - this.setRequired(required); - } public TargetPermanent(FilterPermanent filter) { this(1, 1, filter, false); } - public TargetPermanent(FilterPermanent filter, boolean required) { - this(1, 1, filter, false); - this.required = required; - } - public TargetPermanent(int numTargets, FilterPermanent filter) { this(numTargets, numTargets, filter, false); } diff --git a/Mage/src/mage/target/TargetPlayer.java b/Mage/src/mage/target/TargetPlayer.java index 27855f0bc16..ec90e9bf4d4 100644 --- a/Mage/src/mage/target/TargetPlayer.java +++ b/Mage/src/mage/target/TargetPlayer.java @@ -46,11 +46,6 @@ public class TargetPlayer extends TargetImpl { protected FilterPlayer filter; - public TargetPlayer(boolean required) { - this(); - setRequired(required); - } - public TargetPlayer() { this(1, 1, false); } diff --git a/Mage/src/mage/target/common/TargetArtifactPermanent.java b/Mage/src/mage/target/common/TargetArtifactPermanent.java index 6be7fb5b577..7fefecb1b5c 100644 --- a/Mage/src/mage/target/common/TargetArtifactPermanent.java +++ b/Mage/src/mage/target/common/TargetArtifactPermanent.java @@ -35,11 +35,7 @@ import mage.target.TargetPermanent; * @author ayratn */ public class TargetArtifactPermanent extends TargetPermanent { - - public TargetArtifactPermanent(boolean required) { - this(); - this.setRequired(required); - } + public TargetArtifactPermanent() { this(1, 1, new FilterArtifactPermanent(), false); } diff --git a/Mage/src/mage/target/common/TargetAttackingCreature.java b/Mage/src/mage/target/common/TargetAttackingCreature.java index b00fed434da..3bf1b0f528b 100644 --- a/Mage/src/mage/target/common/TargetAttackingCreature.java +++ b/Mage/src/mage/target/common/TargetAttackingCreature.java @@ -40,11 +40,6 @@ public class TargetAttackingCreature extends TargetPermanent { public TargetAttackingCreature() { this(1, 1, new FilterAttackingCreature(), false); } - - public TargetAttackingCreature(boolean required) { - this(1, 1, new FilterAttackingCreature(), false); - this.setRequired(required); - } public TargetAttackingCreature(int numTargets) { this(numTargets, numTargets, new FilterAttackingCreature(), false); diff --git a/Mage/src/mage/target/common/TargetCardInGraveyard.java b/Mage/src/mage/target/common/TargetCardInGraveyard.java index ff5c917555a..d89d6a708be 100644 --- a/Mage/src/mage/target/common/TargetCardInGraveyard.java +++ b/Mage/src/mage/target/common/TargetCardInGraveyard.java @@ -46,11 +46,6 @@ public class TargetCardInGraveyard extends TargetCard { this(1, 1, new FilterCard("card from a graveyard")); } - public TargetCardInGraveyard(boolean required) { - this(); - this.setRequired(required); - } - public TargetCardInGraveyard(FilterCard filter) { this(1, 1, filter); } diff --git a/Mage/src/mage/target/common/TargetCardInYourGraveyard.java b/Mage/src/mage/target/common/TargetCardInYourGraveyard.java index 1c591533391..b70131c375a 100644 --- a/Mage/src/mage/target/common/TargetCardInYourGraveyard.java +++ b/Mage/src/mage/target/common/TargetCardInYourGraveyard.java @@ -46,16 +46,6 @@ public class TargetCardInYourGraveyard extends TargetCard { this(1, 1, new FilterCard("card from your graveyard")); } - public TargetCardInYourGraveyard(boolean required) { - this(); - this.setRequired(required); - } - - public TargetCardInYourGraveyard(FilterCard filter, boolean required) { - this(filter); - this.setRequired(required); - } - public TargetCardInYourGraveyard(FilterCard filter) { this(1, 1, filter); } diff --git a/Mage/src/mage/target/common/TargetControlledCreaturePermanent.java b/Mage/src/mage/target/common/TargetControlledCreaturePermanent.java index b89aa433656..dd0c54cb861 100644 --- a/Mage/src/mage/target/common/TargetControlledCreaturePermanent.java +++ b/Mage/src/mage/target/common/TargetControlledCreaturePermanent.java @@ -40,11 +40,6 @@ public class TargetControlledCreaturePermanent extends TargetControlledPermanent this(1, 1, new FilterControlledCreaturePermanent(), false); } - public TargetControlledCreaturePermanent(boolean required) { - this(1, 1, new FilterControlledCreaturePermanent(), false); - this.required = required; - } - public TargetControlledCreaturePermanent(int numTargets) { this(numTargets, numTargets, new FilterControlledCreaturePermanent(), false); } @@ -54,11 +49,6 @@ public class TargetControlledCreaturePermanent extends TargetControlledPermanent this.targetName = filter.getMessage(); } - public TargetControlledCreaturePermanent(int minNumTargets, int maxNumTargets, FilterControlledCreaturePermanent filter, boolean notTarget, boolean required) { - this(minNumTargets, maxNumTargets, filter, notTarget); - this.required = required; - } - public TargetControlledCreaturePermanent(final TargetControlledCreaturePermanent target) { super(target); } diff --git a/Mage/src/mage/target/common/TargetControlledPermanent.java b/Mage/src/mage/target/common/TargetControlledPermanent.java index 92047478af9..e1eaccfa2da 100644 --- a/Mage/src/mage/target/common/TargetControlledPermanent.java +++ b/Mage/src/mage/target/common/TargetControlledPermanent.java @@ -42,11 +42,6 @@ public class TargetControlledPermanent extends TargetPermanent { this(1, 1, new FilterControlledPermanent(), false); } - public TargetControlledPermanent(boolean required) { - this(1, 1, new FilterControlledPermanent(), false); - this.setRequired(true); - } - public TargetControlledPermanent(int numTargets) { this(numTargets, numTargets, new FilterControlledPermanent(), false); } diff --git a/Mage/src/mage/target/common/TargetCreatureOrPlayer.java b/Mage/src/mage/target/common/TargetCreatureOrPlayer.java index 951d4daf825..6cda9b0d97f 100644 --- a/Mage/src/mage/target/common/TargetCreatureOrPlayer.java +++ b/Mage/src/mage/target/common/TargetCreatureOrPlayer.java @@ -51,11 +51,6 @@ public class TargetCreatureOrPlayer extends TargetImpl { protected FilterCreatureOrPlayer filter; - public TargetCreatureOrPlayer(boolean required) { - this(); - setRequired(required); - } - public TargetCreatureOrPlayer() { this(1, 1); } diff --git a/Mage/src/mage/target/common/TargetCreaturePermanent.java b/Mage/src/mage/target/common/TargetCreaturePermanent.java index 648c76110df..46a9753bb9f 100644 --- a/Mage/src/mage/target/common/TargetCreaturePermanent.java +++ b/Mage/src/mage/target/common/TargetCreaturePermanent.java @@ -41,29 +41,14 @@ public class TargetCreaturePermanent extends TargetPermanent { this(1, 1, new FilterCreaturePermanent(), false); } - public TargetCreaturePermanent(boolean required) { - this(); - setRequired(required); - } - public TargetCreaturePermanent(FilterCreaturePermanent filter) { this(1, 1, filter, false); } - - public TargetCreaturePermanent(FilterCreaturePermanent filter, boolean required) { - this(1, 1, filter, false); - setRequired(required); - } public TargetCreaturePermanent(int numTargets) { this(numTargets, numTargets, new FilterCreaturePermanent(), false); } - public TargetCreaturePermanent(int numTargets, boolean required) { - this(numTargets); - setRequired(required); - } - public TargetCreaturePermanent(int minNumTargets, int maxNumTargets) { this(minNumTargets, maxNumTargets, new FilterCreaturePermanent(), false); } diff --git a/Mage/src/mage/target/common/TargetEnchantmentPermanent.java b/Mage/src/mage/target/common/TargetEnchantmentPermanent.java index 23c425ad81f..72b9609e338 100644 --- a/Mage/src/mage/target/common/TargetEnchantmentPermanent.java +++ b/Mage/src/mage/target/common/TargetEnchantmentPermanent.java @@ -36,11 +36,6 @@ import mage.target.TargetPermanent; * @author LevelX2 */ public class TargetEnchantmentPermanent extends TargetPermanent { - - public TargetEnchantmentPermanent(boolean required) { - this(); - this.setRequired(required); - } public TargetEnchantmentPermanent() { this(1, 1, new FilterEnchantmentPermanent(), false); diff --git a/Mage/src/mage/target/common/TargetOpponent.java b/Mage/src/mage/target/common/TargetOpponent.java index 155ec723b82..4483f1e971c 100644 --- a/Mage/src/mage/target/common/TargetOpponent.java +++ b/Mage/src/mage/target/common/TargetOpponent.java @@ -45,17 +45,10 @@ public class TargetOpponent extends TargetPlayer { public TargetOpponent() { this(false); } - - public TargetOpponent(boolean required) { - super(1, 1, false, new FilterPlayer("opponent")); - this.filter.add(new PlayerPredicate(TargetController.OPPONENT)); - setRequired(required); - } - public TargetOpponent(boolean required, boolean notTarget) { + public TargetOpponent(boolean notTarget) { super(1, 1, false, new FilterPlayer("opponent")); this.filter.add(new PlayerPredicate(TargetController.OPPONENT)); - setRequired(required); setNotTarget(notTarget); }