From 678b9acbf0b3737b07d31f226162ae4c0cb071e5 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 10 Jun 2014 00:15:38 +0200 Subject: [PATCH] * Made targets mandatory (1333 cards). --- Mage.Sets/src/mage/sets/alarareborn/Anathemancer.java | 2 +- Mage.Sets/src/mage/sets/alarareborn/ArchitectsOfWill.java | 2 +- Mage.Sets/src/mage/sets/alarareborn/Brainbite.java | 2 +- Mage.Sets/src/mage/sets/alarareborn/DenyReality.java | 2 +- Mage.Sets/src/mage/sets/alarareborn/EsperSojourners.java | 4 ++-- Mage.Sets/src/mage/sets/alarareborn/IdentityCrisis.java | 2 +- Mage.Sets/src/mage/sets/alarareborn/Lavalanche.java | 2 +- Mage.Sets/src/mage/sets/alarareborn/LichLordOfUnx.java | 2 +- Mage.Sets/src/mage/sets/alarareborn/MageSlayer.java | 2 +- .../src/mage/sets/alarareborn/NecromancersCovenant.java | 2 +- .../src/mage/sets/alarareborn/NulltreadGargantuan.java | 2 +- Mage.Sets/src/mage/sets/alarareborn/SanityGnawers.java | 2 +- .../src/mage/sets/alarareborn/ShieldOfTheRighteous.java | 2 +- Mage.Sets/src/mage/sets/alarareborn/SingeMindOgre.java | 2 +- Mage.Sets/src/mage/sets/alarareborn/ThoughtHemorrhage.java | 2 +- .../src/mage/sets/alarareborn/UnscytheKillerOfKings.java | 2 +- Mage.Sets/src/mage/sets/alarareborn/VectisDominator.java | 2 +- Mage.Sets/src/mage/sets/alliances/SoldierOfFortune.java | 2 +- Mage.Sets/src/mage/sets/apocalypse/AEtherMutation.java | 2 +- Mage.Sets/src/mage/sets/apocalypse/AnaDisciple.java | 4 ++-- Mage.Sets/src/mage/sets/apocalypse/CetaDisciple.java | 2 +- Mage.Sets/src/mage/sets/apocalypse/DegaDisciple.java | 4 ++-- .../src/mage/sets/apocalypse/DiversionaryTactics.java | 2 +- Mage.Sets/src/mage/sets/apocalypse/LastCaress.java | 2 +- Mage.Sets/src/mage/sets/apocalypse/LegacyWeapon.java | 2 +- Mage.Sets/src/mage/sets/apocalypse/ManaclesOfDecay.java | 2 +- Mage.Sets/src/mage/sets/apocalypse/MartyrsTomb.java | 2 +- Mage.Sets/src/mage/sets/apocalypse/OrimsThunder.java | 2 +- Mage.Sets/src/mage/sets/apocalypse/QuagmireDruid.java | 2 +- Mage.Sets/src/mage/sets/apocalypse/QuicksilverDagger.java | 4 ++-- Mage.Sets/src/mage/sets/apocalypse/RakaDisciple.java | 2 +- Mage.Sets/src/mage/sets/apocalypse/SavageGorilla.java | 2 +- Mage.Sets/src/mage/sets/apocalypse/TemporalSpring.java | 2 +- Mage.Sets/src/mage/sets/apocalypse/Vindicate.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/Aggravate.java | 2 +- .../src/mage/sets/avacynrestored/AppetiteForBrains.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/BloodArtist.java | 2 +- .../src/mage/sets/avacynrestored/BloodflowConnoisseur.java | 2 +- .../src/mage/sets/avacynrestored/BonfireOfTheDamned.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/CallToServe.java | 2 +- .../src/mage/sets/avacynrestored/CaptainOfTheMists.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/Cloudshift.java | 2 +- .../src/mage/sets/avacynrestored/CommandersAuthority.java | 2 +- .../src/mage/sets/avacynrestored/ConjurersCloset.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/CorpseTraders.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/CripplingChill.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/DarkImpostor.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/DeathWind.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/Defang.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/Dreadwaters.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/DualCasting.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/EssenceHarvest.java | 2 +- .../mage/sets/avacynrestored/FalkenrathExterminator.java | 2 +- .../src/mage/sets/avacynrestored/GallowsAtWillowHill.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/GhostlyTouch.java | 4 ++-- Mage.Sets/src/mage/sets/avacynrestored/Ghoulflesh.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/GraveExchange.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/Grounded.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/GuiseOfFire.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/HolyJusticiar.java | 2 +- .../src/mage/sets/avacynrestored/InfiniteReflection.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/JointAssault.java | 2 +- .../src/mage/sets/avacynrestored/KessigMalcontents.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/LeapOfFaith.java | 2 +- .../src/mage/sets/avacynrestored/LightningProwess.java | 2 +- .../src/mage/sets/avacynrestored/MaliciousIntent.java | 4 ++-- Mage.Sets/src/mage/sets/avacynrestored/MentalAgony.java | 2 +- .../src/mage/sets/avacynrestored/MidvastProtector.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/Necrobite.java | 2 +- .../src/mage/sets/avacynrestored/NephaliaSmuggler.java | 2 +- .../src/mage/sets/avacynrestored/PeelFromReality.java | 2 +- .../src/mage/sets/avacynrestored/PredatorsGambit.java | 2 +- .../src/mage/sets/avacynrestored/RevengeOfTheHunted.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/RotcrownGhoul.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/RushOfBlood.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/ScaldingDevil.java | 2 +- .../src/mage/sets/avacynrestored/ScrollOfGriselbrand.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/ShelteringWord.java | 2 +- .../src/mage/sets/avacynrestored/SlayersStronghold.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/SnareTheSkies.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/SpectralPrison.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/SpiritAway.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/SternMentor.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/StolenGoods.java | 2 +- .../src/mage/sets/avacynrestored/TamiyoTheMoonSage.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/Thunderbolt.java | 2 +- .../src/mage/sets/avacynrestored/TimberlandGuide.java | 2 +- .../src/mage/sets/avacynrestored/TriumphOfCruelty.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/UncannySpeed.java | 2 +- .../src/mage/sets/avacynrestored/UndeadExecutioner.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/UnhallowedPact.java | 2 +- .../src/mage/sets/avacynrestored/ZealousConscripts.java | 2 +- Mage.Sets/src/mage/sets/avacynrestored/ZealousStrike.java | 2 +- .../src/mage/sets/betrayersofkamigawa/BileUrchin.java | 2 +- .../src/mage/sets/betrayersofkamigawa/BlazingShoal.java | 2 +- .../mage/sets/betrayersofkamigawa/BlessingOfLeeches.java | 2 +- .../src/mage/sets/betrayersofkamigawa/ChildOfThorns.java | 2 +- .../src/mage/sets/betrayersofkamigawa/FirstVolley.java | 2 +- Mage.Sets/src/mage/sets/betrayersofkamigawa/Frostling.java | 2 +- .../src/mage/sets/betrayersofkamigawa/HeartOfLight.java | 2 +- .../src/mage/sets/betrayersofkamigawa/KumanosBlessing.java | 2 +- .../src/mage/sets/betrayersofkamigawa/MarkOfTheOni.java | 2 +- .../src/mage/sets/betrayersofkamigawa/MoonlitStrider.java | 2 +- .../src/mage/sets/betrayersofkamigawa/OrnateKanzashi.java | 2 +- .../src/mage/sets/betrayersofkamigawa/PhantomWings.java | 2 +- .../src/mage/sets/betrayersofkamigawa/RoninWarclub.java | 4 ++-- Mage.Sets/src/mage/sets/betrayersofkamigawa/Shuriken.java | 2 +- .../src/mage/sets/betrayersofkamigawa/SickeningShoal.java | 2 +- .../src/mage/sets/betrayersofkamigawa/SkullmaneBaku.java | 2 +- .../mage/sets/betrayersofkamigawa/SoratamiMindsweeper.java | 2 +- .../sets/betrayersofkamigawa/StreamOfConsciousness.java | 2 +- .../src/mage/sets/betrayersofkamigawa/TeardropKami.java | 2 +- .../src/mage/sets/betrayersofkamigawa/ThreeTragedies.java | 2 +- .../src/mage/sets/betrayersofkamigawa/TorrentOfStone.java | 2 +- .../src/mage/sets/betrayersofkamigawa/UmezawasJitte.java | 2 +- .../src/mage/sets/betrayersofkamigawa/UncheckedGrowth.java | 2 +- Mage.Sets/src/mage/sets/bornofthegods/AspectOfHydra.java | 2 +- Mage.Sets/src/mage/sets/bornofthegods/ClaimOfErebos.java | 2 +- .../src/mage/sets/bornofthegods/EpharasEnlightenment.java | 2 +- Mage.Sets/src/mage/sets/bornofthegods/EpharasRadiance.java | 2 +- Mage.Sets/src/mage/sets/bornofthegods/EpiphanyStorm.java | 2 +- .../src/mage/sets/bornofthegods/EvanescentIntellect.java | 2 +- Mage.Sets/src/mage/sets/bornofthegods/FearsomeTemper.java | 4 ++-- .../src/mage/sets/bornofthegods/GrislyTransformation.java | 2 +- Mage.Sets/src/mage/sets/bornofthegods/KarametrasFavor.java | 2 +- .../src/mage/sets/bornofthegods/MogisGodOfSlaughter.java | 2 +- Mage.Sets/src/mage/sets/bornofthegods/OraclesInsight.java | 2 +- Mage.Sets/src/mage/sets/bornofthegods/RaisedByWolves.java | 2 +- Mage.Sets/src/mage/sets/bornofthegods/StratusWalk.java | 2 +- Mage.Sets/src/mage/sets/bornofthegods/Sunbond.java | 2 +- Mage.Sets/src/mage/sets/bornofthegods/ThunderousMight.java | 2 +- .../src/mage/sets/bornofthegods/WeightOfTheUnderworld.java | 2 +- .../src/mage/sets/championsofkamigawa/AshenSkinZubera.java | 2 +- .../src/mage/sets/championsofkamigawa/AuraOfDominion.java | 2 +- .../src/mage/sets/championsofkamigawa/BlessedBreath.java | 2 +- .../src/mage/sets/championsofkamigawa/BloodRites.java | 2 +- .../mage/sets/championsofkamigawa/BloodthirstyOgre.java | 2 +- .../src/mage/sets/championsofkamigawa/BurrGrafter.java | 2 +- .../src/mage/sets/championsofkamigawa/CageOfHands.java | 2 +- .../src/mage/sets/championsofkamigawa/ConsumingVortex.java | 2 +- .../mage/sets/championsofkamigawa/CranialExtraction.java | 2 +- .../mage/sets/championsofkamigawa/EightAndAHalfTails.java | 3 +-- .../mage/sets/championsofkamigawa/EightAndAHalfTale.java | 2 +- .../src/mage/sets/championsofkamigawa/EyeOfNowhere.java | 2 +- .../src/mage/sets/championsofkamigawa/FieldOfReality.java | 2 +- .../mage/sets/championsofkamigawa/GuardianOfSolitude.java | 2 +- .../src/mage/sets/championsofkamigawa/HairStrungKoto.java | 2 +- .../mage/sets/championsofkamigawa/HondenOfNightsReach.java | 2 +- .../src/mage/sets/championsofkamigawa/HorizonSeed.java | 2 +- .../src/mage/sets/championsofkamigawa/IndomitableWill.java | 2 +- .../src/mage/sets/championsofkamigawa/InnocenceKami.java | 2 +- .../src/mage/sets/championsofkamigawa/JunkyoBell.java | 2 +- .../src/mage/sets/championsofkamigawa/JushiApprentice.java | 2 +- .../src/mage/sets/championsofkamigawa/KabutoMoth.java | 2 +- .../src/mage/sets/championsofkamigawa/KamiOfFiresRoar.java | 2 +- .../mage/sets/championsofkamigawa/KamiOfTheWaningMoon.java | 2 +- .../sets/championsofkamigawa/KamiOfTwistedReflection.java | 2 +- .../mage/sets/championsofkamigawa/KeigaTheTideStar.java | 2 +- .../mage/sets/championsofkamigawa/KikuNightsFlower.java | 2 +- .../src/mage/sets/championsofkamigawa/KitsuneMystic.java | 2 +- .../src/mage/sets/championsofkamigawa/KuroPitlord.java | 2 +- Mage.Sets/src/mage/sets/championsofkamigawa/LavaSpike.java | 2 +- .../src/mage/sets/championsofkamigawa/LiftedByClouds.java | 2 +- Mage.Sets/src/mage/sets/championsofkamigawa/Lure.java | 2 +- .../src/mage/sets/championsofkamigawa/MatsuTribeDecoy.java | 2 +- .../mage/sets/championsofkamigawa/MidnightCovenant.java | 2 +- Mage.Sets/src/mage/sets/championsofkamigawa/Mindblaze.java | 2 +- .../mage/sets/championsofkamigawa/MysticRestraints.java | 2 +- .../mage/sets/championsofkamigawa/NezumiBoneReader.java | 4 ++-- .../src/mage/sets/championsofkamigawa/NezumiShortfang.java | 2 +- .../src/mage/sets/championsofkamigawa/OniPossession.java | 2 +- .../mage/sets/championsofkamigawa/OrochiEggwatcher.java | 4 ++-- .../mage/sets/championsofkamigawa/OtherworldlyJourney.java | 2 +- Mage.Sets/src/mage/sets/championsofkamigawa/PainKami.java | 2 +- .../src/mage/sets/championsofkamigawa/PsychicPuppetry.java | 2 +- Mage.Sets/src/mage/sets/championsofkamigawa/PullUnder.java | 2 +- .../src/mage/sets/championsofkamigawa/RaggedVeins.java | 2 +- Mage.Sets/src/mage/sets/championsofkamigawa/Reweave.java | 2 +- .../src/mage/sets/championsofkamigawa/ScuttlingDeath.java | 2 +- .../mage/sets/championsofkamigawa/SenseiGoldenTail.java | 2 +- .../src/mage/sets/championsofkamigawa/SerpentSkin.java | 2 +- .../mage/sets/championsofkamigawa/SoratamiMirrorMage.java | 2 +- .../mage/sets/championsofkamigawa/SoratamiRainshaper.java | 2 +- .../src/mage/sets/championsofkamigawa/SoulOfMagma.java | 2 +- .../mage/sets/championsofkamigawa/StrengthOfCedars.java | 2 +- .../mage/sets/championsofkamigawa/SwallowingPlague.java | 2 +- .../src/mage/sets/championsofkamigawa/TellerOfTales.java | 2 +- .../src/mage/sets/championsofkamigawa/TenzaGodosMaul.java | 2 +- .../src/mage/sets/championsofkamigawa/ThiefOfHope.java | 2 +- .../mage/sets/championsofkamigawa/UncontrollableAnger.java | 2 +- .../src/mage/sets/championsofkamigawa/UnnaturalSpeed.java | 2 +- Mage.Sets/src/mage/sets/championsofkamigawa/Vigilance.java | 2 +- .../src/mage/sets/championsofkamigawa/WakingNightmare.java | 2 +- .../mage/sets/championsofkamigawa/YoseiTheMorningStar.java | 2 +- Mage.Sets/src/mage/sets/coldsnap/MouthOfRonom.java | 2 +- .../src/mage/sets/commander/BasandraBattleSeraph.java | 2 +- Mage.Sets/src/mage/sets/commander/GhaveGuruOfSpores.java | 2 +- Mage.Sets/src/mage/sets/commander/PerilousResearch.java | 2 +- Mage.Sets/src/mage/sets/commander/SewerNemesis.java | 2 +- Mage.Sets/src/mage/sets/commander/VishKalBloodArbiter.java | 2 +- Mage.Sets/src/mage/sets/commander/VowOfDuty.java | 2 +- Mage.Sets/src/mage/sets/commander/VowOfFlight.java | 2 +- Mage.Sets/src/mage/sets/commander/VowOfLightning.java | 2 +- Mage.Sets/src/mage/sets/commander/VowOfMalice.java | 2 +- Mage.Sets/src/mage/sets/commander/VowOfWildness.java | 2 +- Mage.Sets/src/mage/sets/commander2013/CurseOfChaos.java | 2 +- Mage.Sets/src/mage/sets/commander2013/CurseOfInertia.java | 2 +- .../src/mage/sets/commander2013/CurseOfPredation.java | 2 +- .../src/mage/sets/commander2013/CurseOfShallowGraves.java | 2 +- .../src/mage/sets/commander2013/CurseOfTheForsaken.java | 2 +- .../src/mage/sets/commander2013/DarksteelMutation.java | 2 +- Mage.Sets/src/mage/sets/commander2013/Flickerform.java | 2 +- Mage.Sets/src/mage/sets/commander2013/PresenceOfGond.java | 2 +- Mage.Sets/src/mage/sets/conflux/AbsorbVis.java | 2 +- Mage.Sets/src/mage/sets/conflux/AshasFavor.java | 2 +- Mage.Sets/src/mage/sets/conflux/ConstrictingTendrils.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/src/mage/sets/conflux/ExplodingBorders.java | 2 +- Mage.Sets/src/mage/sets/conflux/ExtractorDemon.java | 2 +- Mage.Sets/src/mage/sets/conflux/FontOfMythos.java | 2 +- Mage.Sets/src/mage/sets/conflux/GoblinRazerunners.java | 2 +- Mage.Sets/src/mage/sets/conflux/JhessianBalmgiver.java | 2 +- Mage.Sets/src/mage/sets/conflux/ManiacalRage.java | 2 +- Mage.Sets/src/mage/sets/conflux/MightOfAlara.java | 2 +- .../src/mage/sets/conflux/NicolBolasPlaneswalker.java | 4 ++-- Mage.Sets/src/mage/sets/conflux/Nyxathid.java | 2 +- Mage.Sets/src/mage/sets/conflux/ObeliskOfAlara.java | 6 +++--- Mage.Sets/src/mage/sets/conflux/PathToExile.java | 2 +- Mage.Sets/src/mage/sets/conflux/QuenchableFire.java | 2 +- Mage.Sets/src/mage/sets/conflux/ScarlandThrinax.java | 2 +- Mage.Sets/src/mage/sets/conflux/ScepterOfDominance.java | 2 +- Mage.Sets/src/mage/sets/conflux/SoulsMajesty.java | 2 +- Mage.Sets/src/mage/sets/conflux/SylvanBounty.java | 2 +- Mage.Sets/src/mage/sets/conflux/ViewFromAbove.java | 2 +- Mage.Sets/src/mage/sets/conflux/VoicesFromTheVoid.java | 2 +- Mage.Sets/src/mage/sets/conflux/WallOfReverence.java | 2 +- Mage.Sets/src/mage/sets/conflux/WretchedBanquet.java | 2 +- Mage.Sets/src/mage/sets/conflux/YokeOfTheDamned.java | 2 +- Mage.Sets/src/mage/sets/darkascension/ArtfulDodge.java | 2 +- Mage.Sets/src/mage/sets/darkascension/BriarpackAlpha.java | 2 +- Mage.Sets/src/mage/sets/darkascension/BurdenOfGuilt.java | 2 +- .../src/mage/sets/darkascension/CallToTheKindred.java | 2 +- Mage.Sets/src/mage/sets/darkascension/ChaliceOfDeath.java | 2 +- .../src/mage/sets/darkascension/ChantOfTheSkifsang.java | 2 +- .../src/mage/sets/darkascension/CurseOfBloodletting.java | 2 +- Mage.Sets/src/mage/sets/darkascension/CurseOfEchoes.java | 2 +- .../src/mage/sets/darkascension/CurseOfExhaustion.java | 2 +- .../src/mage/sets/darkascension/CurseOfMisfortunes.java | 2 +- Mage.Sets/src/mage/sets/darkascension/CurseOfThirst.java | 2 +- Mage.Sets/src/mage/sets/darkascension/DeadlyAllure.java | 2 +- Mage.Sets/src/mage/sets/darkascension/DeathsCaress.java | 2 +- Mage.Sets/src/mage/sets/darkascension/DerangedOutcast.java | 2 +- Mage.Sets/src/mage/sets/darkascension/DiregrafCaptain.java | 2 +- Mage.Sets/src/mage/sets/darkascension/FaithsShield.java | 2 +- .../src/mage/sets/darkascension/FalkenrathAristocrat.java | 2 +- .../src/mage/sets/darkascension/FalkenrathTorturer.java | 2 +- .../src/mage/sets/darkascension/FarbogBoneflinger.java | 2 +- Mage.Sets/src/mage/sets/darkascension/FavorOfTheWoods.java | 2 +- .../src/mage/sets/darkascension/GeralfsMindcrusher.java | 2 +- Mage.Sets/src/mage/sets/darkascension/GhastlyHaunting.java | 2 +- Mage.Sets/src/mage/sets/darkascension/GrimBackwoods.java | 2 +- Mage.Sets/src/mage/sets/darkascension/Griptide.java | 2 +- .../src/mage/sets/darkascension/GruesomeDiscovery.java | 2 +- .../src/mage/sets/darkascension/HarrowingJourney.java | 2 +- Mage.Sets/src/mage/sets/darkascension/HecklingFiends.java | 2 +- Mage.Sets/src/mage/sets/darkascension/Helvault.java | 2 +- .../src/mage/sets/darkascension/HungerOfTheHowlpack.java | 2 +- .../src/mage/sets/darkascension/HuntmasterOfTheFells.java | 2 +- .../src/mage/sets/darkascension/IncreasingConfusion.java | 2 +- .../src/mage/sets/darkascension/IncreasingSavagery.java | 2 +- .../src/mage/sets/darkascension/NiblisOfTheBreath.java | 2 +- Mage.Sets/src/mage/sets/darkascension/NiblisOfTheMist.java | 2 +- Mage.Sets/src/mage/sets/darkascension/NiblisOfTheUrn.java | 2 +- Mage.Sets/src/mage/sets/darkascension/SkillfulLunge.java | 2 +- Mage.Sets/src/mage/sets/darkascension/SkirsdagFlayer.java | 2 +- Mage.Sets/src/mage/sets/darkascension/SpitefulShadows.java | 2 +- .../src/mage/sets/darkascension/TalonsOfFalkenrath.java | 2 +- Mage.Sets/src/mage/sets/darkascension/ThoughtScour.java | 2 +- Mage.Sets/src/mage/sets/darkascension/TragicSlip.java | 2 +- Mage.Sets/src/mage/sets/darkascension/UlvenwaldBear.java | 2 +- Mage.Sets/src/mage/sets/darkascension/UndyingEvil.java | 2 +- Mage.Sets/src/mage/sets/darkascension/WildHunger.java | 2 +- .../src/mage/sets/darkascension/WrackWithMadness.java | 2 +- Mage.Sets/src/mage/sets/darksteel/LeoninBola.java | 2 +- Mage.Sets/src/mage/sets/darksteel/LoxodonMystic.java | 2 +- Mage.Sets/src/mage/sets/darksteel/SpawningPit.java | 2 +- Mage.Sets/src/mage/sets/dissension/BeaconHawk.java | 2 +- .../src/mage/sets/dissension/MinisterOfImpediments.java | 2 +- Mage.Sets/src/mage/sets/dissension/OddsEnds.java | 2 +- Mage.Sets/src/mage/sets/dissension/RiotSpikes.java | 2 +- Mage.Sets/src/mage/sets/dragonsmaze/KorozdaGorgon.java | 2 +- Mage.Sets/src/mage/sets/dragonsmaze/KrasisIncubation.java | 2 +- Mage.Sets/src/mage/sets/dragonsmaze/MawOfTheObzedat.java | 2 +- Mage.Sets/src/mage/sets/dragonsmaze/PilferedPlans.java | 2 +- Mage.Sets/src/mage/sets/dragonsmaze/PunishTheEnemy.java | 4 ++-- Mage.Sets/src/mage/sets/dragonsmaze/ReapIntellect.java | 2 +- Mage.Sets/src/mage/sets/dragonsmaze/SinCollector.java | 2 +- .../src/mage/sets/dragonsmaze/SinisterPossession.java | 2 +- .../src/mage/sets/dragonsmaze/UnflinchingCourage.java | 2 +- Mage.Sets/src/mage/sets/dragonsmaze/WarpedPhysique.java | 2 +- Mage.Sets/src/mage/sets/eighthedition/BalanceOfPower.java | 2 +- .../src/mage/sets/elspethvstezzeret/AEtherSpellbomb.java | 2 +- .../src/mage/sets/elspethvstezzeret/GoldmeadowHarrier.java | 2 +- .../src/mage/sets/elspethvstezzeret/RazorBarrier.java | 3 +-- .../src/mage/sets/elspethvstezzeret/SeasonedMarshal.java | 2 +- Mage.Sets/src/mage/sets/elspethvstezzeret/TripNoose.java | 2 +- .../src/mage/sets/elvesvsgoblins/AmbushCommander.java | 2 +- Mage.Sets/src/mage/sets/elvesvsgoblins/TimberwatchElf.java | 2 +- Mage.Sets/src/mage/sets/eventide/ArchonOfJustice.java | 2 +- .../src/mage/sets/eventide/AshlingTheExtinguisher.java | 2 +- Mage.Sets/src/mage/sets/eventide/BalefireLiege.java | 2 +- Mage.Sets/src/mage/sets/eventide/BallynockTrapper.java | 2 +- Mage.Sets/src/mage/sets/eventide/BanishingKnack.java | 2 +- Mage.Sets/src/mage/sets/eventide/CankerousThirst.java | 2 +- Mage.Sets/src/mage/sets/eventide/CinderPyromancer.java | 2 +- Mage.Sets/src/mage/sets/eventide/CloutOfTheDominus.java | 2 +- Mage.Sets/src/mage/sets/eventide/DeathbringerLiege.java | 4 ++-- Mage.Sets/src/mage/sets/eventide/DominusOfFealty.java | 2 +- Mage.Sets/src/mage/sets/eventide/Doomgape.java | 2 +- Mage.Sets/src/mage/sets/eventide/DoubleCleave.java | 2 +- Mage.Sets/src/mage/sets/eventide/EdgeOfTheDivinity.java | 2 +- Mage.Sets/src/mage/sets/eventide/FavorOfTheOverbeing.java | 2 +- Mage.Sets/src/mage/sets/eventide/Flickerwisp.java | 2 +- Mage.Sets/src/mage/sets/eventide/GiftOfTheDeity.java | 2 +- Mage.Sets/src/mage/sets/eventide/HagHedgeMage.java | 2 +- Mage.Sets/src/mage/sets/eventide/MerrowLevitator.java | 2 +- Mage.Sets/src/mage/sets/eventide/Monstrify.java | 2 +- Mage.Sets/src/mage/sets/eventide/NoggleHedgeMage.java | 2 +- Mage.Sets/src/mage/sets/eventide/OonasGrace.java | 2 +- Mage.Sets/src/mage/sets/eventide/RavensCrime.java | 2 +- Mage.Sets/src/mage/sets/eventide/RecumbentBliss.java | 2 +- Mage.Sets/src/mage/sets/eventide/ScourgeOfTheNobilis.java | 2 +- Mage.Sets/src/mage/sets/eventide/ShrewdHatchling.java | 2 +- Mage.Sets/src/mage/sets/eventide/SutureSpirit.java | 2 +- Mage.Sets/src/mage/sets/eventide/SyphonLife.java | 2 +- Mage.Sets/src/mage/sets/eventide/Unmake.java | 2 +- Mage.Sets/src/mage/sets/exodus/CatBurglar.java | 2 +- Mage.Sets/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 +- Mage.Sets/src/mage/sets/exodus/SpikeWeaver.java | 2 +- Mage.Sets/src/mage/sets/fallenempires/HymnToTourach.java | 2 +- Mage.Sets/src/mage/sets/fifthdawn/BatonOfCourage.java | 2 +- Mage.Sets/src/mage/sets/fifthdawn/BeaconOfTomorrows.java | 2 +- Mage.Sets/src/mage/sets/fifthdawn/StaffOfDomination.java | 4 ++-- .../src/mage/sets/fifthedition/DivineTransformation.java | 2 +- Mage.Sets/src/mage/sets/fifthedition/Millstone.java | 2 +- Mage.Sets/src/mage/sets/fifthedition/PradeshGypsies.java | 2 +- Mage.Sets/src/mage/sets/fifthedition/WyluliWolf.java | 2 +- Mage.Sets/src/mage/sets/fourthedition/Blessing.java | 2 +- Mage.Sets/src/mage/sets/fourthedition/HolyArmor.java | 2 +- .../src/mage/sets/fourthedition/SwordsToPlowshares.java | 2 +- Mage.Sets/src/mage/sets/fourthedition/TheRack.java | 2 +- Mage.Sets/src/mage/sets/futuresight/IchorSlick.java | 2 +- Mage.Sets/src/mage/sets/futuresight/LlanowarAugur.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/AerialManeuver.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/Agoraphobia.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/AlphaAuthority.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/BorosCharm.java | 4 ++-- Mage.Sets/src/mage/sets/gatecrash/BurstOfStrength.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/ClanDefiance.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/CoercedConfession.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/DeathsApproach.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/DebtorsPulpit.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/DevourFlesh.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/DimirCharm.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/DinrovaHorror.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/DuskmantleGuildmage.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/DyingWish.java | 4 ++-- Mage.Sets/src/mage/sets/gatecrash/FirefistStriker.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/ForcedAdaptation.java | 2 +- .../src/mage/sets/gatecrash/GideonChampionOfJustice.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/GiftOfOrzhova.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/GroundAssault.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/GuildscornWard.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/HolyMantle.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/HomingLightning.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/MadcapSkills.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/MentalVapors.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/MindeyeDrake.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/Mugging.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/MurderInvestigation.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/OneThousandLashes.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/OrzhovCharm.java | 4 ++-- Mage.Sets/src/mage/sets/gatecrash/PredatorsRapport.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/PrimalVisitation.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/PurgeTheProfane.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/RapidHybridization.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/RazortipWhip.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/ShadowSlice.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/SimicCharm.java | 4 ++-- Mage.Sets/src/mage/sets/gatecrash/SimicFluxmage.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/Skygames.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/SoulRansom.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/StructuralCollapse.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/UndercityInformer.java | 4 ++-- Mage.Sets/src/mage/sets/gatecrash/UndercityPlague.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/VizkopaGuildmage.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/Voidwalk.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/WayOfTheThief.java | 2 +- Mage.Sets/src/mage/sets/gatecrash/ZameckGuildmage.java | 2 +- Mage.Sets/src/mage/sets/guildpact/AngelOfDespair.java | 2 +- Mage.Sets/src/mage/sets/guildpact/BurningTreeShaman.java | 2 +- Mage.Sets/src/mage/sets/guildpact/DouseInGloom.java | 2 +- .../src/mage/sets/guildpact/GhostCouncilOfOrzhova.java | 4 ++-- Mage.Sets/src/mage/sets/guildpact/GruulGuildmage.java | 2 +- Mage.Sets/src/mage/sets/guildpact/HarrierGriffin.java | 2 +- Mage.Sets/src/mage/sets/guildpact/HypervoltGrasp.java | 2 +- .../src/mage/sets/guildpact/InfiltratorsMagemark.java | 2 +- Mage.Sets/src/mage/sets/guildpact/OstiaryThrull.java | 2 +- .../src/mage/sets/guildpact/PilloryOfTheSleepless.java | 2 +- Mage.Sets/src/mage/sets/guildpact/PlaguedRusalka.java | 4 ++-- Mage.Sets/src/mage/sets/guildpact/RestlessBones.java | 2 +- Mage.Sets/src/mage/sets/guildpact/ScorchedRusalka.java | 4 ++-- Mage.Sets/src/mage/sets/guildpact/ShadowLance.java | 2 +- Mage.Sets/src/mage/sets/guildpact/SkarrgTheRagePits.java | 2 +- Mage.Sets/src/mage/sets/guildpact/StarvedRusalka.java | 2 +- Mage.Sets/src/mage/sets/guildpact/TiborAndLumia.java | 2 +- Mage.Sets/src/mage/sets/guildpact/Wildsize.java | 2 +- Mage.Sets/src/mage/sets/heroesvsmonsters/UndyingRage.java | 2 +- Mage.Sets/src/mage/sets/homelands/FeastOfTheUnicorn.java | 2 +- Mage.Sets/src/mage/sets/homelands/Torture.java | 2 +- Mage.Sets/src/mage/sets/iceage/FyndhornBrownie.java | 2 +- Mage.Sets/src/mage/sets/iceage/ImposingVisage.java | 2 +- Mage.Sets/src/mage/sets/iceage/LeshracsRite.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/innistrad/AltarsReap.java | 2 +- Mage.Sets/src/mage/sets/innistrad/BitterheartWitch.java | 2 +- Mage.Sets/src/mage/sets/innistrad/BondsOfFaith.java | 2 +- Mage.Sets/src/mage/sets/innistrad/BrainWeevil.java | 2 +- Mage.Sets/src/mage/sets/innistrad/BumpInTheNight.java | 2 +- Mage.Sets/src/mage/sets/innistrad/CellarDoor.java | 2 +- Mage.Sets/src/mage/sets/innistrad/Claustrophobia.java | 2 +- Mage.Sets/src/mage/sets/innistrad/CorpseLunge.java | 2 +- Mage.Sets/src/mage/sets/innistrad/Curiosity.java | 2 +- Mage.Sets/src/mage/sets/innistrad/DeadWeight.java | 2 +- Mage.Sets/src/mage/sets/innistrad/DemonmailHauberk.java | 2 +- .../src/mage/sets/innistrad/DiscipleOfGriselbrand.java | 2 +- Mage.Sets/src/mage/sets/innistrad/ElderCathar.java | 2 +- Mage.Sets/src/mage/sets/innistrad/ElderOfLaurels.java | 2 +- Mage.Sets/src/mage/sets/innistrad/FurorOfTheBitten.java | 2 +- Mage.Sets/src/mage/sets/innistrad/GarrukRelentless.java | 2 +- Mage.Sets/src/mage/sets/innistrad/GhostlyPossession.java | 2 +- Mage.Sets/src/mage/sets/innistrad/GraspOfPhantoms.java | 2 +- Mage.Sets/src/mage/sets/innistrad/GraveyardShovel.java | 2 +- Mage.Sets/src/mage/sets/innistrad/GruesomeDeformity.java | 2 +- Mage.Sets/src/mage/sets/innistrad/HarvestPyre.java | 2 +- Mage.Sets/src/mage/sets/innistrad/InfernalPlunge.java | 2 +- Mage.Sets/src/mage/sets/innistrad/IntoTheMawOfHell.java | 2 +- Mage.Sets/src/mage/sets/innistrad/LilianaOfTheVeil.java | 4 ++-- Mage.Sets/src/mage/sets/innistrad/LostInTheMist.java | 2 +- Mage.Sets/src/mage/sets/innistrad/Mindshrieker.java | 2 +- Mage.Sets/src/mage/sets/innistrad/MomentOfHeroism.java | 2 +- Mage.Sets/src/mage/sets/innistrad/MorkrutBanshee.java | 2 +- Mage.Sets/src/mage/sets/innistrad/NephaliaDrownyard.java | 2 +- Mage.Sets/src/mage/sets/innistrad/NightTerrors.java | 2 +- Mage.Sets/src/mage/sets/innistrad/NightfallPredator.java | 2 +- Mage.Sets/src/mage/sets/innistrad/RageThrower.java | 2 +- Mage.Sets/src/mage/sets/innistrad/RangersGuile.java | 2 +- Mage.Sets/src/mage/sets/innistrad/SelhoffOccultist.java | 2 +- Mage.Sets/src/mage/sets/innistrad/SensoryDeprivation.java | 2 +- Mage.Sets/src/mage/sets/innistrad/SeverTheBloodline.java | 2 +- Mage.Sets/src/mage/sets/innistrad/SilentDeparture.java | 2 +- Mage.Sets/src/mage/sets/innistrad/SkeletalGrimace.java | 2 +- Mage.Sets/src/mage/sets/innistrad/SkirsdagCultist.java | 2 +- Mage.Sets/src/mage/sets/innistrad/SpectralFlight.java | 2 +- Mage.Sets/src/mage/sets/innistrad/SpideryGrasp.java | 2 +- Mage.Sets/src/mage/sets/innistrad/StensiaBloodhall.java | 2 +- Mage.Sets/src/mage/sets/innistrad/TraitorousBlood.java | 2 +- Mage.Sets/src/mage/sets/innistrad/TributeToHunger.java | 2 +- Mage.Sets/src/mage/sets/innistrad/WreathofGeists.java | 2 +- Mage.Sets/src/mage/sets/invasion/ArmadilloCloak.java | 2 +- Mage.Sets/src/mage/sets/invasion/BenalishTrapper.java | 2 +- Mage.Sets/src/mage/sets/invasion/HeroesReunion.java | 2 +- Mage.Sets/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/ThunderscapeApprentice.java | 4 ++-- Mage.Sets/src/mage/sets/invasion/ThunderscapeMaster.java | 2 +- Mage.Sets/src/mage/sets/journeyintonyx/ArmamentOfNyx.java | 2 +- Mage.Sets/src/mage/sets/journeyintonyx/AspectOfGorgon.java | 2 +- .../src/mage/sets/journeyintonyx/CastIntoDarkness.java | 2 +- .../src/mage/sets/journeyintonyx/FlamespeakersWill.java | 2 +- .../src/mage/sets/journeyintonyx/LightningDiadem.java | 2 +- .../src/mage/sets/journeyintonyx/MortalObstinacy.java | 2 +- Mage.Sets/src/mage/sets/journeyintonyx/NyxInfusion.java | 2 +- Mage.Sets/src/mage/sets/journeyintonyx/OppressiveRays.java | 2 +- Mage.Sets/src/mage/sets/journeyintonyx/PinToTheEarth.java | 2 +- Mage.Sets/src/mage/sets/journeyintonyx/Starfall.java | 2 +- Mage.Sets/src/mage/sets/judgment/ElephantGuide.java | 2 +- Mage.Sets/src/mage/sets/judgment/QuietSpeculation.java | 2 +- Mage.Sets/src/mage/sets/judgment/ThrissNantukoPrimus.java | 2 +- .../src/mage/sets/judgment/UnquestionedAuthority.java | 2 +- Mage.Sets/src/mage/sets/legends/DemonicTorment.java | 2 +- Mage.Sets/src/mage/sets/legions/GempalmIncinerator.java | 2 +- Mage.Sets/src/mage/sets/legions/HunterSliver.java | 2 +- Mage.Sets/src/mage/sets/limitedalpha/AspectOfWolf.java | 2 +- Mage.Sets/src/mage/sets/limitedalpha/Braingeyser.java | 2 +- Mage.Sets/src/mage/sets/limitedalpha/Burrowing.java | 2 +- Mage.Sets/src/mage/sets/limitedalpha/Conservator.java | 2 +- Mage.Sets/src/mage/sets/limitedalpha/ControlMagic.java | 2 +- Mage.Sets/src/mage/sets/limitedalpha/GlassesOfUrza.java | 2 +- Mage.Sets/src/mage/sets/limitedalpha/HowlFromBeyond.java | 2 +- Mage.Sets/src/mage/sets/limitedalpha/JadeMonolith.java | 2 +- Mage.Sets/src/mage/sets/limitedalpha/Web.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/BattleMastery.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/BrigidHeroOfKinsbaile.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/DrownerOfSecrets.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/EpicProportions.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/HerbalPoultice.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/HornetHarasser.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/ImmaculateMagistrate.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/KinsbaileBalloonist.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/KinsbaileSkirmisher.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/LaceWithMoonglove.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/Lignify.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/MerrowReejerey.java | 4 ++-- Mage.Sets/src/mage/sets/lorwyn/Pestermite.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/PrimalCommand.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/ProtectiveBubble.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/SowerOfTemptation.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/SpiderwigBoggart.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/StonybrookAngler.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/Surgespanner.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/ThorntoothWitch.java | 2 +- Mage.Sets/src/mage/sets/lorwyn/ZephyrNet.java | 2 +- Mage.Sets/src/mage/sets/magic2010/AcolyteOfXathrid.java | 2 +- Mage.Sets/src/mage/sets/magic2010/ArmoredAscension.java | 2 +- Mage.Sets/src/mage/sets/magic2010/BlindingMage.java | 2 +- Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java | 6 +++--- Mage.Sets/src/mage/sets/magic2010/Disorient.java | 2 +- Mage.Sets/src/mage/sets/magic2010/Duress.java | 2 +- Mage.Sets/src/mage/sets/magic2010/HauntingEchoes.java | 2 +- Mage.Sets/src/mage/sets/magic2010/IceCage.java | 2 +- Mage.Sets/src/mage/sets/magic2010/Indestructibility.java | 2 +- Mage.Sets/src/mage/sets/magic2010/JaceBeleren.java | 4 ++-- Mage.Sets/src/mage/sets/magic2010/Jump.java | 2 +- Mage.Sets/src/mage/sets/magic2010/KindledFury.java | 2 +- Mage.Sets/src/mage/sets/magic2010/LilianaVess.java | 2 +- Mage.Sets/src/mage/sets/magic2010/MasterOfTheWildHunt.java | 2 +- Mage.Sets/src/mage/sets/magic2010/MightOfOaks.java | 2 +- Mage.Sets/src/mage/sets/magic2010/MindControl.java | 2 +- Mage.Sets/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 +- Mage.Sets/src/mage/sets/magic2010/SanguineBond.java | 2 +- Mage.Sets/src/mage/sets/magic2010/SeismicStrike.java | 2 +- Mage.Sets/src/mage/sets/magic2010/SignInBlood.java | 2 +- Mage.Sets/src/mage/sets/magic2010/Sleep.java | 2 +- Mage.Sets/src/mage/sets/magic2010/SoulBleed.java | 2 +- .../src/mage/sets/magic2010/TendrilsOfCorruption.java | 2 +- Mage.Sets/src/mage/sets/magic2010/TomeScour.java | 2 +- Mage.Sets/src/mage/sets/magic2010/VampireAristocrat.java | 2 +- Mage.Sets/src/mage/sets/magic2010/Weakness.java | 2 +- Mage.Sets/src/mage/sets/magic2011/AetherAdept.java | 2 +- Mage.Sets/src/mage/sets/magic2011/BrittleEffigy.java | 2 +- Mage.Sets/src/mage/sets/magic2011/CaptivatingVampire.java | 2 +- Mage.Sets/src/mage/sets/magic2011/ChandrasOutrage.java | 2 +- Mage.Sets/src/mage/sets/magic2011/Diminish.java | 2 +- Mage.Sets/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 +- Mage.Sets/src/mage/sets/magic2011/JacesErasure.java | 2 +- Mage.Sets/src/mage/sets/magic2011/JinxedIdol.java | 4 ++-- Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java | 2 +- Mage.Sets/src/mage/sets/magic2011/MightyLeap.java | 2 +- Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java | 2 +- Mage.Sets/src/mage/sets/magic2011/PrimalCocoon.java | 2 +- Mage.Sets/src/mage/sets/magic2011/QuagSickness.java | 2 +- Mage.Sets/src/mage/sets/magic2011/ShivsEmbrace.java | 2 +- Mage.Sets/src/mage/sets/magic2011/StabbingPain.java | 2 +- Mage.Sets/src/mage/sets/magic2011/ThunderStrike.java | 2 +- Mage.Sets/src/mage/sets/magic2011/VengefulArchon.java | 2 +- Mage.Sets/src/mage/sets/magic2011/VisceraSeer.java | 2 +- Mage.Sets/src/mage/sets/magic2011/VolcanicStrength.java | 2 +- Mage.Sets/src/mage/sets/magic2012/AlabasterMage.java | 2 +- Mage.Sets/src/mage/sets/magic2012/AngelicDestiny.java | 2 +- Mage.Sets/src/mage/sets/magic2012/ArachnusSpinner.java | 2 +- Mage.Sets/src/mage/sets/magic2012/ArachnusWeb.java | 2 +- Mage.Sets/src/mage/sets/magic2012/CrimsonMage.java | 2 +- Mage.Sets/src/mage/sets/magic2012/CrownOfEmpires.java | 2 +- Mage.Sets/src/mage/sets/magic2012/DarkFavor.java | 2 +- Mage.Sets/src/mage/sets/magic2012/DevouringSwarm.java | 2 +- Mage.Sets/src/mage/sets/magic2012/DivineFavor.java | 2 +- Mage.Sets/src/mage/sets/magic2012/Firebreathing.java | 2 +- Mage.Sets/src/mage/sets/magic2012/Flight.java | 2 +- Mage.Sets/src/mage/sets/magic2012/GideonsLawkeeper.java | 2 +- Mage.Sets/src/mage/sets/magic2012/GoblinFireslinger.java | 2 +- Mage.Sets/src/mage/sets/magic2012/HuntersInsight.java | 2 +- Mage.Sets/src/mage/sets/magic2012/JaceMemoryAdept.java | 4 ++-- Mage.Sets/src/mage/sets/magic2012/Lifelink.java | 2 +- Mage.Sets/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 +- Mage.Sets/src/mage/sets/magic2012/ScepterOfEmpires.java | 2 +- Mage.Sets/src/mage/sets/magic2012/SorinsThirst.java | 2 +- Mage.Sets/src/mage/sets/magic2012/SorinsVengeance.java | 2 +- Mage.Sets/src/mage/sets/magic2012/SpiritMantle.java | 2 +- Mage.Sets/src/mage/sets/magic2012/StaveOff.java | 2 +- Mage.Sets/src/mage/sets/magic2012/StonehornDignitary.java | 2 +- Mage.Sets/src/mage/sets/magic2012/TasteOfBlood.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 +- Mage.Sets/src/mage/sets/magic2013/ArmsDealer.java | 2 +- Mage.Sets/src/mage/sets/magic2013/BattleflightEagle.java | 2 +- Mage.Sets/src/mage/sets/magic2013/BloodhunterBat.java | 2 +- Mage.Sets/src/mage/sets/magic2013/ChandrasFury.java | 2 +- Mage.Sets/src/mage/sets/magic2013/CourtlyProvocateur.java | 4 ++-- Mage.Sets/src/mage/sets/magic2013/CripplingBlight.java | 2 +- Mage.Sets/src/mage/sets/magic2013/GoblinBattleJester.java | 2 +- Mage.Sets/src/mage/sets/magic2013/Hydrosurge.java | 2 +- .../src/mage/sets/magic2013/LilianaOfTheDarkRealms.java | 2 +- Mage.Sets/src/mage/sets/magic2013/MarkOfTheVampire.java | 2 +- Mage.Sets/src/mage/sets/magic2013/MindSculpt.java | 2 +- Mage.Sets/src/mage/sets/magic2013/MindclawShaman.java | 2 +- Mage.Sets/src/mage/sets/magic2013/Murder.java | 2 +- Mage.Sets/src/mage/sets/magic2013/SandsOfDelirium.java | 2 +- Mage.Sets/src/mage/sets/magic2013/SerpentsGift.java | 2 +- Mage.Sets/src/mage/sets/magic2013/ShowOfValor.java | 2 +- Mage.Sets/src/mage/sets/magic2013/TricksOfTheTrade.java | 2 +- Mage.Sets/src/mage/sets/magic2013/VoidStalker.java | 2 +- Mage.Sets/src/mage/sets/magic2013/WitsEnd.java | 2 +- .../src/mage/sets/magic2014/BarrageOfExpendables.java | 2 +- Mage.Sets/src/mage/sets/magic2014/CelestialFlare.java | 2 +- Mage.Sets/src/mage/sets/magic2014/GnawingZombie.java | 2 +- Mage.Sets/src/mage/sets/magic2014/IllusionaryArmor.java | 2 +- Mage.Sets/src/mage/sets/magic2014/LifebaneZombie.java | 2 +- Mage.Sets/src/mage/sets/magic2014/VialOfPoison.java | 2 +- Mage.Sets/src/mage/sets/magic2014/ZephyrCharge.java | 2 +- .../src/mage/sets/mercadianmasques/CateranOverlord.java | 2 +- Mage.Sets/src/mage/sets/mercadianmasques/HighMarket.java | 2 +- Mage.Sets/src/mage/sets/mercadianmasques/Muzzle.java | 2 +- .../src/mage/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/BlightedShaman.java | 6 +++--- Mage.Sets/src/mage/sets/mirage/HarmattanEfreet.java | 2 +- Mage.Sets/src/mage/sets/mirage/UnseenWalker.java | 2 +- Mage.Sets/src/mage/sets/mirrodin/Arrest.java | 2 +- Mage.Sets/src/mage/sets/mirrodin/AuriokBladewarden.java | 2 +- Mage.Sets/src/mage/sets/mirrodin/Battlegrowth.java | 2 +- Mage.Sets/src/mage/sets/mirrodin/DragonBlood.java | 2 +- Mage.Sets/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 +- Mage.Sets/src/mage/sets/mirrodin/OblivionStone.java | 2 +- Mage.Sets/src/mage/sets/mirrodin/PredatorsStrike.java | 2 +- Mage.Sets/src/mage/sets/mirrodin/Regress.java | 2 +- Mage.Sets/src/mage/sets/mirrodin/ScaleOfChissGoria.java | 2 +- Mage.Sets/src/mage/sets/mirrodin/ToothOfChissGoria.java | 2 +- Mage.Sets/src/mage/sets/mirrodin/TowerOfChampions.java | 2 +- Mage.Sets/src/mage/sets/mirrodin/TowerOfMurmurs.java | 2 +- .../src/mage/sets/mirrodinbesieged/BlueSunsZenith.java | 2 +- Mage.Sets/src/mage/sets/mirrodinbesieged/BrassSquire.java | 2 +- .../src/mage/sets/mirrodinbesieged/BurntheImpure.java | 2 +- .../src/mage/sets/mirrodinbesieged/ConcussiveBolt.java | 2 +- .../mage/sets/mirrodinbesieged/CorruptedConscience.java | 2 +- Mage.Sets/src/mage/sets/mirrodinbesieged/Cryptoplasm.java | 2 +- Mage.Sets/src/mage/sets/mirrodinbesieged/DecimatorWeb.java | 2 +- .../src/mage/sets/mirrodinbesieged/FleshEaterImp.java | 2 +- Mage.Sets/src/mage/sets/mirrodinbesieged/GoreVassal.java | 2 +- .../mage/sets/mirrodinbesieged/HorrifyingRevelation.java | 2 +- Mage.Sets/src/mage/sets/mirrodinbesieged/MagneticMine.java | 2 +- Mage.Sets/src/mage/sets/mirrodinbesieged/MirranMettle.java | 2 +- Mage.Sets/src/mage/sets/mirrodinbesieged/MirranSpy.java | 2 +- Mage.Sets/src/mage/sets/mirrodinbesieged/Phyresis.java | 2 +- .../src/mage/sets/mirrodinbesieged/PierceStrider.java | 2 +- Mage.Sets/src/mage/sets/mirrodinbesieged/PistonSledge.java | 2 +- .../src/mage/sets/mirrodinbesieged/PlaguemawBeast.java | 2 +- Mage.Sets/src/mage/sets/mirrodinbesieged/Shriekhorn.java | 2 +- Mage.Sets/src/mage/sets/mirrodinbesieged/SpinEngine.java | 2 +- .../src/mage/sets/mirrodinbesieged/SpineOfIshSah.java | 2 +- .../src/mage/sets/mirrodinbesieged/SpreadTheSickness.java | 2 +- .../mage/sets/mirrodinbesieged/TezzeretAgentOfBolas.java | 2 +- .../src/mage/sets/mirrodinbesieged/UnnaturalPredation.java | 2 +- .../src/mage/sets/mirrodinbesieged/VedalkenAnatomist.java | 2 +- .../src/mage/sets/mirrodinbesieged/VirulentWound.java | 2 +- Mage.Sets/src/mage/sets/mirrodinbesieged/Vivisection.java | 2 +- Mage.Sets/src/mage/sets/modernmasters/BoundInSilence.java | 2 +- Mage.Sets/src/mage/sets/modernmasters/RiftElemental.java | 2 +- Mage.Sets/src/mage/sets/modernmasters/StonehewerGiant.java | 2 +- Mage.Sets/src/mage/sets/modernmasters/TakePossession.java | 2 +- Mage.Sets/src/mage/sets/modernmasters/ThievingSprite.java | 2 +- Mage.Sets/src/mage/sets/modernmasters/WarrenWeirding.java | 2 +- .../src/mage/sets/morningtide/BurrentonShieldBearers.java | 2 +- Mage.Sets/src/mage/sets/morningtide/DailyRegimen.java | 2 +- Mage.Sets/src/mage/sets/morningtide/Earthbrawn.java | 2 +- Mage.Sets/src/mage/sets/morningtide/GiltLeafArchdruid.java | 2 +- Mage.Sets/src/mage/sets/morningtide/Meadowboon.java | 2 +- Mage.Sets/src/mage/sets/morningtide/ScarbladeElite.java | 2 +- Mage.Sets/src/mage/sets/morningtide/Slithermuse.java | 2 +- Mage.Sets/src/mage/sets/morningtide/VendilionClique.java | 2 +- Mage.Sets/src/mage/sets/nemesis/SealOfRemoval.java | 2 +- Mage.Sets/src/mage/sets/nemesis/SealOfStrength.java | 2 +- Mage.Sets/src/mage/sets/nemesis/ViciousHunger.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/ActOfAggression.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/ArgentMutation.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/BeastWithin.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/BirthingPod.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/BlindingSouleater.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/CaressOfPhyrexia.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/DeceiverExarch.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/DefensiveStance.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/DementiaBat.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/Despise.java | 2 +- Mage.Sets/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 +- Mage.Sets/src/mage/sets/newphyrexia/EntomberExarch.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/EtchedMonstrosity.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/ForcedWorship.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/GethsVerdict.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/GitaxianProbe.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/GlisteningOil.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/GreenhiltTrainee.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/GrimAffliction.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/HexParasite.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/IchorExplosion.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/InquisitorExarch.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/LifesFinale.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/Mindculling.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/MortisDogs.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/MutagenicGrowth.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/ParasiticImplant.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/PithDriller.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/PraetorsGrasp.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/ScrapyardSalvo.java | 2 +- .../src/mage/sets/newphyrexia/ShrineOfLimitlessPower.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/SoulConduit.java | 4 ++-- .../src/mage/sets/newphyrexia/SwordOfWarAndPeace.java | 2 +- Mage.Sets/src/mage/sets/newphyrexia/TormentorExarch.java | 4 ++-- Mage.Sets/src/mage/sets/ninthedition/AvenWindreader.java | 2 +- Mage.Sets/src/mage/sets/ninthedition/ContaminatedBond.java | 2 +- Mage.Sets/src/mage/sets/ninthedition/EarlyHarvest.java | 2 +- Mage.Sets/src/mage/sets/ninthedition/Enrage.java | 2 +- Mage.Sets/src/mage/sets/ninthedition/GravePact.java | 2 +- Mage.Sets/src/mage/sets/ninthedition/TemporalAdept.java | 2 +- Mage.Sets/src/mage/sets/odyssey/AboshansDesire.java | 2 +- Mage.Sets/src/mage/sets/odyssey/AegisOfHonor.java | 2 +- Mage.Sets/src/mage/sets/odyssey/DevotedCaretaker.java | 3 +-- Mage.Sets/src/mage/sets/odyssey/DruidsCall.java | 2 +- Mage.Sets/src/mage/sets/odyssey/Extract.java | 2 +- Mage.Sets/src/mage/sets/odyssey/ImmobilizingInk.java | 2 +- Mage.Sets/src/mage/sets/odyssey/KamahlsDesire.java | 2 +- Mage.Sets/src/mage/sets/odyssey/NantukoDisciple.java | 2 +- Mage.Sets/src/mage/sets/odyssey/PatriarchsDesire.java | 2 +- Mage.Sets/src/mage/sets/odyssey/PrimalFrenzy.java | 2 +- Mage.Sets/src/mage/sets/odyssey/PsionicGift.java | 2 +- Mage.Sets/src/mage/sets/odyssey/Repel.java | 2 +- Mage.Sets/src/mage/sets/odyssey/SkullFracture.java | 2 +- Mage.Sets/src/mage/sets/odyssey/SparkMage.java | 2 +- Mage.Sets/src/mage/sets/odyssey/ThermalBlast.java | 2 +- Mage.Sets/src/mage/sets/onslaught/AstralSlide.java | 2 +- Mage.Sets/src/mage/sets/onslaught/CatapultMaster.java | 2 +- Mage.Sets/src/mage/sets/onslaught/Sparksmith.java | 2 +- Mage.Sets/src/mage/sets/onslaught/SupremeInquisitor.java | 2 +- Mage.Sets/src/mage/sets/onslaught/WordsOfWind.java | 2 +- Mage.Sets/src/mage/sets/planarchaos/DawnCharm.java | 2 +- Mage.Sets/src/mage/sets/planarchaos/FatalFrenzy.java | 2 +- Mage.Sets/src/mage/sets/planarchaos/FuryCharm.java | 2 +- Mage.Sets/src/mage/sets/planarchaos/KeenSense.java | 2 +- Mage.Sets/src/mage/sets/planarchaos/NecroticSliver.java | 2 +- Mage.Sets/src/mage/sets/planarchaos/RathiTrapper.java | 2 +- Mage.Sets/src/mage/sets/planarchaos/SaltfieldRecluse.java | 2 +- Mage.Sets/src/mage/sets/planechase/BogardanRager.java | 2 +- Mage.Sets/src/mage/sets/planechase/CranialPlating.java | 2 +- Mage.Sets/src/mage/sets/planechase/DoorToNothingness.java | 2 +- Mage.Sets/src/mage/sets/planechase/EtchedOracle.java | 2 +- Mage.Sets/src/mage/sets/planechase/FiresOfYavimaya.java | 2 +- Mage.Sets/src/mage/sets/planechase/FlametongueKavu.java | 2 +- Mage.Sets/src/mage/sets/planechase/PhyrexianGhoul.java | 2 +- .../src/mage/sets/planechase/RaziaBorosArchangel.java | 4 ++-- Mage.Sets/src/mage/sets/planechase/RecklessCharge.java | 2 +- .../mage/sets/planechase/SunhomeFortressOfTheLegion.java | 2 +- Mage.Sets/src/mage/sets/planechase2012/FelidarUmbra.java | 4 ++-- Mage.Sets/src/mage/sets/planechase2012/IndrikUmbra.java | 2 +- .../src/mage/sets/planechase2012/KrondTheDawnClad.java | 2 +- .../src/mage/sets/planechase2012/PollenbrightWings.java | 2 +- Mage.Sets/src/mage/sets/planeshift/GaeasMight.java | 2 +- Mage.Sets/src/mage/sets/planeshift/OrimsChant.java | 2 +- .../src/mage/sets/portalthreekingdoms/BurningOfXinye.java | 2 +- Mage.Sets/src/mage/sets/prophecy/AgentOfShauku.java | 2 +- Mage.Sets/src/mage/sets/prophecy/ShieldDancer.java | 2 +- Mage.Sets/src/mage/sets/prophecy/VerdantField.java | 2 +- Mage.Sets/src/mage/sets/ravnika/BorosGuildmage.java | 4 ++-- Mage.Sets/src/mage/sets/ravnika/Caregiver.java | 2 +- Mage.Sets/src/mage/sets/ravnika/ClingingDarkness.java | 2 +- Mage.Sets/src/mage/sets/ravnika/ClutchOfTheUndercity.java | 2 +- Mage.Sets/src/mage/sets/ravnika/CompulsiveResearch.java | 2 +- Mage.Sets/src/mage/sets/ravnika/ConsultTheNecrosages.java | 4 ++-- Mage.Sets/src/mage/sets/ravnika/CyclopeanSnare.java | 2 +- Mage.Sets/src/mage/sets/ravnika/Darkblast.java | 2 +- Mage.Sets/src/mage/sets/ravnika/DimirGuildmage.java | 4 ++-- Mage.Sets/src/mage/sets/ravnika/DimirHouseGuard.java | 2 +- Mage.Sets/src/mage/sets/ravnika/DizzySpell.java | 2 +- .../src/mage/sets/ravnika/DuskmantleHouseOfShadow.java | 2 +- Mage.Sets/src/mage/sets/ravnika/ElvishSkysweeper.java | 2 +- Mage.Sets/src/mage/sets/ravnika/EtherealUsher.java | 2 +- Mage.Sets/src/mage/sets/ravnika/FieryConclusion.java | 4 ++-- Mage.Sets/src/mage/sets/ravnika/FistsOfIronwood.java | 2 +- Mage.Sets/src/mage/sets/ravnika/FlightOfFancy.java | 2 +- Mage.Sets/src/mage/sets/ravnika/GalvanicArc.java | 2 +- Mage.Sets/src/mage/sets/ravnika/GatherCourage.java | 2 +- Mage.Sets/src/mage/sets/ravnika/GlimpseTheUnthinkable.java | 2 +- Mage.Sets/src/mage/sets/ravnika/GolgariGuildmage.java | 4 ++-- Mage.Sets/src/mage/sets/ravnika/GolgariRotwurm.java | 4 ++-- Mage.Sets/src/mage/sets/ravnika/HuntedDragon.java | 2 +- Mage.Sets/src/mage/sets/ravnika/HuntedHorror.java | 2 +- Mage.Sets/src/mage/sets/ravnika/HuntedLammasu.java | 2 +- Mage.Sets/src/mage/sets/ravnika/HuntedPhantasm.java | 2 +- Mage.Sets/src/mage/sets/ravnika/HuntedTroll.java | 2 +- Mage.Sets/src/mage/sets/ravnika/InfectiousHost.java | 2 +- Mage.Sets/src/mage/sets/ravnika/IvyDancer.java | 2 +- Mage.Sets/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 +- Mage.Sets/src/mage/sets/ravnika/MoldervineCloak.java | 2 +- Mage.Sets/src/mage/sets/ravnika/Sandsower.java | 2 +- Mage.Sets/src/mage/sets/ravnika/ShamblingShell.java | 2 +- Mage.Sets/src/mage/sets/ravnika/Ursapine.java | 2 +- Mage.Sets/src/mage/sets/ravnika/VedalkenDismisser.java | 2 +- Mage.Sets/src/mage/sets/ravnika/VedalkenEntrancer.java | 2 +- Mage.Sets/src/mage/sets/returntoravnica/AquusSteed.java | 2 +- .../src/mage/sets/returntoravnica/AssassinsStrike.java | 2 +- Mage.Sets/src/mage/sets/returntoravnica/AugerSpree.java | 2 +- Mage.Sets/src/mage/sets/returntoravnica/ChorusOfMight.java | 2 +- Mage.Sets/src/mage/sets/returntoravnica/CodexShredder.java | 2 +- .../src/mage/sets/returntoravnica/DeathsPresence.java | 2 +- Mage.Sets/src/mage/sets/returntoravnica/DeviantGlee.java | 2 +- Mage.Sets/src/mage/sets/returntoravnica/Doorkeeper.java | 2 +- .../src/mage/sets/returntoravnica/DrainpipeVermin.java | 2 +- .../src/mage/sets/returntoravnica/DramaticRescue.java | 2 +- Mage.Sets/src/mage/sets/returntoravnica/Dynacharge.java | 2 +- Mage.Sets/src/mage/sets/returntoravnica/GuildFeud.java | 2 +- .../src/mage/sets/returntoravnica/HellholeFlailer.java | 2 +- Mage.Sets/src/mage/sets/returntoravnica/Inspiration.java | 2 +- Mage.Sets/src/mage/sets/returntoravnica/IzzetCharm.java | 2 +- .../src/mage/sets/returntoravnica/IzzetStaticaster.java | 2 +- .../mage/sets/returntoravnica/JaceArchitectOfThought.java | 2 +- Mage.Sets/src/mage/sets/returntoravnica/KnightlyValor.java | 2 +- .../src/mage/sets/returntoravnica/KorozdaGuildmage.java | 2 +- Mage.Sets/src/mage/sets/returntoravnica/LaunchParty.java | 4 ++-- .../src/mage/sets/returntoravnica/MercurialChemister.java | 2 +- .../src/mage/sets/returntoravnica/NewPrahvGuildmage.java | 2 +- Mage.Sets/src/mage/sets/returntoravnica/PsychicSpiral.java | 2 +- .../src/mage/sets/returntoravnica/PursuitOfFlight.java | 2 +- .../src/mage/sets/returntoravnica/RacecourseFury.java | 2 +- Mage.Sets/src/mage/sets/returntoravnica/RakdosCharm.java | 2 +- Mage.Sets/src/mage/sets/returntoravnica/RakdossReturn.java | 2 +- .../src/mage/sets/returntoravnica/RighteousAuthority.java | 2 +- Mage.Sets/src/mage/sets/returntoravnica/RoguesPassage.java | 2 +- Mage.Sets/src/mage/sets/returntoravnica/SavageSurge.java | 2 +- Mage.Sets/src/mage/sets/returntoravnica/SearchWarrant.java | 2 +- Mage.Sets/src/mage/sets/returntoravnica/SelesnyaCharm.java | 2 +- .../src/mage/sets/returntoravnica/SlaughterGames.java | 2 +- Mage.Sets/src/mage/sets/returntoravnica/StabWound.java | 2 +- Mage.Sets/src/mage/sets/returntoravnica/Teleportal.java | 2 +- .../src/mage/sets/returntoravnica/TrostanisJudgment.java | 2 +- Mage.Sets/src/mage/sets/returntoravnica/Voidwielder.java | 2 +- Mage.Sets/src/mage/sets/revisededition/DesertTwister.java | 2 +- .../src/mage/sets/riseoftheeldrazi/AffaGuardHound.java | 2 +- Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraFinesse.java | 2 +- .../src/mage/sets/riseoftheeldrazi/BattleRampart.java | 2 +- .../src/mage/sets/riseoftheeldrazi/BattleRattleShaman.java | 2 +- Mage.Sets/src/mage/sets/riseoftheeldrazi/BearUmbra.java | 2 +- .../src/mage/sets/riseoftheeldrazi/BloodriteInvoker.java | 2 +- .../src/mage/sets/riseoftheeldrazi/BloodthroneVampire.java | 2 +- Mage.Sets/src/mage/sets/riseoftheeldrazi/BoarUmbra.java | 2 +- Mage.Sets/src/mage/sets/riseoftheeldrazi/Bramblesnap.java | 2 +- .../mage/sets/riseoftheeldrazi/ConqueringManticore.java | 2 +- .../src/mage/sets/riseoftheeldrazi/ConsumingVapors.java | 2 +- Mage.Sets/src/mage/sets/riseoftheeldrazi/CrabUmbra.java | 2 +- .../src/mage/sets/riseoftheeldrazi/DawnglareInvoker.java | 2 +- Mage.Sets/src/mage/sets/riseoftheeldrazi/DeathCultist.java | 2 +- .../src/mage/sets/riseoftheeldrazi/DeathlessAngel.java | 2 +- .../src/mage/sets/riseoftheeldrazi/DemonicAppetite.java | 2 +- .../src/mage/sets/riseoftheeldrazi/DistortionStrike.java | 2 +- .../src/mage/sets/riseoftheeldrazi/Domestication.java | 2 +- Mage.Sets/src/mage/sets/riseoftheeldrazi/DrakeUmbra.java | 2 +- .../sets/riseoftheeldrazi/DranaKalastriaBloodchief.java | 2 +- Mage.Sets/src/mage/sets/riseoftheeldrazi/EelUmbra.java | 2 +- Mage.Sets/src/mage/sets/riseoftheeldrazi/ElandUmbra.java | 2 +- .../mage/sets/riseoftheeldrazi/EldraziConscription.java | 2 +- .../src/mage/sets/riseoftheeldrazi/EmergeUnscathed.java | 2 +- Mage.Sets/src/mage/sets/riseoftheeldrazi/EssenceFeed.java | 2 +- Mage.Sets/src/mage/sets/riseoftheeldrazi/FlameSlash.java | 2 +- .../mage/sets/riseoftheeldrazi/FleetingDistraction.java | 2 +- Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java | 2 +- .../src/mage/sets/riseoftheeldrazi/Gigantomancer.java | 2 +- Mage.Sets/src/mage/sets/riseoftheeldrazi/GuardDuty.java | 2 +- .../src/mage/sets/riseoftheeldrazi/GuulDrazAssassin.java | 4 ++-- Mage.Sets/src/mage/sets/riseoftheeldrazi/HeatRay.java | 2 +- Mage.Sets/src/mage/sets/riseoftheeldrazi/HyenaUmbra.java | 2 +- .../src/mage/sets/riseoftheeldrazi/InduceDespair.java | 2 +- .../src/mage/sets/riseoftheeldrazi/IrresistiblePrey.java | 2 +- Mage.Sets/src/mage/sets/riseoftheeldrazi/KeeningStone.java | 2 +- Mage.Sets/src/mage/sets/riseoftheeldrazi/LastKiss.java | 2 +- Mage.Sets/src/mage/sets/riseoftheeldrazi/LuminousWake.java | 2 +- Mage.Sets/src/mage/sets/riseoftheeldrazi/LustForWar.java | 2 +- Mage.Sets/src/mage/sets/riseoftheeldrazi/MammothUmbra.java | 2 +- .../src/mage/sets/riseoftheeldrazi/MerfolkObserver.java | 2 +- .../src/mage/sets/riseoftheeldrazi/MerfolkSkyscout.java | 2 +- .../src/mage/sets/riseoftheeldrazi/MightOfTheMasses.java | 2 +- .../src/mage/sets/riseoftheeldrazi/MomentousFall.java | 2 +- Mage.Sets/src/mage/sets/riseoftheeldrazi/Nighthaze.java | 2 +- Mage.Sets/src/mage/sets/riseoftheeldrazi/Oust.java | 2 +- .../src/mage/sets/riseoftheeldrazi/PerishTheThought.java | 2 +- .../src/mage/sets/riseoftheeldrazi/PreysVengeance.java | 2 +- Mage.Sets/src/mage/sets/riseoftheeldrazi/RageNimbus.java | 2 +- .../src/mage/sets/riseoftheeldrazi/RecurringInsight.java | 2 +- .../src/mage/sets/riseoftheeldrazi/SarkhanTheMad.java | 4 ++-- Mage.Sets/src/mage/sets/riseoftheeldrazi/SnakeUmbra.java | 2 +- Mage.Sets/src/mage/sets/riseoftheeldrazi/SpiderUmbra.java | 2 +- Mage.Sets/src/mage/sets/riseoftheeldrazi/SplinterTwin.java | 2 +- .../src/mage/sets/riseoftheeldrazi/SufferThePast.java | 2 +- .../src/mage/sets/riseoftheeldrazi/TraitorousInstinct.java | 2 +- Mage.Sets/src/mage/sets/riseoftheeldrazi/VentSentinel.java | 2 +- .../src/mage/sets/riseoftheeldrazi/WildheartInvoker.java | 2 +- .../src/mage/sets/saviorsofkamigawa/AkkiDrillmaster.java | 2 +- Mage.Sets/src/mage/sets/saviorsofkamigawa/BloodClock.java | 3 +-- .../src/mage/sets/saviorsofkamigawa/BriarknitKami.java | 2 +- .../src/mage/sets/saviorsofkamigawa/CaptiveFlame.java | 2 +- .../src/mage/sets/saviorsofkamigawa/FreedFromTheReal.java | 2 +- .../src/mage/sets/saviorsofkamigawa/GhostLitNourisher.java | 2 +- .../src/mage/sets/saviorsofkamigawa/GhostLitRaider.java | 4 ++-- .../src/mage/sets/saviorsofkamigawa/GhostLitStalker.java | 4 ++-- .../src/mage/sets/saviorsofkamigawa/GodosIrregulars.java | 2 +- Mage.Sets/src/mage/sets/saviorsofkamigawa/KemuriOnna.java | 2 +- Mage.Sets/src/mage/sets/saviorsofkamigawa/KiriOnna.java | 2 +- .../src/mage/sets/saviorsofkamigawa/KitsuneDawnblade.java | 2 +- Mage.Sets/src/mage/sets/saviorsofkamigawa/MoltingSkin.java | 2 +- .../mage/sets/saviorsofkamigawa/ShinenOfFearsChill.java | 2 +- .../mage/sets/saviorsofkamigawa/ShinenOfFlightsWings.java | 2 +- .../src/mage/sets/saviorsofkamigawa/ShinenOfFurysFire.java | 2 +- .../src/mage/sets/saviorsofkamigawa/ShinenOfLifesRoar.java | 2 +- .../mage/sets/saviorsofkamigawa/ShinenOfStarsLight.java | 2 +- .../mage/sets/saviorsofkamigawa/WineOfBloodAndIron.java | 2 +- Mage.Sets/src/mage/sets/scarsofmirrodin/ArgentumArmor.java | 2 +- Mage.Sets/src/mage/sets/scarsofmirrodin/AssaultStrobe.java | 2 +- .../src/mage/sets/scarsofmirrodin/BleakCovenVampires.java | 2 +- .../src/mage/sets/scarsofmirrodin/BloodshotTrainee.java | 2 +- .../src/mage/sets/scarsofmirrodin/BondsOfQuicksilver.java | 2 +- .../src/mage/sets/scarsofmirrodin/CerebralEruption.java | 2 +- .../src/mage/sets/scarsofmirrodin/ContagionClasp.java | 2 +- .../src/mage/sets/scarsofmirrodin/ContagionEngine.java | 2 +- .../src/mage/sets/scarsofmirrodin/CorruptedHarvester.java | 2 +- Mage.Sets/src/mage/sets/scarsofmirrodin/CullingDais.java | 2 +- .../src/mage/sets/scarsofmirrodin/DispenseJustice.java | 2 +- Mage.Sets/src/mage/sets/scarsofmirrodin/DrossHopper.java | 2 +- Mage.Sets/src/mage/sets/scarsofmirrodin/FleshAllergy.java | 4 ++-- .../src/mage/sets/scarsofmirrodin/FlightSpellbomb.java | 2 +- Mage.Sets/src/mage/sets/scarsofmirrodin/FumeSpitter.java | 2 +- .../src/mage/sets/scarsofmirrodin/GlimmerpointStag.java | 2 +- .../src/mage/sets/scarsofmirrodin/GraspOfDarkness.java | 2 +- Mage.Sets/src/mage/sets/scarsofmirrodin/Grindclock.java | 2 +- .../src/mage/sets/scarsofmirrodin/HandOfThePraetors.java | 2 +- .../src/mage/sets/scarsofmirrodin/InstillInfection.java | 2 +- .../src/mage/sets/scarsofmirrodin/LiquimetalCoating.java | 2 +- .../src/mage/sets/scarsofmirrodin/LumengridDrake.java | 2 +- Mage.Sets/src/mage/sets/scarsofmirrodin/LuxCannon.java | 2 +- Mage.Sets/src/mage/sets/scarsofmirrodin/Memoricide.java | 2 +- .../src/mage/sets/scarsofmirrodin/NecrogenCenser.java | 2 +- Mage.Sets/src/mage/sets/scarsofmirrodin/Necropede.java | 2 +- .../src/mage/sets/scarsofmirrodin/NeurokInvisimancer.java | 2 +- Mage.Sets/src/mage/sets/scarsofmirrodin/NeurokReplica.java | 2 +- .../src/mage/sets/scarsofmirrodin/NihilSpellbomb.java | 2 +- Mage.Sets/src/mage/sets/scarsofmirrodin/Painsmith.java | 2 +- .../src/mage/sets/scarsofmirrodin/PanicSpellbomb.java | 2 +- Mage.Sets/src/mage/sets/scarsofmirrodin/PsychicMiasma.java | 2 +- .../mage/sets/scarsofmirrodin/QuicksilverGargantuan.java | 2 +- .../src/mage/sets/scarsofmirrodin/SeizeTheInitiative.java | 2 +- Mage.Sets/src/mage/sets/scarsofmirrodin/Skinrender.java | 2 +- Mage.Sets/src/mage/sets/scarsofmirrodin/TaintedStrike.java | 2 +- Mage.Sets/src/mage/sets/scarsofmirrodin/TangleAngler.java | 2 +- .../src/mage/sets/scarsofmirrodin/TelJiladDefiance.java | 2 +- .../src/mage/sets/scarsofmirrodin/TowerOfCalamities.java | 2 +- .../src/mage/sets/scarsofmirrodin/TrigonOfCorruption.java | 2 +- Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfRage.java | 2 +- Mage.Sets/src/mage/sets/scarsofmirrodin/TurnToSlag.java | 2 +- Mage.Sets/src/mage/sets/scarsofmirrodin/TwistedImage.java | 2 +- Mage.Sets/src/mage/sets/scarsofmirrodin/UntamedMight.java | 2 +- Mage.Sets/src/mage/sets/scarsofmirrodin/VaultSkyward.java | 2 +- .../src/mage/sets/scarsofmirrodin/VenserTheSojourner.java | 4 ++-- Mage.Sets/src/mage/sets/scarsofmirrodin/VolitionReins.java | 2 +- .../src/mage/sets/scarsofmirrodin/VulshokHeartstoker.java | 2 +- .../src/mage/sets/scarsofmirrodin/VulshokReplica.java | 2 +- Mage.Sets/src/mage/sets/scarsofmirrodin/WingPuncture.java | 2 +- .../src/mage/sets/scarsofmirrodin/WithstandDeath.java | 2 +- Mage.Sets/src/mage/sets/scourge/AstralSteel.java | 2 +- Mage.Sets/src/mage/sets/scourge/BrainFreeze.java | 2 +- Mage.Sets/src/mage/sets/scourge/CarrionFeeder.java | 2 +- Mage.Sets/src/mage/sets/scourge/Scattershot.java | 2 +- Mage.Sets/src/mage/sets/scourge/TemporalFissure.java | 2 +- Mage.Sets/src/mage/sets/scourge/TendrilsOfAgony.java | 2 +- Mage.Sets/src/mage/sets/scourge/WingShards.java | 2 +- Mage.Sets/src/mage/sets/scourge/WirewoodSymbiote.java | 2 +- Mage.Sets/src/mage/sets/seventhedition/FallenAngel.java | 2 +- Mage.Sets/src/mage/sets/seventhedition/FlyingCarpet.java | 2 +- Mage.Sets/src/mage/sets/seventhedition/HealingSalve.java | 2 +- .../src/mage/sets/seventhedition/MonstrousGrowth.java | 2 +- Mage.Sets/src/mage/sets/seventhedition/SpiritLink.java | 2 +- Mage.Sets/src/mage/sets/seventhedition/StreamOfLife.java | 2 +- Mage.Sets/src/mage/sets/shadowmoor/AphoticWisps.java | 2 +- Mage.Sets/src/mage/sets/shadowmoor/BitingTether.java | 2 +- Mage.Sets/src/mage/sets/shadowmoor/CeruleanWisps.java | 2 +- Mage.Sets/src/mage/sets/shadowmoor/CrimsonWisps.java | 2 +- Mage.Sets/src/mage/sets/shadowmoor/CultbrandCinder.java | 2 +- Mage.Sets/src/mage/sets/shadowmoor/FistsOfTheDemigod.java | 2 +- Mage.Sets/src/mage/sets/shadowmoor/GnarledEffigy.java | 2 +- Mage.Sets/src/mage/sets/shadowmoor/HelmOfTheGhastlord.java | 2 +- Mage.Sets/src/mage/sets/shadowmoor/MistmeadowWitch.java | 2 +- Mage.Sets/src/mage/sets/shadowmoor/NiveousWisps.java | 2 +- Mage.Sets/src/mage/sets/shadowmoor/PrisonTerm.java | 2 +- Mage.Sets/src/mage/sets/shadowmoor/PunctureBolt.java | 2 +- Mage.Sets/src/mage/sets/shadowmoor/ReaperKing.java | 2 +- Mage.Sets/src/mage/sets/shadowmoor/Reknit.java | 2 +- Mage.Sets/src/mage/sets/shadowmoor/RevelsongHorn.java | 4 ++-- Mage.Sets/src/mage/sets/shadowmoor/RunesOfTheDeus.java | 2 +- Mage.Sets/src/mage/sets/shadowmoor/Scar.java | 2 +- Mage.Sets/src/mage/sets/shadowmoor/SeedcradleWitch.java | 2 +- .../src/mage/sets/shadowmoor/ShieldOfTheOversoul.java | 2 +- Mage.Sets/src/mage/sets/shadowmoor/Somnomancer.java | 2 +- Mage.Sets/src/mage/sets/shadowmoor/SteelOfTheGodhead.java | 2 +- Mage.Sets/src/mage/sets/shadowmoor/TurnToMist.java | 2 +- Mage.Sets/src/mage/sets/shadowmoor/ViridescentWisps.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/AjaniVengeant.java | 4 ++-- .../src/mage/sets/shardsofalara/AngelicBenediction.java | 2 +- .../src/mage/sets/shardsofalara/BanewaspAffliction.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/BantBattlemage.java | 4 ++-- Mage.Sets/src/mage/sets/shardsofalara/BantCharm.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/BlisterBeetle.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/BloodCultist.java | 2 +- .../src/mage/sets/shardsofalara/BloodpyreElemental.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/BoneSplinters.java | 4 ++-- Mage.Sets/src/mage/sets/shardsofalara/CallToHeel.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/CatharticAdept.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/CovenantOfMinds.java | 2 +- .../src/mage/sets/shardsofalara/CradleOfVitality.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/CruelUltimatum.java | 2 +- .../src/mage/sets/shardsofalara/ElspethKnightErrant.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/EsperBattlemage.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/EsperCharm.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/Excommunicate.java | 2 +- .../src/mage/sets/shardsofalara/ExuberantFirestoker.java | 2 +- .../src/mage/sets/shardsofalara/GrixisBattlemage.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/GrixisCharm.java | 4 ++-- Mage.Sets/src/mage/sets/shardsofalara/HissingIguanar.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/JundBattlemage.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/JundCharm.java | 4 ++-- Mage.Sets/src/mage/sets/shardsofalara/KissOfTheAmesha.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/LightningTalons.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/MagmaSpray.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/NayaBattlemage.java | 4 ++-- Mage.Sets/src/mage/sets/shardsofalara/NayaCharm.java | 4 ++-- Mage.Sets/src/mage/sets/shardsofalara/OnyxGoblet.java | 2 +- .../src/mage/sets/shardsofalara/RelicOfProgenitus.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/ResoundingRoar.java | 2 +- .../src/mage/sets/shardsofalara/ResoundingScream.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/ResoundingWave.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/SangriteSurge.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/SarkhanVol.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/SavageHunger.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/SigilBlessing.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/SkeletalKathari.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/Skeletonize.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/SoulsFire.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/SoulsGrace.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/SoulsMight.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/TarFiend.java | 2 +- .../src/mage/sets/shardsofalara/ThoughtcutterAgent.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/VeinDrinker.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/ViciousShadows.java | 2 +- Mage.Sets/src/mage/sets/shardsofalara/WelkinGuide.java | 2 +- Mage.Sets/src/mage/sets/tempest/AdvanceScout.java | 2 +- Mage.Sets/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 +- Mage.Sets/src/mage/sets/tempest/CommanderGrevenIlVec.java | 2 +- Mage.Sets/src/mage/sets/tempest/CrownOfFlames.java | 2 +- Mage.Sets/src/mage/sets/tempest/DiabolicEdict.java | 2 +- Mage.Sets/src/mage/sets/tempest/ElvishFury.java | 2 +- Mage.Sets/src/mage/sets/tempest/Enfeeblement.java | 2 +- Mage.Sets/src/mage/sets/tempest/FeveredConvulsions.java | 2 +- Mage.Sets/src/mage/sets/tempest/FrogTongue.java | 2 +- Mage.Sets/src/mage/sets/tempest/GaseousForm.java | 2 +- Mage.Sets/src/mage/sets/tempest/GiantStrength.java | 2 +- Mage.Sets/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 +- Mage.Sets/src/mage/sets/tempest/NaturalSpring.java | 2 +- Mage.Sets/src/mage/sets/tempest/PuppetStrings.java | 2 +- Mage.Sets/src/mage/sets/tempest/RootwaterMatriarch.java | 2 +- Mage.Sets/src/mage/sets/tempest/SeekerOfSkybreak.java | 2 +- Mage.Sets/src/mage/sets/tempest/ShimmeringWings.java | 2 +- Mage.Sets/src/mage/sets/tempest/SpikeDrone.java | 2 +- Mage.Sets/src/mage/sets/tempest/SpontaneousCombustion.java | 2 +- Mage.Sets/src/mage/sets/tempest/SqueesToy.java | 2 +- Mage.Sets/src/mage/sets/tempest/TimeEbb.java | 2 +- Mage.Sets/src/mage/sets/tempest/TortureChamber.java | 2 +- Mage.Sets/src/mage/sets/tempest/TradewindRider.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 +- Mage.Sets/src/mage/sets/tenth/AmbassadorLaquatus.java | 2 +- Mage.Sets/src/mage/sets/tenth/AngelicBlessing.java | 2 +- Mage.Sets/src/mage/sets/tenth/ArcaneTeachings.java | 2 +- Mage.Sets/src/mage/sets/tenth/BeaconOfImmortality.java | 2 +- Mage.Sets/src/mage/sets/tenth/BlanchwoodArmor.java | 2 +- Mage.Sets/src/mage/sets/tenth/Boomerang.java | 2 +- Mage.Sets/src/mage/sets/tenth/CruelEdict.java | 2 +- Mage.Sets/src/mage/sets/tenth/Dehydration.java | 2 +- Mage.Sets/src/mage/sets/tenth/Fear.java | 2 +- Mage.Sets/src/mage/sets/tenth/FistsOfTheAnvil.java | 2 +- Mage.Sets/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/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/LavaAxe.java | 2 +- Mage.Sets/src/mage/sets/tenth/Megrim.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/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/RazormaneMasticore.java | 2 +- Mage.Sets/src/mage/sets/tenth/RobeOfMirrors.java | 2 +- Mage.Sets/src/mage/sets/tenth/SerrasEmbrace.java | 2 +- Mage.Sets/src/mage/sets/tenth/SoulFeast.java | 2 +- Mage.Sets/src/mage/sets/tenth/SpittingEarth.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/Traumatize.java | 2 +- Mage.Sets/src/mage/sets/tenth/UnholyStrength.java | 2 +- Mage.Sets/src/mage/sets/tenth/VedalkenMastermind.java | 2 +- Mage.Sets/src/mage/sets/thedark/BarlsCage.java | 2 +- Mage.Sets/src/mage/sets/thedark/Venom.java | 2 +- Mage.Sets/src/mage/sets/theros/AqueousForm.java | 2 +- Mage.Sets/src/mage/sets/theros/BowOfNylea.java | 2 +- Mage.Sets/src/mage/sets/theros/ChosenByHeliod.java | 2 +- Mage.Sets/src/mage/sets/theros/DragonMantle.java | 2 +- Mage.Sets/src/mage/sets/theros/FateForetold.java | 2 +- Mage.Sets/src/mage/sets/theros/FeralInvocation.java | 2 +- Mage.Sets/src/mage/sets/theros/GiftOfImmortality.java | 2 +- Mage.Sets/src/mage/sets/theros/MessengersSpeed.java | 2 +- Mage.Sets/src/mage/sets/theros/MogissMarauder.java | 2 +- Mage.Sets/src/mage/sets/theros/OrdealOfErebos.java | 2 +- Mage.Sets/src/mage/sets/theros/OrdealOfHeliod.java | 2 +- Mage.Sets/src/mage/sets/theros/OrdealOfNylea.java | 2 +- Mage.Sets/src/mage/sets/theros/OrdealOfPurphoros.java | 2 +- Mage.Sets/src/mage/sets/theros/OrdealOfThassa.java | 2 +- Mage.Sets/src/mage/sets/theros/PsychicIntrusion.java | 2 +- Mage.Sets/src/mage/sets/theros/Scourgemark.java | 2 +- Mage.Sets/src/mage/sets/theros/VipersKiss.java | 2 +- Mage.Sets/src/mage/sets/timeshifted/FireWhip.java | 2 +- Mage.Sets/src/mage/sets/timeshifted/FuneralCharm.java | 6 +++--- Mage.Sets/src/mage/sets/timeshifted/SpikeFeeder.java | 2 +- Mage.Sets/src/mage/sets/timeshifted/Stupor.java | 2 +- Mage.Sets/src/mage/sets/timeshifted/TormodsCrypt.java | 2 +- Mage.Sets/src/mage/sets/timespiral/AncestralVision.java | 2 +- Mage.Sets/src/mage/sets/timespiral/AspectOfMongoose.java | 2 +- Mage.Sets/src/mage/sets/timespiral/Bewilder.java | 2 +- Mage.Sets/src/mage/sets/timespiral/EternitySnare.java | 2 +- Mage.Sets/src/mage/sets/timespiral/GriffinGuide.java | 2 +- Mage.Sets/src/mage/sets/timespiral/IgniteMemories.java | 2 +- Mage.Sets/src/mage/sets/timespiral/LightningAxe.java | 2 +- Mage.Sets/src/mage/sets/timespiral/MangaraOfCorondor.java | 2 +- Mage.Sets/src/mage/sets/timespiral/MightOfOldKrosa.java | 2 +- Mage.Sets/src/mage/sets/timespiral/MomentaryBlink.java | 2 +- Mage.Sets/src/mage/sets/timespiral/RiftwingCloudskate.java | 2 +- Mage.Sets/src/mage/sets/timespiral/StuffyDoll.java | 2 +- Mage.Sets/src/mage/sets/timespiral/SuddenSpoiling.java | 2 +- Mage.Sets/src/mage/sets/timespiral/TemporalIsolation.java | 2 +- Mage.Sets/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/src/mage/sets/urzasdestiny/Attrition.java | 2 +- Mage.Sets/src/mage/sets/urzasdestiny/BloodshotCyclops.java | 2 +- Mage.Sets/src/mage/sets/urzasdestiny/Extruder.java | 2 +- Mage.Sets/src/mage/sets/urzasdestiny/FodderCannon.java | 4 ++-- Mage.Sets/src/mage/sets/urzasdestiny/SigilOfSleep.java | 2 +- Mage.Sets/src/mage/sets/urzasdestiny/Treachery.java | 2 +- Mage.Sets/src/mage/sets/urzaslegacy/AboutFace.java | 2 +- Mage.Sets/src/mage/sets/urzaslegacy/BrinkOfMadness.java | 2 +- Mage.Sets/src/mage/sets/urzaslegacy/BurstOfEnergy.java | 2 +- Mage.Sets/src/mage/sets/urzaslegacy/Cessation.java | 2 +- Mage.Sets/src/mage/sets/urzaslegacy/GhituWarCry.java | 2 +- Mage.Sets/src/mage/sets/urzaslegacy/GraniteGrip.java | 2 +- Mage.Sets/src/mage/sets/urzaslegacy/IronWill.java | 2 +- Mage.Sets/src/mage/sets/urzaslegacy/MotherOfRunes.java | 2 +- Mage.Sets/src/mage/sets/urzaslegacy/Opportunity.java | 2 +- Mage.Sets/src/mage/sets/urzaslegacy/Ostracize.java | 2 +- .../src/mage/sets/urzaslegacy/PhyrexianBroodlings.java | 2 +- Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDebaser.java | 2 +- Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDefiler.java | 2 +- .../src/mage/sets/urzaslegacy/PhyrexianDenouncer.java | 2 +- .../src/mage/sets/urzaslegacy/PhyrexianPlaguelord.java | 6 +++--- Mage.Sets/src/mage/sets/urzaslegacy/Rancor.java | 2 +- Mage.Sets/src/mage/sets/urzaslegacy/Repopulate.java | 2 +- Mage.Sets/src/mage/sets/urzaslegacy/SilkNet.java | 2 +- Mage.Sets/src/mage/sets/urzaslegacy/SleepersGuile.java | 2 +- Mage.Sets/src/mage/sets/urzaslegacy/SlowMotion.java | 2 +- Mage.Sets/src/mage/sets/urzaslegacy/Sluggishness.java | 2 +- Mage.Sets/src/mage/sets/urzaslegacy/Snap.java | 2 +- Mage.Sets/src/mage/sets/urzaslegacy/WeatherseedElf.java | 2 +- Mage.Sets/src/mage/sets/urzassaga/AbyssalHorror.java | 2 +- Mage.Sets/src/mage/sets/urzassaga/BarrinMasterWizard.java | 4 ++-- Mage.Sets/src/mage/sets/urzassaga/Bravado.java | 2 +- Mage.Sets/src/mage/sets/urzassaga/Breach.java | 2 +- Mage.Sets/src/mage/sets/urzassaga/BrilliantHalo.java | 2 +- Mage.Sets/src/mage/sets/urzassaga/Bulwark.java | 2 +- Mage.Sets/src/mage/sets/urzassaga/CarpetOfFlowers.java | 2 +- Mage.Sets/src/mage/sets/urzassaga/ClawsOfGix.java | 2 +- Mage.Sets/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 +- Mage.Sets/src/mage/sets/urzassaga/GaeasEmbrace.java | 2 +- Mage.Sets/src/mage/sets/urzassaga/Pariah.java | 2 +- Mage.Sets/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/Sicken.java | 2 +- Mage.Sets/src/mage/sets/urzassaga/StrokeOfGenius.java | 2 +- Mage.Sets/src/mage/sets/urzassaga/Turnabout.java | 2 +- Mage.Sets/src/mage/sets/urzassaga/VampiricEmbrace.java | 2 +- Mage.Sets/src/mage/sets/urzassaga/ZephidsEmbrace.java | 2 +- Mage.Sets/src/mage/sets/visions/Coercion.java | 2 +- Mage.Sets/src/mage/sets/visions/DragonMask.java | 2 +- Mage.Sets/src/mage/sets/visions/Necrosavant.java | 2 +- Mage.Sets/src/mage/sets/visions/QuirionRanger.java | 2 +- Mage.Sets/src/mage/sets/visions/WandOfDenial.java | 2 +- Mage.Sets/src/mage/sets/weatherlight/Abduction.java | 2 +- Mage.Sets/src/mage/sets/weatherlight/FitOfRage.java | 2 +- Mage.Sets/src/mage/sets/weatherlight/JabarisBanner.java | 2 +- Mage.Sets/src/mage/sets/worldwake/AEtherTradewinds.java | 2 +- Mage.Sets/src/mage/sets/worldwake/BazaarTrader.java | 2 +- Mage.Sets/src/mage/sets/worldwake/BloodhuskRitualist.java | 2 +- Mage.Sets/src/mage/sets/worldwake/BrinkOfDisaster.java | 2 +- Mage.Sets/src/mage/sets/worldwake/BullRush.java | 2 +- Mage.Sets/src/mage/sets/worldwake/CanopyCover.java | 2 +- Mage.Sets/src/mage/sets/worldwake/CausticCrawler.java | 2 +- Mage.Sets/src/mage/sets/worldwake/ClawsOfValakut.java | 2 +- Mage.Sets/src/mage/sets/worldwake/CosisRavager.java | 2 +- Mage.Sets/src/mage/sets/worldwake/DeadReckoning.java | 2 +- Mage.Sets/src/mage/sets/worldwake/DeathforgeShaman.java | 2 +- Mage.Sets/src/mage/sets/worldwake/FeralContest.java | 4 ++-- Mage.Sets/src/mage/sets/worldwake/GrotagThrasher.java | 2 +- Mage.Sets/src/mage/sets/worldwake/Groundswell.java | 2 +- Mage.Sets/src/mage/sets/worldwake/HalimarExcavator.java | 2 +- Mage.Sets/src/mage/sets/worldwake/JaceTheMindSculptor.java | 6 +++--- Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java | 2 +- Mage.Sets/src/mage/sets/worldwake/RestForTheWeary.java | 2 +- Mage.Sets/src/mage/sets/worldwake/ScribNibblers.java | 2 +- Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java | 2 +- Mage.Sets/src/mage/sets/worldwake/SejiriSteppe.java | 2 +- Mage.Sets/src/mage/sets/worldwake/SmolderingSpires.java | 2 +- Mage.Sets/src/mage/sets/worldwake/TombHex.java | 2 +- Mage.Sets/src/mage/sets/worldwake/VaporSnare.java | 2 +- Mage.Sets/src/mage/sets/worldwake/VeteransReflexes.java | 2 +- Mage.Sets/src/mage/sets/zendikar/AdventuringGear.java | 2 +- Mage.Sets/src/mage/sets/zendikar/ArchiveTrap.java | 2 +- Mage.Sets/src/mage/sets/zendikar/BalaGedThief.java | 2 +- Mage.Sets/src/mage/sets/zendikar/BloodTribute.java | 2 +- Mage.Sets/src/mage/sets/zendikar/CallerOfGales.java | 2 +- Mage.Sets/src/mage/sets/zendikar/CarnageAltar.java | 2 +- Mage.Sets/src/mage/sets/zendikar/CelestialMantle.java | 2 +- Mage.Sets/src/mage/sets/zendikar/Disfigure.java | 2 +- Mage.Sets/src/mage/sets/zendikar/EldraziMonument.java | 2 +- Mage.Sets/src/mage/sets/zendikar/FeastOfBlood.java | 2 +- Mage.Sets/src/mage/sets/zendikar/GatekeeperOfMalakir.java | 2 +- Mage.Sets/src/mage/sets/zendikar/Gigantiform.java | 2 +- Mage.Sets/src/mage/sets/zendikar/GoblinShortcutter.java | 2 +- Mage.Sets/src/mage/sets/zendikar/GoblinWarPaint.java | 2 +- Mage.Sets/src/mage/sets/zendikar/GrapplingHook.java | 2 +- Mage.Sets/src/mage/sets/zendikar/HagraDiabolist.java | 2 +- Mage.Sets/src/mage/sets/zendikar/HeartstabberMosquito.java | 2 +- Mage.Sets/src/mage/sets/zendikar/HedronCrab.java | 7 ++++--- Mage.Sets/src/mage/sets/zendikar/InfernoTrap.java | 2 +- .../src/mage/sets/zendikar/KalitasBloodchiefOfGhet.java | 2 +- Mage.Sets/src/mage/sets/zendikar/KorAeronaut.java | 2 +- Mage.Sets/src/mage/sets/zendikar/KorOutfitter.java | 2 +- Mage.Sets/src/mage/sets/zendikar/MagmaRift.java | 2 +- Mage.Sets/src/mage/sets/zendikar/MarkOfMutiny.java | 2 +- Mage.Sets/src/mage/sets/zendikar/MarshCasualties.java | 2 +- Mage.Sets/src/mage/sets/zendikar/MindSludge.java | 2 +- Mage.Sets/src/mage/sets/zendikar/MireBlight.java | 2 +- Mage.Sets/src/mage/sets/zendikar/MurasaPyromancer.java | 2 +- Mage.Sets/src/mage/sets/zendikar/NarrowEscape.java | 2 +- Mage.Sets/src/mage/sets/zendikar/NeedlebiteTrap.java | 2 +- Mage.Sets/src/mage/sets/zendikar/NimbusWings.java | 2 +- Mage.Sets/src/mage/sets/zendikar/NobleVestige.java | 2 +- Mage.Sets/src/mage/sets/zendikar/ObNixilisTheFallen.java | 2 +- Mage.Sets/src/mage/sets/zendikar/ParalyzingGrasp.java | 2 +- Mage.Sets/src/mage/sets/zendikar/PiranhaMarsh.java | 2 +- Mage.Sets/src/mage/sets/zendikar/PredatoryUrge.java | 4 ++-- Mage.Sets/src/mage/sets/zendikar/PrimalBellow.java | 2 +- .../src/mage/sets/zendikar/QuestForAncientSecrets.java | 2 +- Mage.Sets/src/mage/sets/zendikar/QuestForTheGemblades.java | 2 +- Mage.Sets/src/mage/sets/zendikar/QuestForTheHolyRelic.java | 2 +- Mage.Sets/src/mage/sets/zendikar/RavenousTrap.java | 2 +- Mage.Sets/src/mage/sets/zendikar/RecklessScholar.java | 2 +- Mage.Sets/src/mage/sets/zendikar/RiteOfReplication.java | 2 +- Mage.Sets/src/mage/sets/zendikar/RoilElemental.java | 2 +- Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java | 2 +- Mage.Sets/src/mage/sets/zendikar/SadisticSacrament.java | 2 +- Mage.Sets/src/mage/sets/zendikar/SavageSilhouette.java | 2 +- Mage.Sets/src/mage/sets/zendikar/SlaughterCry.java | 2 +- Mage.Sets/src/mage/sets/zendikar/SoaringSeacliff.java | 2 +- Mage.Sets/src/mage/sets/zendikar/SorinMarkov.java | 4 ++-- Mage.Sets/src/mage/sets/zendikar/TeeteringPeaks.java | 2 +- Mage.Sets/src/mage/sets/zendikar/TorchSlinger.java | 2 +- Mage.Sets/src/mage/sets/zendikar/TrapfindersTrick.java | 2 +- Mage.Sets/src/mage/sets/zendikar/TurntimberBasilisk.java | 2 +- Mage.Sets/src/mage/sets/zendikar/TurntimberGrove.java | 2 +- Mage.Sets/src/mage/sets/zendikar/UnstableFooting.java | 2 +- Mage.Sets/src/mage/sets/zendikar/VampireHexmage.java | 2 +- Mage.Sets/src/mage/sets/zendikar/VampiresBite.java | 2 +- Mage.Sets/src/mage/sets/zendikar/VinesOfVastwood.java | 2 +- Mage/src/mage/target/common/TargetControlledPermanent.java | 5 +++++ 1334 files changed, 1412 insertions(+), 1410 deletions(-) diff --git a/Mage.Sets/src/mage/sets/alarareborn/Anathemancer.java b/Mage.Sets/src/mage/sets/alarareborn/Anathemancer.java index b209e917ca5..1a5f3fa1b14 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()); + ability.addTarget(new TargetPlayer(true)); 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 39bac2325a0..de2d9e46aa6 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); // Cycling {UB} diff --git a/Mage.Sets/src/mage/sets/alarareborn/Brainbite.java b/Mage.Sets/src/mage/sets/alarareborn/Brainbite.java index bf7028065a5..40e3026cf2c 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()); + this.getSpellAbility().addTarget(new TargetOpponent(true)); } public Brainbite(final Brainbite card) { diff --git a/Mage.Sets/src/mage/sets/alarareborn/DenyReality.java b/Mage.Sets/src/mage/sets/alarareborn/DenyReality.java index 8709c33fafb..d69e3079681 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()); + this.getSpellAbility().addTarget(new TargetPermanent(true)); 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 0b178ec1f74..ad4056f58ee 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()); - ability2.addTarget(new TargetPermanent()); + ability1.addTarget(new TargetPermanent(true)); + ability2.addTarget(new TargetPermanent(true)); this.addAbility(ability1); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/sets/alarareborn/IdentityCrisis.java b/Mage.Sets/src/mage/sets/alarareborn/IdentityCrisis.java index 37e2269f877..cdaa6c02806 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } public IdentityCrisis (final IdentityCrisis card) { diff --git a/Mage.Sets/src/mage/sets/alarareborn/Lavalanche.java b/Mage.Sets/src/mage/sets/alarareborn/Lavalanche.java index 93303d69af7..f3fa8436ed8 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } diff --git a/Mage.Sets/src/mage/sets/alarareborn/LichLordOfUnx.java b/Mage.Sets/src/mage/sets/alarareborn/LichLordOfUnx.java index df483ed54b5..4e9bc4aaf83 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/alarareborn/MageSlayer.java b/Mage.Sets/src/mage/sets/alarareborn/MageSlayer.java index 51e97231764..fdc44ea92cf 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())); + this.addAbility(new EquipAbility(Outcome.Benefit, new GenericManaCost(3), new TargetControlledCreaturePermanent(true))); } diff --git a/Mage.Sets/src/mage/sets/alarareborn/NecromancersCovenant.java b/Mage.Sets/src/mage/sets/alarareborn/NecromancersCovenant.java index 2135ced9060..b582d57aff9 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()); + ability.addTarget(new TargetPlayer(true)); 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 8d5e9b22cc4..7b3c19320e2 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(); + Target target = new TargetControlledCreaturePermanent(true); target.setRequired(true); target.setNotTarget(true); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/sets/alarareborn/SanityGnawers.java b/Mage.Sets/src/mage/sets/alarareborn/SanityGnawers.java index f522e5254a3..3a1e2dd46bd 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/alarareborn/ShieldOfTheRighteous.java b/Mage.Sets/src/mage/sets/alarareborn/ShieldOfTheRighteous.java index 2cff90deeae..df4b4d3bd78 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())); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2), new TargetControlledCreaturePermanent(true))); } public ShieldOfTheRighteous(final ShieldOfTheRighteous card) { diff --git a/Mage.Sets/src/mage/sets/alarareborn/SingeMindOgre.java b/Mage.Sets/src/mage/sets/alarareborn/SingeMindOgre.java index d0e817e5f84..c5aacc9fc39 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/alarareborn/ThoughtHemorrhage.java b/Mage.Sets/src/mage/sets/alarareborn/ThoughtHemorrhage.java index fa3acab19d1..29abcbe4328 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); this.getSpellAbility().addEffect(new ThoughtHemorrhageEffect()); } diff --git a/Mage.Sets/src/mage/sets/alarareborn/UnscytheKillerOfKings.java b/Mage.Sets/src/mage/sets/alarareborn/UnscytheKillerOfKings.java index 00570bd2859..582afe9d190 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())); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2), new TargetControlledCreaturePermanent(true))); } 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 2bf2b6765b6..6ce4c2b9821 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/alliances/SoldierOfFortune.java b/Mage.Sets/src/mage/sets/alliances/SoldierOfFortune.java index dd28a5a3815..fc0e863ba31 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/AEtherMutation.java b/Mage.Sets/src/mage/sets/apocalypse/AEtherMutation.java index 8a476f5dce8..53015c7c86c 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); // 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 e4bce14c525..383a84ff8b7 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()); + firstAbility.addTarget(new TargetCreaturePermanent(true)); 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()); + secondAbility.addTarget(new TargetCreaturePermanent(true)); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/CetaDisciple.java b/Mage.Sets/src/mage/sets/apocalypse/CetaDisciple.java index 7656e79b593..13aca608bd3 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()); + firstAbility.addTarget(new TargetCreaturePermanent(true)); this.addAbility(firstAbility); Ability secondAbility = new AnyColorManaAbility(new ColoredManaCost(ColoredManaSymbol.G)); secondAbility.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/sets/apocalypse/DegaDisciple.java b/Mage.Sets/src/mage/sets/apocalypse/DegaDisciple.java index e323df08584..58429428baf 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()); + firstAbility.addTarget(new TargetCreaturePermanent(true)); 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()); + secondAbility.addTarget(new TargetCreaturePermanent(true)); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/DiversionaryTactics.java b/Mage.Sets/src/mage/sets/apocalypse/DiversionaryTactics.java index 9a5fa3e4ad6..7b07ee140bc 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/LastCaress.java b/Mage.Sets/src/mage/sets/apocalypse/LastCaress.java index cc847b22f4f..63526a096fd 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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 543c069303a..baf3d4c1da9 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()); + ability.addTarget(new TargetPermanent(true)); 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 01859a20adc..709c9bcc03b 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 4aa480164e2..2554bb28faf 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/OrimsThunder.java b/Mage.Sets/src/mage/sets/apocalypse/OrimsThunder.java index cff3adad59e..dc645b8a787 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/OrimsThunder.java +++ b/Mage.Sets/src/mage/sets/apocalypse/OrimsThunder.java @@ -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()); + ability.addTarget(new TargetCreaturePermanent(true)); } } } diff --git a/Mage.Sets/src/mage/sets/apocalypse/QuagmireDruid.java b/Mage.Sets/src/mage/sets/apocalypse/QuagmireDruid.java index 35ae5f3a0b5..fbe4609e618 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/QuagmireDruid.java +++ b/Mage.Sets/src/mage/sets/apocalypse/QuagmireDruid.java @@ -72,7 +72,7 @@ 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())); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); 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 18590d4cdaf..146fc26a485 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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()); + gainAbility.addTarget(new TargetPlayer(true)); 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 ccf1ce5dc7e..e43b4b2fbae 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()); + secondAbility.addTarget(new TargetCreaturePermanent(true)); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/SavageGorilla.java b/Mage.Sets/src/mage/sets/apocalypse/SavageGorilla.java index c45fe52beb5..6ea90f8935d 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/TemporalSpring.java b/Mage.Sets/src/mage/sets/apocalypse/TemporalSpring.java index 968bb3cec9a..4a3e067e045 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()); + this.getSpellAbility().addTarget(new TargetPermanent(true)); } 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 64da14c3614..18e2766cc7c 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()); + this.getSpellAbility().addTarget(new TargetPermanent(true)); } public Vindicate (final Vindicate card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Aggravate.java b/Mage.Sets/src/mage/sets/avacynrestored/Aggravate.java index c811cfd5146..9d7a5df11da 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); // 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 82e1a713564..af6bb2346a4 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()); + this.getSpellAbility().addTarget(new TargetOpponent(true)); } public AppetiteForBrains(final AppetiteForBrains card) { diff --git a/Mage.Sets/src/mage/sets/avacynrestored/BloodArtist.java b/Mage.Sets/src/mage/sets/avacynrestored/BloodArtist.java index 4f22e3ba6a8..a37d1310fca 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(); + Target target = new TargetPlayer(true); 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 c99e015076d..ababd554a09 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())); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/BonfireOfTheDamned.java b/Mage.Sets/src/mage/sets/avacynrestored/BonfireOfTheDamned.java index 6f7ac127e73..e004441c36a 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); // Miracle {X}{R} this.addAbility(new MiracleAbility(new ManaCostsImpl("{X}{R}"))); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/CallToServe.java b/Mage.Sets/src/mage/sets/avacynrestored/CallToServe.java index 4e3f2375112..05e5df4b3b3 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 4507175e8fd..4639e821304 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()); + ability.addTarget(new TargetPermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Cloudshift.java b/Mage.Sets/src/mage/sets/avacynrestored/Cloudshift.java index 72f9fb906f2..7bcce9d8dac 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()); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); 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 b87870aa951..eb1d379c74c 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 8ebd02418f6..cd94a0d234b 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()); + ability.addTarget(new TargetControlledCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/CorpseTraders.java b/Mage.Sets/src/mage/sets/avacynrestored/CorpseTraders.java index 78c18e942ed..d5ff3774a10 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/CorpseTraders.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/CorpseTraders.java @@ -60,7 +60,7 @@ 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())); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/CripplingChill.java b/Mage.Sets/src/mage/sets/avacynrestored/CripplingChill.java index 5345ff00c6f..337f93af014 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); this.getSpellAbility().addEffect(new TapTargetEffect()); this.getSpellAbility().addEffect(new SkipNextUntapTargetEffect()); // Draw a card. diff --git a/Mage.Sets/src/mage/sets/avacynrestored/DarkImpostor.java b/Mage.Sets/src/mage/sets/avacynrestored/DarkImpostor.java index 81475eee33c..bfdd9d93565 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 c6af443c2c0..005887f1acf 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 c49e34b6ccc..86ae70a8951 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/Dreadwaters.java b/Mage.Sets/src/mage/sets/avacynrestored/Dreadwaters.java index 7be558bb078..37096a92a47 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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 c2859b9ff33..2be6771055b 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/EssenceHarvest.java b/Mage.Sets/src/mage/sets/avacynrestored/EssenceHarvest.java index f9d0283b8b2..3df48a76662 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } 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 2aed32a8555..76d99cbd35b 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/GallowsAtWillowHill.java b/Mage.Sets/src/mage/sets/avacynrestored/GallowsAtWillowHill.java index 1b7ace061d2..114390ff3fd 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/GhostlyTouch.java b/Mage.Sets/src/mage/sets/avacynrestored/GhostlyTouch.java index b8fbca8cfb2..2fa12aac9e4 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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()); + gainedAbility.addTarget(new TargetPermanent(true)); 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 03a871d3bfa..548febb3950 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 0a5c13750f3..0237d8949fd 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } 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 ee8b9d2952b..3bf2052ba0b 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 cca15f4cf6b..8fa434c3d73 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/HolyJusticiar.java b/Mage.Sets/src/mage/sets/avacynrestored/HolyJusticiar.java index 784d262fef6..60a3b55116c 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/InfiniteReflection.java b/Mage.Sets/src/mage/sets/avacynrestored/InfiniteReflection.java index 1043f6cee35..d52401b88ee 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 103f57f2bf0..65268da0caa 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 ba9a835a0e1..86ac27b5f91 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/LeapOfFaith.java b/Mage.Sets/src/mage/sets/avacynrestored/LeapOfFaith.java index 916b4378cda..d0dfe840407 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 349a152bc13..333af89637e 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 e6da786d898..08cdf8e552c 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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()); + gainedAbility.addTarget(new TargetCreaturePermanent(true)); 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 9a06701d6b2..4f5321265d1 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } 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 b252857dfd8..84d190311c8 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()); + ability.addTarget(new TargetControlledCreaturePermanent(true)); ability.addChoice(new ChoiceColor()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Necrobite.java b/Mage.Sets/src/mage/sets/avacynrestored/Necrobite.java index b3ed2ee5145..465cdfbd0b1 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 a99bb63730f..408ad151bee 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()); + ability.addTarget(new TargetControlledCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/PeelFromReality.java b/Mage.Sets/src/mage/sets/avacynrestored/PeelFromReality.java index 211412aac36..952e56a09a1 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/PeelFromReality.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/PeelFromReality.java @@ -63,7 +63,7 @@ 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()); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/PredatorsGambit.java b/Mage.Sets/src/mage/sets/avacynrestored/PredatorsGambit.java index 306e6978b9a..2262978b58c 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/RevengeOfTheHunted.java b/Mage.Sets/src/mage/sets/avacynrestored/RevengeOfTheHunted.java index 9364ac48e6b..8d2398cb5c6 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 88cb4533833..1786907b1b3 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/RushOfBlood.java b/Mage.Sets/src/mage/sets/avacynrestored/RushOfBlood.java index 64201525e90..050d87c046c 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 e0fa5a4d7f8..9068a8106d9 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/ScrollOfGriselbrand.java b/Mage.Sets/src/mage/sets/avacynrestored/ScrollOfGriselbrand.java index 0fcbb157607..1d70956870a 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()); + ability.addTarget(new TargetOpponent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/ShelteringWord.java b/Mage.Sets/src/mage/sets/avacynrestored/ShelteringWord.java index c02f7434b71..b2f7a497cab 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()); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); } 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 86cb715d3ac..155be216bb1 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/SnareTheSkies.java b/Mage.Sets/src/mage/sets/avacynrestored/SnareTheSkies.java index 0e6c283edff..c50b3f17077 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 9e85cf66eaf..5027251242a 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 78b270e80f5..ec01c80733b 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 e22cd632590..c50dcc4598d 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()); + ability.addTarget(new TargetPlayer(true)); 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 de872b835af..72fe586b88a 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()); + this.getSpellAbility().addTarget(new TargetOpponent(true)); } 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 81c59db05aa..7f3f0290475 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/TamiyoTheMoonSage.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/TamiyoTheMoonSage.java @@ -80,7 +80,7 @@ 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(); + Target target = new TargetPermanent(true); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Thunderbolt.java b/Mage.Sets/src/mage/sets/avacynrestored/Thunderbolt.java index b4062ef773e..1bfb1bbe869 100644 --- a/Mage.Sets/src/mage/sets/avacynrestored/Thunderbolt.java +++ b/Mage.Sets/src/mage/sets/avacynrestored/Thunderbolt.java @@ -59,7 +59,7 @@ 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); Mode mode = new Mode(); mode.getEffects().add(new DamageTargetEffect(4)); mode.getTargets().add(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/TimberlandGuide.java b/Mage.Sets/src/mage/sets/avacynrestored/TimberlandGuide.java index 2a44b0a48e5..0b59149bfa2 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(); + TargetCreaturePermanent target = new TargetCreaturePermanent(true); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/TriumphOfCruelty.java b/Mage.Sets/src/mage/sets/avacynrestored/TriumphOfCruelty.java index 0ad8ce356a0..e6820340f94 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(); + Target target = new TargetOpponent(true); target.setRequired(true); ability.addTarget(target); this.addAbility(new ConditionalTriggeredAbility(ability, ControlsBiggestOrTiedCreatureCondition.getInstance(), ruleText)); diff --git a/Mage.Sets/src/mage/sets/avacynrestored/UncannySpeed.java b/Mage.Sets/src/mage/sets/avacynrestored/UncannySpeed.java index 0257c41c89d..a63aad9a236 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 7181cb6c5a4..148358f5c1e 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/avacynrestored/UnhallowedPact.java b/Mage.Sets/src/mage/sets/avacynrestored/UnhallowedPact.java index 1a4f885faba..0210ff0104d 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 290f21ca483..97707367934 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()); + ability.addTarget(new TargetPermanent(true)); 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 7f4ea178955..b98eca442e6 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 94bf4c2b982..484703c4ed0 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlazingShoal.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/BlazingShoal.java index b558b36793b..bb588379e7d 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 7d4e89e4722..079a134210a 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/ChildOfThorns.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ChildOfThorns.java index ad3fc9d5ffa..4bfba72d1c0 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/FirstVolley.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/FirstVolley.java index cdb81249232..3533f4b4ad5 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Frostling.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Frostling.java index 2808f7b26fa..a49714f6f50 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HeartOfLight.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HeartOfLight.java index 0e8174ac27b..bcded4302d4 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/KumanosBlessing.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KumanosBlessing.java index 91ad5d943cb..0c6c4cb04b2 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 534880282ce..ecd66ebbbf0 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/MoonlitStrider.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MoonlitStrider.java index 9e9e447afa6..d2a7255aad2 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()); + ability.addTarget(new TargetControlledCreaturePermanent(true)); 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/OrnateKanzashi.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/OrnateKanzashi.java index a45fb5b91b8..d4a9fb01810 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()); + ability.addTarget(new TargetOpponent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PhantomWings.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PhantomWings.java index c9d997b6d87..a4187cb38b4 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/RoninWarclub.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/RoninWarclub.java index 6281f011d0c..34d1bb26253 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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()); + this.addTarget(new TargetCreaturePermanent(true)); } Target target = this.getTargets().get(0); if (target instanceof TargetCreaturePermanent) { diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Shuriken.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Shuriken.java index beaab6578c6..388c623647a 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 b1b37039fe0..2a097342061 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 147d3e7a8ed..41683c316a1 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SoratamiMindsweeper.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SoratamiMindsweeper.java index 291b1fcb3f8..5e2cf44678f 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()); + ability.addTarget(new TargetPlayer(true)); ability.addCost(new ReturnToHandTargetCost(new TargetControlledPermanent(filter))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/StreamOfConsciousness.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/StreamOfConsciousness.java index 078a119957c..6918b58a2d9 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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 40558e9d0ce..5c3d11c9569 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreeTragedies.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreeTragedies.java index 796bdb38ca6..9b9a73bde32 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } public ThreeTragedies(final ThreeTragedies card) { diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TorrentOfStone.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TorrentOfStone.java index 6c148278bc0..b80c0b45670 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); // 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 cc18024cadf..63bdfe3b3d4 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()); + mode.getTargets().add(new TargetCreaturePermanent(true)); 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 7f54f8e8b1b..0c662fea910 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } public UncheckedGrowth(final UncheckedGrowth card) { diff --git a/Mage.Sets/src/mage/sets/bornofthegods/AspectOfHydra.java b/Mage.Sets/src/mage/sets/bornofthegods/AspectOfHydra.java index fe47180f8de..fb3c75e5db7 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } public AspectOfHydra(final AspectOfHydra card) { diff --git a/Mage.Sets/src/mage/sets/bornofthegods/ClaimOfErebos.java b/Mage.Sets/src/mage/sets/bornofthegods/ClaimOfErebos.java index 314e40ddc56..b3dffccabc5 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/EpharasEnlightenment.java b/Mage.Sets/src/mage/sets/bornofthegods/EpharasEnlightenment.java index daeeda1505b..af8f10b4662 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 8c2d765d1f4..1dfea70eb78 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 687e6d431e7..3711a922b6e 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 8526305b4af..325f219d269 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/FearsomeTemper.java b/Mage.Sets/src/mage/sets/bornofthegods/FearsomeTemper.java index 9672c71e4fc..c4bea58108a 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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()); + grantedAbility.addTarget(new TargetCreaturePermanent(true)); 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/GrislyTransformation.java b/Mage.Sets/src/mage/sets/bornofthegods/GrislyTransformation.java index fa8ecf7e300..f39fc0db519 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/KarametrasFavor.java b/Mage.Sets/src/mage/sets/bornofthegods/KarametrasFavor.java index 0739690aad4..d18657dbb49 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/MogisGodOfSlaughter.java b/Mage.Sets/src/mage/sets/bornofthegods/MogisGodOfSlaughter.java index 52d6a8c8524..8e2ec1fe018 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()), + effect = new DoUnlessTargetPaysCost(new DamageTargetEffect(2, false, "that player"), new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)), "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/OraclesInsight.java b/Mage.Sets/src/mage/sets/bornofthegods/OraclesInsight.java index ab8ddc87231..bf30394e832 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/RaisedByWolves.java b/Mage.Sets/src/mage/sets/bornofthegods/RaisedByWolves.java index 5c6b3969552..0bc2953c5a6 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/StratusWalk.java b/Mage.Sets/src/mage/sets/bornofthegods/StratusWalk.java index ecd7203beb6..612a361d301 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 6b8e51d6a5e..0a43ca78e37 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 9eb39f56ee0..c25b0043374 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/WeightOfTheUnderworld.java b/Mage.Sets/src/mage/sets/bornofthegods/WeightOfTheUnderworld.java index cfb03a7ddd5..8142f3f2365 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/championsofkamigawa/AshenSkinZubera.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AshenSkinZubera.java index 7e1a8cce88c..20d0d92c1f3 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()); + ability.addTarget(new TargetOpponent(true)); 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 d2e5a5ff8df..8f9b2e82cf4 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/BlessedBreath.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BlessedBreath.java index 9737b1b5e03..49226c0ede6 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()); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); // Splice onto Arcane {W} this.addAbility(new SpliceOntoArcaneAbility("{W}")); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BloodRites.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BloodRites.java index a98fbe8a001..b61350dec2d 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())); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); 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 44df09de6f3..476b8b71963 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BurrGrafter.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BurrGrafter.java index 0fb8b847edb..1d42dfec6cf 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 f75bdf5f7cc..a35f93533d1 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/ConsumingVortex.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ConsumingVortex.java index e4165d1a94d..46d6f1db241 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); // 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 cd0391ee93f..4556c5b4e5b 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); this.getSpellAbility().addEffect(new CranialExtractionEffect()); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/EightAndAHalfTails.java b/Mage.Sets/src/mage/sets/championsofkamigawa/EightAndAHalfTails.java index 1cb6ae3d648..b4a7a630abb 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/EightAndAHalfTails.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/EightAndAHalfTails.java @@ -72,8 +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(); - target.setRequired(true); + Target target = new TargetControlledPermanent(true); 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 ef4b64a2a7a..47ba99a9b85 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()); + ability1.addTarget(new TargetControlledPermanent(true)); 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 5d97d391717..b72b480de9d 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()); + this.getSpellAbility().addTarget(new TargetPermanent(true)); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/FieldOfReality.java b/Mage.Sets/src/mage/sets/championsofkamigawa/FieldOfReality.java index 59cd3cb046c..209d68da1ee 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/GuardianOfSolitude.java b/Mage.Sets/src/mage/sets/championsofkamigawa/GuardianOfSolitude.java index 00c3ed3452a..1c651e0d3f4 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HairStrungKoto.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HairStrungKoto.java index 40438e229c9..ebd13ccb6e3 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfNightsReach.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfNightsReach.java index 77f2a0064b3..d95c034fc3f 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()); + ability.addTarget(new TargetOpponent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HorizonSeed.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HorizonSeed.java index fa6f89073de..a476b70350d 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/IndomitableWill.java b/Mage.Sets/src/mage/sets/championsofkamigawa/IndomitableWill.java index 4c13ed6215f..bb3f61723ab 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/InnocenceKami.java b/Mage.Sets/src/mage/sets/championsofkamigawa/InnocenceKami.java index 54f75a581db..7e92b2ffc28 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 c3c1018e881..ed44f02ad2c 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()); + ability.addTarget(new TargetControlledCreaturePermanent(true)); 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 f4c7fcfa246..93e710a311d 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KabutoMoth.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KabutoMoth.java index 504ed367b38..5569e54b483 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfFiresRoar.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfFiresRoar.java index 350063a86b4..a8c1c43a85c 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheWaningMoon.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheWaningMoon.java index cb1baec6913..35b73926ea5 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTwistedReflection.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTwistedReflection.java index 2589d10d3f7..b74b59a21ad 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()); + ability.addTarget(new TargetControlledCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KeigaTheTideStar.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KeigaTheTideStar.java index 3bd38c46c9b..0fd8cc67ce1 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KikuNightsFlower.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KikuNightsFlower.java index 697909ba312..d92ab7f7f14 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()); + ability.addTarget(new TargetCreaturePermanent(true)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneMystic.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneMystic.java index 3d3793a1940..98422b1343b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneMystic.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneMystic.java @@ -113,7 +113,7 @@ 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)); - ability.addTarget(new TargetCreaturePermanent()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KuroPitlord.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KuroPitlord.java index 33d223a8c51..3b8a0816d25 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/LavaSpike.java b/Mage.Sets/src/mage/sets/championsofkamigawa/LavaSpike.java index bbcadb20d17..b85c262d89c 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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 71629ea57ec..0b104c8f4e3 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); // 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 99c4f8e4010..fe49fb8511e 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 f042b1aea75..d44e54b1f8d 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 bc2ec01e754..8ca79348bdc 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/Mindblaze.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Mindblaze.java index 49d58c0f058..35c1791d381 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } 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 61b09739615..321f19c9d45 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 761cd309666..c97a6b4150f 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())); + Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1),new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); ability.addCost(new ManaCostsImpl("{B}")); - ability.addTarget(new TargetPlayer()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiShortfang.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NezumiShortfang.java index 4be727841c8..1e30eb39f85 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()); + ability.addTarget(new TargetOpponent(true)); ability.addEffect(new ConditionalOneShotEffect( new FlipSourceEffect(new StabwhiskerTheOdious()), new CardsInTargetOpponentHandCondition(CardsInTargetOpponentHandCondition.CountType.FEWER_THAN, 1), diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OniPossession.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OniPossession.java index a70323f8171..6485fadf476 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/OniPossession.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/OniPossession.java @@ -67,7 +67,7 @@ public class OniPossession extends CardImpl { this.color.setBlack(true); // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/OrochiEggwatcher.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OrochiEggwatcher.java index f9d5c7c40aa..ed303834b98 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())); - ability.addTarget(new TargetCreaturePermanent()); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OtherworldlyJourney.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OtherworldlyJourney.java index 6638c19f3ee..61fadc4a97d 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 d64593d77c9..b4683eb6cc8 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/PsychicPuppetry.java b/Mage.Sets/src/mage/sets/championsofkamigawa/PsychicPuppetry.java index cedeb36fb64..0b72c95f1be 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()); + this.getSpellAbility().addTarget(new TargetPermanent(true)); // 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 a3dfbe57b84..9e15e05cba2 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } public PullUnder (final PullUnder card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/RaggedVeins.java b/Mage.Sets/src/mage/sets/championsofkamigawa/RaggedVeins.java index 8a614931bc0..e0a8f9432b5 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/Reweave.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Reweave.java index 45703d2f652..2b890b661bb 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(); + Target target = new TargetPermanent(true); 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 2db93d277ab..83dcda951d5 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 46150d638a9..4002b85341d 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()); + ability.addTarget(new TargetCreaturePermanent(true)); // 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 e0562198bdf..66b768cfd68 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/SoratamiMirrorMage.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiMirrorMage.java index 35c7d6c79d8..721f6566825 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiRainshaper.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SoratamiRainshaper.java index 679fc172ff5..c0f9205ca18 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()); + ability.addTarget(new TargetControlledCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SoulOfMagma.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SoulOfMagma.java index 440f8c99880..6532cff23ae 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/StrengthOfCedars.java b/Mage.Sets/src/mage/sets/championsofkamigawa/StrengthOfCedars.java index b19bf227ec4..7a7701ad686 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 aaca337f442..74b92654b7b 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 00e1cf380af..b73e6fbd2bb 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/TenzaGodosMaul.java b/Mage.Sets/src/mage/sets/championsofkamigawa/TenzaGodosMaul.java index 1f9bf97686a..cdd2c10b9e3 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())); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1), new TargetControlledCreaturePermanent(true))); } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope.java index 77c217ea326..cc4f89717a7 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()); + ability.addTarget(new TargetOpponent(true)); 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 c7e5e0b8eaf..51e46241d65 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 83b31b1aa36..41cbb5c89e7 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } public UnnaturalSpeed (final UnnaturalSpeed card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Vigilance.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Vigilance.java index e03a8346cbd..9d04b7da095 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 d0945f24310..6ed2b4df8fb 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } public WakingNightmare (final WakingNightmare card) { diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/YoseiTheMorningStar.java b/Mage.Sets/src/mage/sets/championsofkamigawa/YoseiTheMorningStar.java index db2b2bac7fb..f700f3e3e1c 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()); + ability.addTarget(new TargetPlayer(true)); ability.addTarget(new YoseiTheMorningStarTarget()); ability.addEffect(new YoseiTheMorningStarTapEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/coldsnap/MouthOfRonom.java b/Mage.Sets/src/mage/sets/coldsnap/MouthOfRonom.java index 97e51075d93..d0a5b75f511 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 e7b373b62a5..d73971ba665 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/commander/GhaveGuruOfSpores.java b/Mage.Sets/src/mage/sets/commander/GhaveGuruOfSpores.java index 99197bfd55b..d7c2d235666 100644 --- a/Mage.Sets/src/mage/sets/commander/GhaveGuruOfSpores.java +++ b/Mage.Sets/src/mage/sets/commander/GhaveGuruOfSpores.java @@ -81,7 +81,7 @@ 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(), CounterType.P1P1)); + ability.addCost(new RemoveCounterCost(new TargetControlledCreaturePermanent(true), CounterType.P1P1)); this.addAbility(ability); // {1}, Sacrifice a creature: Put a +1/+1 counter on target creature. diff --git a/Mage.Sets/src/mage/sets/commander/PerilousResearch.java b/Mage.Sets/src/mage/sets/commander/PerilousResearch.java index 56f7c118b48..17c535bacf7 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(); + Target target = new TargetControlledPermanent(true); 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 601ef6360af..740d8494a9c 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(); + TargetPlayer target = new TargetPlayer(true); 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/VishKalBloodArbiter.java b/Mage.Sets/src/mage/sets/commander/VishKalBloodArbiter.java index 415c11cc8e6..0ca0a7915b1 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/commander/VowOfDuty.java b/Mage.Sets/src/mage/sets/commander/VowOfDuty.java index feada9e05de..69014cae08b 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 6202125302f..15fe15d6ce7 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 23cb6614b71..916fc8e55ee 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 dddfbb23f57..c396007ed62 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 2818d19cfe7..6ecfd860a17 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/CurseOfChaos.java b/Mage.Sets/src/mage/sets/commander2013/CurseOfChaos.java index 16f9688bc06..fd6c4506c87 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(); + TargetPlayer auraTarget = new TargetPlayer(true); 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 b3fa6c4c595..05d7bc77a96 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(); + TargetPlayer auraTarget = new TargetPlayer(true); 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/CurseOfPredation.java b/Mage.Sets/src/mage/sets/commander2013/CurseOfPredation.java index 4b91960f4ad..b4e6c328a27 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(); + TargetPlayer auraTarget = new TargetPlayer(true); 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 56d07f1883c..ee16d4d692b 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(); + TargetPlayer auraTarget = new TargetPlayer(true); 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 abd59413a12..115e28d8eb5 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(); + TargetPlayer auraTarget = new TargetPlayer(true); 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 8379e4ba922..aad34e768bf 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/Flickerform.java b/Mage.Sets/src/mage/sets/commander2013/Flickerform.java index 5d3605e1c41..e971432f934 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/PresenceOfGond.java b/Mage.Sets/src/mage/sets/commander2013/PresenceOfGond.java index ab755b0a42a..32de01f244a 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/conflux/AbsorbVis.java b/Mage.Sets/src/mage/sets/conflux/AbsorbVis.java index 51c6dfb78a2..4a2022d5568 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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 57a78a46c66..d01a0ce95be 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/ConstrictingTendrils.java b/Mage.Sets/src/mage/sets/conflux/ConstrictingTendrils.java index c75809741a5..1d5322327cd 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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/DarkTemper.java b/Mage.Sets/src/mage/sets/conflux/DarkTemper.java index 10d2c3b8bb7..99599ffd21a 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 90189125568..0afb776ca8b 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 5293e1c020b..cde9cefbf93 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/ExplodingBorders.java b/Mage.Sets/src/mage/sets/conflux/ExplodingBorders.java index 2cc9e455857..28b49869f80 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } 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 04b40080bd7..998a2b29445 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); // Unearth {2}{B} diff --git a/Mage.Sets/src/mage/sets/conflux/FontOfMythos.java b/Mage.Sets/src/mage/sets/conflux/FontOfMythos.java index 05b2b5d0219..60f88c07ac0 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()); + this.addTarget(new TargetPlayer(true)); 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 354862ac0ca..a8048fe023a 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/conflux/JhessianBalmgiver.java b/Mage.Sets/src/mage/sets/conflux/JhessianBalmgiver.java index b54954aac5e..822c8883fa0 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/conflux/ManiacalRage.java b/Mage.Sets/src/mage/sets/conflux/ManiacalRage.java index 23998292078..e0cc5b5b436 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 572ed3cdc78..24425ae6fe4 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } public MightOfAlara(final MightOfAlara card) { diff --git a/Mage.Sets/src/mage/sets/conflux/NicolBolasPlaneswalker.java b/Mage.Sets/src/mage/sets/conflux/NicolBolasPlaneswalker.java index e0fff5717fd..29d4077da68 100644 --- a/Mage.Sets/src/mage/sets/conflux/NicolBolasPlaneswalker.java +++ b/Mage.Sets/src/mage/sets/conflux/NicolBolasPlaneswalker.java @@ -77,11 +77,11 @@ public class NicolBolasPlaneswalker extends CardImpl { this.addAbility(ability); // -2: Gain control of target creature. ability = new LoyaltyAbility(new GainControlTargetEffect(Duration.Custom), -2); - ability.addTarget(new TargetCreaturePermanent()); + ability.addTarget(new TargetCreaturePermanent(true)); 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()); + ability.addTarget(new TargetPlayer(true)); 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 b455666dd0c..0487cac7e00 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(); + TargetOpponent target = new TargetOpponent(true); 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 406e9ff75c0..befecfa8c43 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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()); + ability.addTarget(new TargetPlayer(true)); 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/conflux/PathToExile.java b/Mage.Sets/src/mage/sets/conflux/PathToExile.java index de9b270d836..2377b89ba04 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 8c29692be48..bed53459f57 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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 a105b58888f..9ba15fa13bc 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())); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/conflux/ScepterOfDominance.java b/Mage.Sets/src/mage/sets/conflux/ScepterOfDominance.java index 8a69bcfb655..ac017a974d1 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()); + ability.addTarget(new TargetPermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/conflux/SoulsMajesty.java b/Mage.Sets/src/mage/sets/conflux/SoulsMajesty.java index c4b249b0489..1902f08229e 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()); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); 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 536d19b8758..d86e54a7719 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); this.addAbility(new BasicLandcyclingAbility(new ManaCostsImpl("{1}{G}"))); } diff --git a/Mage.Sets/src/mage/sets/conflux/ViewFromAbove.java b/Mage.Sets/src/mage/sets/conflux/ViewFromAbove.java index bad8fc702b3..1eb528e892f 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); // 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 8e0157d19be..3e2354e5b01 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } 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 e90109bccc9..f3f147d3c73 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()); + ability.addTarget(new TargetControlledCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/conflux/WretchedBanquet.java b/Mage.Sets/src/mage/sets/conflux/WretchedBanquet.java index 93fa4a2d58b..678777d8824 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 4d419b87419..ab5dd4e41ed 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/ArtfulDodge.java b/Mage.Sets/src/mage/sets/darkascension/ArtfulDodge.java index af9dcc56f3f..57adf7deec7 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); // Flashback {U} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{U}"), TimingRule.SORCERY)); } diff --git a/Mage.Sets/src/mage/sets/darkascension/BriarpackAlpha.java b/Mage.Sets/src/mage/sets/darkascension/BriarpackAlpha.java index 05987bb5586..7d26921f568 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/BurdenOfGuilt.java b/Mage.Sets/src/mage/sets/darkascension/BurdenOfGuilt.java index ec1cb422830..31bfea25736 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 a48b7a89ad2..7127e4c9e4e 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 f08d66b03c1..4eed492a11b 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/ChantOfTheSkifsang.java b/Mage.Sets/src/mage/sets/darkascension/ChantOfTheSkifsang.java index 13d39725b81..7f8694019e6 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/CurseOfBloodletting.java b/Mage.Sets/src/mage/sets/darkascension/CurseOfBloodletting.java index 214f7e981c7..4c7f4fb577a 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(); + TargetPlayer auraTarget = new TargetPlayer(true); 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 c4cc1510b5f..ff99d083a89 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(); + TargetPlayer auraTarget = new TargetPlayer(true); 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 d399709be6a..0b3b3023e1d 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(); + TargetPlayer auraTarget = new TargetPlayer(true); 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 ef41fa87ec9..912655965bb 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(); + TargetPlayer auraTarget = new TargetPlayer(true); 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 11b9d36b5cb..43c0bce6150 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(); + TargetPlayer auraTarget = new TargetPlayer(true); 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 f9001f2e19e..c57d1498cb3 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); // 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 ac74ef7feea..d5aa03febb3 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); // 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 d4cded6b1e1..eed1e8519f0 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/DiregrafCaptain.java b/Mage.Sets/src/mage/sets/darkascension/DiregrafCaptain.java index 5aa71e22907..78b7f7d05b6 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()); + this.addTarget(new TargetOpponent(true)); } public DiregrafCaptainTriggeredAbility(final DiregrafCaptainTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/darkascension/FaithsShield.java b/Mage.Sets/src/mage/sets/darkascension/FaithsShield.java index 7a532e197f5..0b347033ec9 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()); + this.getSpellAbility().addTarget(new TargetControlledPermanent(true)); 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 392e692a7b0..ed922586a42 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())); + new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); 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 4ff4129804d..dcb061f1fd9 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())); + new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); 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 7035d70a628..983341dccb1 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/FavorOfTheWoods.java b/Mage.Sets/src/mage/sets/darkascension/FavorOfTheWoods.java index 59523eab480..7f7a899c2f8 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/GeralfsMindcrusher.java b/Mage.Sets/src/mage/sets/darkascension/GeralfsMindcrusher.java index 1c6bded4dc2..22340821be7 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()); + ability.addTarget(new TargetPlayer(true)); 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 ef1624c311c..7ddb83b5afe 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 5376e95f348..f52c3d7bc8c 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())); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/Griptide.java b/Mage.Sets/src/mage/sets/darkascension/Griptide.java index 0cbf213a912..0b024da00ab 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 7a7720c1c31..605f29d30e4 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } 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 cfab70fe7e7..70f5dc385ef 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } 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 64177489b18..c7ac2090991 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/Helvault.java b/Mage.Sets/src/mage/sets/darkascension/Helvault.java index 727bb68a5b4..452e9ab00b0 100644 --- a/Mage.Sets/src/mage/sets/darkascension/Helvault.java +++ b/Mage.Sets/src/mage/sets/darkascension/Helvault.java @@ -64,7 +64,7 @@ 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()); + ability.addTarget(new TargetControlledCreaturePermanent(true)); this.addAbility(ability); // {7}, {tap}: Exile target creature you don't control. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetForSourceEffect("Helvault exile"), new GenericManaCost(7)); diff --git a/Mage.Sets/src/mage/sets/darkascension/HungerOfTheHowlpack.java b/Mage.Sets/src/mage/sets/darkascension/HungerOfTheHowlpack.java index 3d4af745c03..783da1b733d 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 3efdbcedbfa..9e5dbb4419a 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(); + Target target1 = new TargetOpponent(true); 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 9c398dad4e4..5d689f8f315 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); // 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 e039fe02669..9af6c08b6ec 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); // 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 cee29a27d7b..648510d4149 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/NiblisOfTheMist.java b/Mage.Sets/src/mage/sets/darkascension/NiblisOfTheMist.java index df556137711..3d0c36bd55e 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/NiblisOfTheUrn.java b/Mage.Sets/src/mage/sets/darkascension/NiblisOfTheUrn.java index 8e83c5ff142..349544de987 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/SkillfulLunge.java b/Mage.Sets/src/mage/sets/darkascension/SkillfulLunge.java index d919c13d58d..a8692216a39 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 24ce0c2610f..a3bccac2eef 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/SpitefulShadows.java b/Mage.Sets/src/mage/sets/darkascension/SpitefulShadows.java index 8edec1db5dc..8c6ee905f6a 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/TalonsOfFalkenrath.java b/Mage.Sets/src/mage/sets/darkascension/TalonsOfFalkenrath.java index 76361303026..4cb93c98cc9 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 9af3fc06d91..f5731ad65b4 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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 239ff892388..c6173cec68a 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 157ace84484..ccc750fe2f3 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darkascension/UndyingEvil.java b/Mage.Sets/src/mage/sets/darkascension/UndyingEvil.java index d4aa4ddfaad..a36b5620e0c 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } public UndyingEvil(final UndyingEvil card) { diff --git a/Mage.Sets/src/mage/sets/darkascension/WildHunger.java b/Mage.Sets/src/mage/sets/darkascension/WildHunger.java index 74f8334a8d5..aeef3db047d 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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/WrackWithMadness.java b/Mage.Sets/src/mage/sets/darkascension/WrackWithMadness.java index f9c92f10c83..9b7709400a6 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } public WrackWithMadness(final WrackWithMadness card) { diff --git a/Mage.Sets/src/mage/sets/darksteel/LeoninBola.java b/Mage.Sets/src/mage/sets/darksteel/LeoninBola.java index ca4de4f1fab..be0a111b49e 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()); + gainAbility.addTarget(new TargetCreaturePermanent(true)); 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 cdcc5270a5a..00d1d8218dd 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/darksteel/SpawningPit.java b/Mage.Sets/src/mage/sets/darksteel/SpawningPit.java index b92005e5c09..c628562df37 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()))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); 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/dissension/BeaconHawk.java b/Mage.Sets/src/mage/sets/dissension/BeaconHawk.java index 0713e492919..f54afa12899 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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/MinisterOfImpediments.java b/Mage.Sets/src/mage/sets/dissension/MinisterOfImpediments.java index 2ec6770bf09..37be79669e5 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/dissension/OddsEnds.java b/Mage.Sets/src/mage/sets/dissension/OddsEnds.java index 761f8a793df..08bb9fb49a8 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()); + getRightHalfCard().getSpellAbility().addTarget(new TargetPlayer(true)); } diff --git a/Mage.Sets/src/mage/sets/dissension/RiotSpikes.java b/Mage.Sets/src/mage/sets/dissension/RiotSpikes.java index ea642ee344f..537a58a6a57 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/dragonsmaze/KorozdaGorgon.java b/Mage.Sets/src/mage/sets/dragonsmaze/KorozdaGorgon.java index a4bf08e6725..75d1a4bcd02 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/KorozdaGorgon.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/KorozdaGorgon.java @@ -64,7 +64,7 @@ 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(), CounterType.P1P1)); + ability.addCost(new RemoveCounterCost(new TargetControlledCreaturePermanent(true), CounterType.P1P1)); ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/KrasisIncubation.java b/Mage.Sets/src/mage/sets/dragonsmaze/KrasisIncubation.java index 80709a734e7..0470b7f4c43 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 f460390faf4..88180328640 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()))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.EndOfTurn, filter, false), new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/PilferedPlans.java b/Mage.Sets/src/mage/sets/dragonsmaze/PilferedPlans.java index b9b74eb59cb..3a042050f14 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/PunishTheEnemy.java b/Mage.Sets/src/mage/sets/dragonsmaze/PunishTheEnemy.java index 7062da89ef5..f5c41a1634a 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(); + Target target = new TargetPlayer(true); target.setRequired(true); this.getSpellAbility().addTarget(target); - target = new TargetCreaturePermanent(); + target = new TargetCreaturePermanent(true); target.setRequired(true); this.getSpellAbility().addTarget(target); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ReapIntellect.java b/Mage.Sets/src/mage/sets/dragonsmaze/ReapIntellect.java index 4cc488dc0cc..e441605be81 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()); + this.getSpellAbility().addTarget(new TargetOpponent(true)); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/SinCollector.java b/Mage.Sets/src/mage/sets/dragonsmaze/SinCollector.java index 4353be4c50a..385eb93dea5 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()); + ability.addTarget(new TargetOpponent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/SinisterPossession.java b/Mage.Sets/src/mage/sets/dragonsmaze/SinisterPossession.java index 09b8fa599ff..027b31ec65c 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/UnflinchingCourage.java b/Mage.Sets/src/mage/sets/dragonsmaze/UnflinchingCourage.java index 0cc08a65ae5..8620f5009c9 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/WarpedPhysique.java b/Mage.Sets/src/mage/sets/dragonsmaze/WarpedPhysique.java index 8d56fe50fd1..d42f926a703 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } public WarpedPhysique(final WarpedPhysique card) { diff --git a/Mage.Sets/src/mage/sets/eighthedition/BalanceOfPower.java b/Mage.Sets/src/mage/sets/eighthedition/BalanceOfPower.java index 85748b64e2a..2758cc6d531 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()); + this.getSpellAbility().addTarget(new TargetOpponent(true)); } public BalanceOfPower(final BalanceOfPower card) { diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/AEtherSpellbomb.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/AEtherSpellbomb.java index c6a77fa536e..cd48c3f8c05 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); //{1}, Sacrifice Æther Spellbomb: Draw a card. diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/GoldmeadowHarrier.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/GoldmeadowHarrier.java index 821a502d0b8..d6febb5ba49 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/RazorBarrier.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/RazorBarrier.java index 0fbaa3bf157..26053de0671 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/RazorBarrier.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/RazorBarrier.java @@ -59,8 +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(); - target.setRequired(true); + Target target = new TargetControlledPermanent(true); 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 3ec9885e6f3..c9bf00c3408 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/TripNoose.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/TripNoose.java index e59ed8510a2..d2c099738d3 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/AmbushCommander.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/AmbushCommander.java index d1aad4712fa..c096eca6386 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/elvesvsgoblins/TimberwatchElf.java b/Mage.Sets/src/mage/sets/elvesvsgoblins/TimberwatchElf.java index 5ea7997a3fc..30ad447761d 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/eventide/ArchonOfJustice.java b/Mage.Sets/src/mage/sets/eventide/ArchonOfJustice.java index 5f1629cf9fb..f338e5079c0 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()); + ability.addTarget(new TargetPermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher.java b/Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher.java index 92a16f89a26..762df8397a3 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()); + this.addTarget(new TargetCreaturePermanent(true)); } public AshlingTheExtinguisherTriggeredAbility(final AshlingTheExtinguisherTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/eventide/BalefireLiege.java b/Mage.Sets/src/mage/sets/eventide/BalefireLiege.java index d424621e58e..a8cdb98b0e1 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()); + ability.addTarget(new TargetPlayer(true)); 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 ed8553b58ee..4b65e9f8d73 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 64c0b6f56fa..3955aec7340 100644 --- a/Mage.Sets/src/mage/sets/eventide/BanishingKnack.java +++ b/Mage.Sets/src/mage/sets/eventide/BanishingKnack.java @@ -59,7 +59,7 @@ public class BanishingKnack extends CardImpl { Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new TapSourceCost()); gainedAbility.addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(gainedAbility, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } public BanishingKnack(final BanishingKnack card) { diff --git a/Mage.Sets/src/mage/sets/eventide/CankerousThirst.java b/Mage.Sets/src/mage/sets/eventide/CankerousThirst.java index dc85de1f1a7..9c90aa4e556 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); this.addInfo("Info1", "(Do both if {B}{G} was spent.)"); } diff --git a/Mage.Sets/src/mage/sets/eventide/CinderPyromancer.java b/Mage.Sets/src/mage/sets/eventide/CinderPyromancer.java index 34481b5a082..866127fcecb 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()); + ability.addTarget(new TargetPlayer(true)); 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 ccc66ea812e..0d2213abe0e 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/DeathbringerLiege.java b/Mage.Sets/src/mage/sets/eventide/DeathbringerLiege.java index 01702265858..2bf828823b2 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); ability = new SpellCastControllerTriggeredAbility(new DeathbringerLiegeEffect(), filterBlackSpellCard, true); - ability.addTarget(new TargetCreaturePermanent()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/eventide/DominusOfFealty.java b/Mage.Sets/src/mage/sets/eventide/DominusOfFealty.java index bd53c06d53e..6accf664633 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()); + ability.addTarget(new TargetPermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/eventide/Doomgape.java b/Mage.Sets/src/mage/sets/eventide/Doomgape.java index fa37e627ade..1a6b3ef3782 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(); + Target target = new TargetControlledCreaturePermanent(true); 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 683b4150492..171d0687071 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 7e7277b62e3..3be3004eaee 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 4838df79a34..2d11356bb2f 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/Flickerwisp.java b/Mage.Sets/src/mage/sets/eventide/Flickerwisp.java index c194f4bcf5c..c2c093bdd90 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()); + ability.addTarget(new TargetPermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/eventide/GiftOfTheDeity.java b/Mage.Sets/src/mage/sets/eventide/GiftOfTheDeity.java index fe5436f9c3a..ea98147ef01 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/HagHedgeMage.java b/Mage.Sets/src/mage/sets/eventide/HagHedgeMage.java index cd3974496a3..b05209c4a4c 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()); + ability.addTarget(new TargetPlayer(true)); 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/MerrowLevitator.java b/Mage.Sets/src/mage/sets/eventide/MerrowLevitator.java index 083a2b15d48..3b2e52843ef 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 ef36c30b54b..7ee18834e93 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); // Retrace this.addAbility(new RetraceAbility(new ManaCostsImpl("{3}{G}"), TimingRule.SORCERY)); } diff --git a/Mage.Sets/src/mage/sets/eventide/NoggleHedgeMage.java b/Mage.Sets/src/mage/sets/eventide/NoggleHedgeMage.java index d480462a00c..8adde3eba70 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()); + ability2.addTarget(new TargetPlayer(true)); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/sets/eventide/OonasGrace.java b/Mage.Sets/src/mage/sets/eventide/OonasGrace.java index 4ea53ad7c3a..1a87c4eb677 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); // Retrace this.addAbility(new RetraceAbility(new ManaCostsImpl("{2}{U}"), TimingRule.INSTANT)); } diff --git a/Mage.Sets/src/mage/sets/eventide/RavensCrime.java b/Mage.Sets/src/mage/sets/eventide/RavensCrime.java index 44f5357bd9a..48f59708ebd 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()); + this.getSpellAbility().getTargets().add(new TargetPlayer(true)); // Retrace this.addAbility(new RetraceAbility(new ManaCostsImpl("{B}"), TimingRule.SORCERY)); } diff --git a/Mage.Sets/src/mage/sets/eventide/RecumbentBliss.java b/Mage.Sets/src/mage/sets/eventide/RecumbentBliss.java index d5a6dd2e2b4..58bc529b397 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/ScourgeOfTheNobilis.java b/Mage.Sets/src/mage/sets/eventide/ScourgeOfTheNobilis.java index 79a675f5e57..580fbe7eda3 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/ShrewdHatchling.java b/Mage.Sets/src/mage/sets/eventide/ShrewdHatchling.java index 45a196f95af..0eac499d9b6 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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/SutureSpirit.java b/Mage.Sets/src/mage/sets/eventide/SutureSpirit.java index a214c2b2e45..b2b64eb8fce 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/eventide/SyphonLife.java b/Mage.Sets/src/mage/sets/eventide/SyphonLife.java index 2f465218597..df70903c1b2 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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/Unmake.java b/Mage.Sets/src/mage/sets/eventide/Unmake.java index 8405dd280b1..463654f1d46 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } public Unmake (final Unmake card) { diff --git a/Mage.Sets/src/mage/sets/exodus/CatBurglar.java b/Mage.Sets/src/mage/sets/exodus/CatBurglar.java index efbe5471df3..bb80432d9f9 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/exodus/EntropicSpecter.java b/Mage.Sets/src/mage/sets/exodus/EntropicSpecter.java index 5279f01c6e2..34e26572698 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(); + TargetOpponent target = new TargetOpponent(true); 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 954ace5f654..3cd654f0ba5 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/exodus/ErraticPortal.java b/Mage.Sets/src/mage/sets/exodus/ErraticPortal.java index 0e30181ea6e..ad7487ea46e 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/exodus/SpikeWeaver.java b/Mage.Sets/src/mage/sets/exodus/SpikeWeaver.java index 8fa5b558d84..e34fa2a4ace 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 cefe809ac15..c86fdf9733b 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()); + this.getSpellAbility().addTarget(new TargetOpponent(true)); } 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 bb00a1370de..dbfa6161af3 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfTomorrows.java b/Mage.Sets/src/mage/sets/fifthdawn/BeaconOfTomorrows.java index fd482505c6f..63d44a701c3 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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/StaffOfDomination.java b/Mage.Sets/src/mage/sets/fifthdawn/StaffOfDomination.java index dc2ff306f92..105231f2104 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()); + ability3.addTarget(new TargetCreaturePermanent(true)); 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()); + ability4.addTarget(new TargetCreaturePermanent(true)); 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/fifthedition/DivineTransformation.java b/Mage.Sets/src/mage/sets/fifthedition/DivineTransformation.java index 07f19a8b3d6..0a9a501036a 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/Millstone.java b/Mage.Sets/src/mage/sets/fifthedition/Millstone.java index 0012b080a51..a3ed79f35a8 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/fifthedition/PradeshGypsies.java b/Mage.Sets/src/mage/sets/fifthedition/PradeshGypsies.java index 09ec4ef9931..65d88222e9b 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/fifthedition/WyluliWolf.java b/Mage.Sets/src/mage/sets/fifthedition/WyluliWolf.java index 01191083a2a..2324773c14e 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/fourthedition/Blessing.java b/Mage.Sets/src/mage/sets/fourthedition/Blessing.java index c0095a5b75a..083be513148 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/HolyArmor.java b/Mage.Sets/src/mage/sets/fourthedition/HolyArmor.java index 8a77798f263..1a865a76a8c 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 b0084528757..b909779c94c 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 7ebef417de7..af7e2589ba9 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(); + TargetOpponent target = new TargetOpponent(true); target.setRequired(true); target.setNotTarget(true); if (player.choose(this.outcome, target, source.getSourceId(), game)) { diff --git a/Mage.Sets/src/mage/sets/futuresight/IchorSlick.java b/Mage.Sets/src/mage/sets/futuresight/IchorSlick.java index 8fa7494d020..8015c5bbf42 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); // 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 39bc05f1d67..9184befb6a7 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/AerialManeuver.java b/Mage.Sets/src/mage/sets/gatecrash/AerialManeuver.java index 2f6880d07f5..232d5605c8d 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()); + getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 d63641491ae..865b0ab81b7 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 e7e27d3144e..2e24b509482 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/BorosCharm.java b/Mage.Sets/src/mage/sets/gatecrash/BorosCharm.java index 822acc37932..8384334ac21 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); //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()); + mode2.getTargets().add(new TargetCreaturePermanent(true)); 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 778d17a577b..2a32aba3c12 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 d2e06d4ea2d..1684bd91aa2 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/ClanDefiance.java +++ b/Mage.Sets/src/mage/sets/gatecrash/ClanDefiance.java @@ -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()); + mode2.getTargets().add(new TargetPlayer(true)); 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 04f1affe9ee..ff2addf1307 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()); + getSpellAbility().addTarget(new TargetPlayer(true)); } 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 f3751adef22..3d51fe2e78c 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 e14c717c1a1..5a09398dbc4 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()); + gainAbility.addTarget(new TargetCreaturePermanent(true)); 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 058f80d0c6d..94fd25b7825 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } 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 8d200bafa9f..62f599f0447 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()); + mode2.getTargets().add(new TargetPlayer(true)); 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 e74f30c8cd9..e100b2d9be8 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()); + ability.addTarget(new TargetPermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/DuskmantleGuildmage.java b/Mage.Sets/src/mage/sets/gatecrash/DuskmantleGuildmage.java index a5fd5af73ac..3d9bf5550e3 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/DyingWish.java b/Mage.Sets/src/mage/sets/gatecrash/DyingWish.java index c0225074a27..c1f7f5d6211 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(); + TargetPermanent auraTarget = new TargetControlledCreaturePermanent(true); 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/FirefistStriker.java b/Mage.Sets/src/mage/sets/gatecrash/FirefistStriker.java index 1b4c3b0e5fb..ee603e6558f 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/ForcedAdaptation.java b/Mage.Sets/src/mage/sets/gatecrash/ForcedAdaptation.java index f5831c6c71c..a13846d00b4 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/GideonChampionOfJustice.java b/Mage.Sets/src/mage/sets/gatecrash/GideonChampionOfJustice.java index 16e5ca4593f..7d5a0ddb053 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()); + ability1.addTarget(new TargetOpponent(true)); 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 ea82cd9f64e..8b77e4ccc85 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/GroundAssault.java b/Mage.Sets/src/mage/sets/gatecrash/GroundAssault.java index fbf6d242bb6..f76bfcb4203 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 797ec57de4a..2cfa757866a 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/HolyMantle.java b/Mage.Sets/src/mage/sets/gatecrash/HolyMantle.java index 8428d7906a2..f4d6fa78860 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 536f36b2b6a..c2b81d39fdb 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } public HomingLightning(final HomingLightning card) { diff --git a/Mage.Sets/src/mage/sets/gatecrash/MadcapSkills.java b/Mage.Sets/src/mage/sets/gatecrash/MadcapSkills.java index c0154c09703..5917201432e 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/MentalVapors.java b/Mage.Sets/src/mage/sets/gatecrash/MentalVapors.java index 090978a3665..90d416a86cb 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); // 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 107dad9c952..6e928bb92d4 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/Mugging.java b/Mage.Sets/src/mage/sets/gatecrash/Mugging.java index 2c34e8c715b..7bfae241cdd 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 400b0c74114..0b1ab556330 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(); + TargetPermanent auraTarget = new TargetControlledCreaturePermanent(true); 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/OneThousandLashes.java b/Mage.Sets/src/mage/sets/gatecrash/OneThousandLashes.java index b54c0f1d676..918cf8b4759 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 16d5b40c37e..561242fbf62 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()); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); // 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()); + mode.getTargets().add(new TargetCreaturePermanent(true)); 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/PredatorsRapport.java b/Mage.Sets/src/mage/sets/gatecrash/PredatorsRapport.java index 1fd324846d6..67076bef06e 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()); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); } 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 32245603b3c..fc280abba33 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 ce49bfbc6a2..88f7d3a350a 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()); + this.getSpellAbility().addTarget(new TargetOpponent(true)); 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 4a49ff51536..94ecde0c9f9 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 fb3f5b59441..ee1585f124c 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()); + ability.addTarget(new TargetOpponent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/ShadowSlice.java b/Mage.Sets/src/mage/sets/gatecrash/ShadowSlice.java index ae14a089955..8adbfa7f3ea 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()); + this.getSpellAbility().addTarget(new TargetOpponent(true)); // 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/SimicCharm.java b/Mage.Sets/src/mage/sets/gatecrash/SimicCharm.java index 51fc4f2506f..5023aead001 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); //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()); + mode2.getTargets().add(new TargetCreaturePermanent(true)); 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 30a2a485cbd..5c7445995c1 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/Skygames.java b/Mage.Sets/src/mage/sets/gatecrash/Skygames.java index 772fe792470..a7b3e80a60e 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()); + gainAbility.addTarget(new TargetCreaturePermanent(true)); 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 5e9be79dcfa..1ad141c31c7 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/StructuralCollapse.java b/Mage.Sets/src/mage/sets/gatecrash/StructuralCollapse.java index b2f41caf80a..b4e1969e0b5 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } 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 190c41f7d8c..122e852b5c2 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())); - ability.addTarget(new TargetPlayer()); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/UndercityPlague.java b/Mage.Sets/src/mage/sets/gatecrash/UndercityPlague.java index 638a5926982..21cbd4e0776 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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/VizkopaGuildmage.java b/Mage.Sets/src/mage/sets/gatecrash/VizkopaGuildmage.java index 68c10c7fd04..51f8e7b1cc9 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 aa0b2dda211..44b55c9652d 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); // 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 cfd9f8fa541..542587d4edf 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 43b052b865f..d804fbf9c20 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(), CounterType.P1P1)); + ability.addCost(new RemoveCounterCost(new TargetControlledCreaturePermanent(true), 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 a3653d86276..2f572c17d0e 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()); + ability.addTarget(new TargetPermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/guildpact/BurningTreeShaman.java b/Mage.Sets/src/mage/sets/guildpact/BurningTreeShaman.java index 9460451c3c4..966a9605b32 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()); + this.addTarget(new TargetPlayer(true)); } 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 60148914eba..cdf960c202d 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); this.getSpellAbility().addEffect(new GainLifeEffect(2)); } diff --git a/Mage.Sets/src/mage/sets/guildpact/GhostCouncilOfOrzhova.java b/Mage.Sets/src/mage/sets/guildpact/GhostCouncilOfOrzhova.java index cc25f76cc43..c32b971eda8 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()); + ability.addTarget(new TargetOpponent(true)); 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())); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/guildpact/GruulGuildmage.java b/Mage.Sets/src/mage/sets/guildpact/GruulGuildmage.java index f9e60cd509c..9ff745614a6 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()); + secondAbility.addTarget(new TargetCreaturePermanent(true)); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/sets/guildpact/HarrierGriffin.java b/Mage.Sets/src/mage/sets/guildpact/HarrierGriffin.java index 8473c0bfc5d..c49091d54f8 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/guildpact/HypervoltGrasp.java b/Mage.Sets/src/mage/sets/guildpact/HypervoltGrasp.java index c23a7b35111..cbb3265b1bc 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 aa40a7f5291..d8cca61a40e 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/OstiaryThrull.java b/Mage.Sets/src/mage/sets/guildpact/OstiaryThrull.java index 1c79543004d..70664bd4f58 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/guildpact/PilloryOfTheSleepless.java b/Mage.Sets/src/mage/sets/guildpact/PilloryOfTheSleepless.java index c8b0c6d1b9d..67edb55e3b9 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 959dbae029d..2e33a943260 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())); - ability.addTarget(new TargetCreaturePermanent()); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/guildpact/RestlessBones.java b/Mage.Sets/src/mage/sets/guildpact/RestlessBones.java index 7e818ad9fba..6514184859d 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 63d5435624f..286ffea472c 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())); - ability.addTarget(new TargetPlayer()); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/guildpact/ShadowLance.java b/Mage.Sets/src/mage/sets/guildpact/ShadowLance.java index db44aa60191..1f3f561fbb7 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/SkarrgTheRagePits.java b/Mage.Sets/src/mage/sets/guildpact/SkarrgTheRagePits.java index d36e6294ed7..172f6eadee2 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/guildpact/StarvedRusalka.java b/Mage.Sets/src/mage/sets/guildpact/StarvedRusalka.java index d6373eb8d37..09c9d3d90b1 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())); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/guildpact/TiborAndLumia.java b/Mage.Sets/src/mage/sets/guildpact/TiborAndLumia.java index 9b7cc751073..8d9dd957e1d 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()); + firstAbility.addTarget(new TargetCreaturePermanent(true)); this.addAbility(firstAbility); this.addAbility(new SpellCastControllerTriggeredAbility(new DamageAllEffect(1, filter), filterRed, false)); diff --git a/Mage.Sets/src/mage/sets/guildpact/Wildsize.java b/Mage.Sets/src/mage/sets/guildpact/Wildsize.java index 6cfa1f14dca..a1edcbb805b 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/UndyingRage.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/UndyingRage.java index ad8e784d2a3..a696fb575e4 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 660dd39680b..9d1d4b64269 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/Torture.java b/Mage.Sets/src/mage/sets/homelands/Torture.java index 846bf093470..53d5af7c9a5 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/FyndhornBrownie.java b/Mage.Sets/src/mage/sets/iceage/FyndhornBrownie.java index 817e025db0d..5ab63bda5e5 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/iceage/ImposingVisage.java b/Mage.Sets/src/mage/sets/iceage/ImposingVisage.java index 215e3eb740d..e3763d13c0a 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 fab0b23e45f..26c7a4c9357 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/Pyroblast.java b/Mage.Sets/src/mage/sets/iceage/Pyroblast.java index 7f883f9a43c..5fd277af37b 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()); + mode.getTargets().add(new TargetPermanent(true)); 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 612e6b964e6..ef2621b382f 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 4601d6c3748..d5e4ce177bb 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())); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/AltarsReap.java b/Mage.Sets/src/mage/sets/innistrad/AltarsReap.java index 0f42bae13df..f2a552af1de 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())); + this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); // Draw two cards. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(2)); } diff --git a/Mage.Sets/src/mage/sets/innistrad/BitterheartWitch.java b/Mage.Sets/src/mage/sets/innistrad/BitterheartWitch.java index b6ae9610e01..bca11e25e18 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/BondsOfFaith.java b/Mage.Sets/src/mage/sets/innistrad/BondsOfFaith.java index bdd431c560f..3f45ef8410a 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 4f9cb535317..06d7074107d 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/BumpInTheNight.java b/Mage.Sets/src/mage/sets/innistrad/BumpInTheNight.java index b0974919550..7686d151037 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()); + this.getSpellAbility().addTarget(new TargetOpponent(true)); // Flashback {5}{R} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{5}{R}"), TimingRule.SORCERY)); diff --git a/Mage.Sets/src/mage/sets/innistrad/CellarDoor.java b/Mage.Sets/src/mage/sets/innistrad/CellarDoor.java index ae19e02ec96..e0d66d33aa2 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/Claustrophobia.java b/Mage.Sets/src/mage/sets/innistrad/Claustrophobia.java index 0d13b60f59c..55f5dae4362 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 83c876cd00e..07b2914ad32 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); this.getSpellAbility().addEffect(new CorpseLungeEffect()); } diff --git a/Mage.Sets/src/mage/sets/innistrad/Curiosity.java b/Mage.Sets/src/mage/sets/innistrad/Curiosity.java index ed271ea491c..bc4bff215a7 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/DeadWeight.java b/Mage.Sets/src/mage/sets/innistrad/DeadWeight.java index f4cba0fd46e..4279582e24b 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 69e29182f71..4c3306cbe56 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()))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); // 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 db125152468..68131915c42 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())); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/ElderCathar.java b/Mage.Sets/src/mage/sets/innistrad/ElderCathar.java index 6f1c2fdfc91..fc3668809c1 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()); + ability.addTarget(new TargetControlledCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/ElderOfLaurels.java b/Mage.Sets/src/mage/sets/innistrad/ElderOfLaurels.java index e3768bfecb9..01b396dec35 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/FurorOfTheBitten.java b/Mage.Sets/src/mage/sets/innistrad/FurorOfTheBitten.java index a977ef885dd..89b71de094a 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 b315eceb63b..00e0af61484 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()); + ability1.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability1); // 0: Put a 2/2 green Wolf creature token onto the battlefield. diff --git a/Mage.Sets/src/mage/sets/innistrad/GhostlyPossession.java b/Mage.Sets/src/mage/sets/innistrad/GhostlyPossession.java index c8d5ae3db68..31975b9a72f 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 990fcca4068..425d2055506 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); // 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 6f2e32bc163..7454ffd51c0 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/GruesomeDeformity.java b/Mage.Sets/src/mage/sets/innistrad/GruesomeDeformity.java index 8163b829d3c..8db01106eb2 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(); + TargetPermanent target = new TargetCreaturePermanent(true); 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 5d7bd499bb3..4482636a12f 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 d491dc90003..861dfaecc17 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())); + this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); // 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 84cd5f5fef2..72644d798d0 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); this.getSpellAbility().addEffect(new IntoTheMawOfHellEffect()); } diff --git a/Mage.Sets/src/mage/sets/innistrad/LilianaOfTheVeil.java b/Mage.Sets/src/mage/sets/innistrad/LilianaOfTheVeil.java index 4fbc0bfa5f6..af8b2ad74b4 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()); + ability.addTarget(new TargetPlayer(true)); 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/LostInTheMist.java b/Mage.Sets/src/mage/sets/innistrad/LostInTheMist.java index 0588693c0d4..a6d49763b38 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()); + this.getSpellAbility().addTarget(new TargetPermanent(true)); this.getSpellAbility().addEffect(new LostInTheMistEffect()); } diff --git a/Mage.Sets/src/mage/sets/innistrad/Mindshrieker.java b/Mage.Sets/src/mage/sets/innistrad/Mindshrieker.java index 81142f91c2e..4df6bae2b31 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/MomentOfHeroism.java b/Mage.Sets/src/mage/sets/innistrad/MomentOfHeroism.java index 9aa54cd21e3..ef029cea1ab 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 d902d872013..8b4b21a1a79 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/NephaliaDrownyard.java b/Mage.Sets/src/mage/sets/innistrad/NephaliaDrownyard.java index d2782d24450..937fbb0c5e2 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/NightTerrors.java b/Mage.Sets/src/mage/sets/innistrad/NightTerrors.java index 85d838c353c..527703fe6ec 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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 3ef05647990..84e155f31ae 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()); + activatedAbility.addTarget(new TargetCreaturePermanent(true)); 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/RageThrower.java b/Mage.Sets/src/mage/sets/innistrad/RageThrower.java index 6de99a18350..87122be8a5f 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/RangersGuile.java b/Mage.Sets/src/mage/sets/innistrad/RangersGuile.java index 006606126dc..9be79f7c554 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()); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); 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/SelhoffOccultist.java b/Mage.Sets/src/mage/sets/innistrad/SelhoffOccultist.java index bcfb2654af9..ffabfe1bf90 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/SensoryDeprivation.java b/Mage.Sets/src/mage/sets/innistrad/SensoryDeprivation.java index 60c29ee4ce8..3177e676a8c 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 398b29ee30f..adb3e7bac4f 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); // 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 4b2fa22c0f1..a8d1e1e991c 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); // Flashback {4}{U} diff --git a/Mage.Sets/src/mage/sets/innistrad/SkeletalGrimace.java b/Mage.Sets/src/mage/sets/innistrad/SkeletalGrimace.java index 1bfa2f815e7..c491beff3cd 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 eff79dcca0e..b657ee51675 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())); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/SpectralFlight.java b/Mage.Sets/src/mage/sets/innistrad/SpectralFlight.java index bc9c5de53be..c72e7df5da8 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(); + TargetPermanent target = new TargetCreaturePermanent(true); 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 091260596f8..e1d962280da 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 94b072ce12a..62558a1d2d3 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/innistrad/TraitorousBlood.java b/Mage.Sets/src/mage/sets/innistrad/TraitorousBlood.java index 5f947347e78..d1db16850cd 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 561e198b146..82a8f4fd475 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()); + this.getSpellAbility().addTarget(new TargetOpponent(true)); this.getSpellAbility().addEffect(new TributeToHungerEffect()); } diff --git a/Mage.Sets/src/mage/sets/innistrad/WreathofGeists.java b/Mage.Sets/src/mage/sets/innistrad/WreathofGeists.java index 524b575db68..db05a618a8e 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); diff --git a/Mage.Sets/src/mage/sets/invasion/ArmadilloCloak.java b/Mage.Sets/src/mage/sets/invasion/ArmadilloCloak.java index 9e003c8434b..15995f6a716 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/BenalishTrapper.java b/Mage.Sets/src/mage/sets/invasion/BenalishTrapper.java index a1d0a68a540..a89047fa04a 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/invasion/HeroesReunion.java b/Mage.Sets/src/mage/sets/invasion/HeroesReunion.java index 09a91efa031..a7aa64aa0a8 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } public HeroesReunion(final HeroesReunion card) { diff --git a/Mage.Sets/src/mage/sets/invasion/PhyrexianAltar.java b/Mage.Sets/src/mage/sets/invasion/PhyrexianAltar.java index 620ffc4b449..205ebeeb66a 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()))); + this.addAbility(new AnyColorManaAbility(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); } 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 e3e3bf833dc..3e93749a41b 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); // 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 b91292b3659..7c6550577a9 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); diff --git a/Mage.Sets/src/mage/sets/invasion/ThunderscapeApprentice.java b/Mage.Sets/src/mage/sets/invasion/ThunderscapeApprentice.java index b1a18a32533..5d3b0eeb8a8 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()); + ability.addTarget(new TargetPlayer(true)); 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/invasion/ThunderscapeMaster.java b/Mage.Sets/src/mage/sets/invasion/ThunderscapeMaster.java index 15b0466d908..523ceda0ef4 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()); + ability.addTarget(new TargetPlayer(true)); 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/journeyintonyx/ArmamentOfNyx.java b/Mage.Sets/src/mage/sets/journeyintonyx/ArmamentOfNyx.java index 40b0eb684a8..d936500a299 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 85036a31390..e9884f92dce 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/CastIntoDarkness.java b/Mage.Sets/src/mage/sets/journeyintonyx/CastIntoDarkness.java index 4b0865196e8..565c84c47be 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/FlamespeakersWill.java b/Mage.Sets/src/mage/sets/journeyintonyx/FlamespeakersWill.java index 6428214ae0f..86009dc02bc 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(); + TargetPermanent auraTarget = new TargetControlledCreaturePermanent(true); 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/LightningDiadem.java b/Mage.Sets/src/mage/sets/journeyintonyx/LightningDiadem.java index 061727c9aca..f456b4d6f06 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/MortalObstinacy.java b/Mage.Sets/src/mage/sets/journeyintonyx/MortalObstinacy.java index 8fe029c15fc..3e90c91964e 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(); + TargetPermanent auraTarget = new TargetControlledCreaturePermanent(true); 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/NyxInfusion.java b/Mage.Sets/src/mage/sets/journeyintonyx/NyxInfusion.java index f5036f47ce9..f2fd247b6c8 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/OppressiveRays.java b/Mage.Sets/src/mage/sets/journeyintonyx/OppressiveRays.java index 9c3f45f649b..c57348c5a50 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 710674c20ef..ef60099d24c 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/Starfall.java b/Mage.Sets/src/mage/sets/journeyintonyx/Starfall.java index 3968b9f66de..c8f92efac1a 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); this.getSpellAbility().addEffect(new StarfallEffect()); } diff --git a/Mage.Sets/src/mage/sets/judgment/ElephantGuide.java b/Mage.Sets/src/mage/sets/judgment/ElephantGuide.java index 926f63a6759..87156e15691 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/QuietSpeculation.java b/Mage.Sets/src/mage/sets/judgment/QuietSpeculation.java index 211d2494fa4..ea45bf0c175 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } public QuietSpeculation(final QuietSpeculation card) { diff --git a/Mage.Sets/src/mage/sets/judgment/ThrissNantukoPrimus.java b/Mage.Sets/src/mage/sets/judgment/ThrissNantukoPrimus.java index dab514189dc..921e99688f7 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/judgment/UnquestionedAuthority.java b/Mage.Sets/src/mage/sets/judgment/UnquestionedAuthority.java index 184117cb924..def0b58e826 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 76270f261b1..a95ddb66dad 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/legions/GempalmIncinerator.java b/Mage.Sets/src/mage/sets/legions/GempalmIncinerator.java index a4e9f6d52db..1486d601e49 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/legions/HunterSliver.java b/Mage.Sets/src/mage/sets/legions/HunterSliver.java index f95539dcd87..8f066bae736 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, new FilterCreaturePermanent("Sliver", "Sliver creatures")))); } diff --git a/Mage.Sets/src/mage/sets/limitedalpha/AspectOfWolf.java b/Mage.Sets/src/mage/sets/limitedalpha/AspectOfWolf.java index fb1d2183765..979899eb844 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 c36107a11db..0c0b83207d3 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Burrowing.java b/Mage.Sets/src/mage/sets/limitedalpha/Burrowing.java index c7a28b416a9..9a415d17997 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 4dcb6db620e..4f19b90b2cb 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()); + ability.addTarget(new TargetPlayer(true)); 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 b62773cd586..2c6944afe9f 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/GlassesOfUrza.java b/Mage.Sets/src/mage/sets/limitedalpha/GlassesOfUrza.java index e32b97cc124..adcf481a4d2 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/limitedalpha/HowlFromBeyond.java b/Mage.Sets/src/mage/sets/limitedalpha/HowlFromBeyond.java index 2c37dcf9fd4..15f76469fff 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 a27d5fcc2c2..f6208c4831c 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Web.java b/Mage.Sets/src/mage/sets/limitedalpha/Web.java index 1bc6a554795..231849299b7 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 e7bea73e263..c18bef8f0bd 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/BrigidHeroOfKinsbaile.java b/Mage.Sets/src/mage/sets/lorwyn/BrigidHeroOfKinsbaile.java index 0a0e1e2acee..4f47aad7ad9 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/DrownerOfSecrets.java b/Mage.Sets/src/mage/sets/lorwyn/DrownerOfSecrets.java index 21f7c68ca2c..09555d50472 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/EpicProportions.java b/Mage.Sets/src/mage/sets/lorwyn/EpicProportions.java index acfdccb0ae2..ff4c9b7826b 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/HerbalPoultice.java b/Mage.Sets/src/mage/sets/lorwyn/HerbalPoultice.java index c1d828dfdfb..d655e1ab9c5 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/HornetHarasser.java b/Mage.Sets/src/mage/sets/lorwyn/HornetHarasser.java index 8beb9244fcb..28a39bb3f1d 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/ImmaculateMagistrate.java b/Mage.Sets/src/mage/sets/lorwyn/ImmaculateMagistrate.java index ca15e61e219..c3cb34c8552 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/KinsbaileBalloonist.java b/Mage.Sets/src/mage/sets/lorwyn/KinsbaileBalloonist.java index b87a18a4838..2585ccab1ad 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/KinsbaileSkirmisher.java b/Mage.Sets/src/mage/sets/lorwyn/KinsbaileSkirmisher.java index 1af8ab617d0..203847db46c 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/LaceWithMoonglove.java b/Mage.Sets/src/mage/sets/lorwyn/LaceWithMoonglove.java index 7b3e2fd2e35..a527b4ae466 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 046fbfeaa17..47e3af2ed93 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 493bc828a8a..ef1316bf545 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(); + Target target = new TargetPermanent(true); target.setRequired(true); - ability.addTarget(new TargetPermanent()); + ability.addTarget(new TargetPermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/Pestermite.java b/Mage.Sets/src/mage/sets/lorwyn/Pestermite.java index 9f3d4df2dfa..a450e0e04f7 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()); + ability.addTarget(new TargetPermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/PrimalCommand.java b/Mage.Sets/src/mage/sets/lorwyn/PrimalCommand.java index 3db7fc8f7c8..44a00ad6ff8 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/PrimalCommand.java +++ b/Mage.Sets/src/mage/sets/lorwyn/PrimalCommand.java @@ -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()); + mode.getTargets().add(new TargetPlayer(true)); 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 afc79d51810..fa3c680ce60 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 fc9595a0c3f..f576d774a14 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/SpiderwigBoggart.java b/Mage.Sets/src/mage/sets/lorwyn/SpiderwigBoggart.java index df51c498b88..39664158b70 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/StonybrookAngler.java b/Mage.Sets/src/mage/sets/lorwyn/StonybrookAngler.java index dcbd6d596f5..15adca1e9d7 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/Surgespanner.java b/Mage.Sets/src/mage/sets/lorwyn/Surgespanner.java index 4740adc4205..6424ec45dd1 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()); + ability.addTarget(new TargetPermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/ThorntoothWitch.java b/Mage.Sets/src/mage/sets/lorwyn/ThorntoothWitch.java index b6a53bf4c21..15d4bb5c871 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/ZephyrNet.java b/Mage.Sets/src/mage/sets/lorwyn/ZephyrNet.java index 307268778f6..5596fe2ee7a 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/AcolyteOfXathrid.java b/Mage.Sets/src/mage/sets/magic2010/AcolyteOfXathrid.java index 4e2b15ed440..e8a00ab28c4 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2010/ArmoredAscension.java b/Mage.Sets/src/mage/sets/magic2010/ArmoredAscension.java index 0c59e91ec60..e9afa97e381 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 bbe4c9f6520..6ba47255f28 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java b/Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java index a9d51fbe5af..f9d47aa5089 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()); + ability1.addTarget(new TargetPlayer(true)); this.addAbility(ability1); LoyaltyAbility ability2 = new LoyaltyAbility(new DamageTargetEffect(ChandraNalaarXValue.getDefault())); - ability2.addTarget(new TargetCreaturePermanent()); + ability2.addTarget(new TargetCreaturePermanent(true)); 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()); + ability3.addTarget(new TargetPlayer(true)); this.addAbility(ability3); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Disorient.java b/Mage.Sets/src/mage/sets/magic2010/Disorient.java index dec02a6e5cd..2aecb60b9c1 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); this.getSpellAbility().addEffect(new BoostTargetEffect(-7, 0, Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Duress.java b/Mage.Sets/src/mage/sets/magic2010/Duress.java index aea882b8e65..f22fb1b4f37 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()); + this.getSpellAbility().addTarget(new TargetOpponent(true)); this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(filter)); } diff --git a/Mage.Sets/src/mage/sets/magic2010/HauntingEchoes.java b/Mage.Sets/src/mage/sets/magic2010/HauntingEchoes.java index 5427bb660d9..db4d5a61a1c 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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 20c10392edf..07eaeb4ecdb 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 069901f336d..b586b40126c 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(); + TargetPermanent auraTarget = new TargetPermanent(true); 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 0dd2d23f65d..f73dab60a78 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()); + ability1.addTarget(new TargetPlayer(true)); this.addAbility(ability1); LoyaltyAbility ability2 = new LoyaltyAbility(new PutLibraryIntoGraveTargetEffect(20), -10); - ability2.addTarget(new TargetPlayer()); + ability2.addTarget(new TargetPlayer(true)); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Jump.java b/Mage.Sets/src/mage/sets/magic2010/Jump.java index ecf5ade5823..a288e24613e 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 bf008400491..fcf354417e4 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } public KindledFury(final KindledFury card) { diff --git a/Mage.Sets/src/mage/sets/magic2010/LilianaVess.java b/Mage.Sets/src/mage/sets/magic2010/LilianaVess.java index e2242252da4..a9b9ec2bae0 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()); + ability1.addTarget(new TargetPlayer(true)); 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 03e3ae94209..9586f4d4b78 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2010/MightOfOaks.java b/Mage.Sets/src/mage/sets/magic2010/MightOfOaks.java index f5d2934e47e..62de1884439 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 98b12d0fb07..d008a2027cb 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 9698639da4f..ec50dafcb9d 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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 da66ea3bcea..90d89363f9d 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 7493c45ea2e..a5e442ac1a5 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 813c9af6349..4b14d409270 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 de85e2c05d0..f8da07a977f 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()); + ability.addTarget(new TargetOpponent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2010/SeismicStrike.java b/Mage.Sets/src/mage/sets/magic2010/SeismicStrike.java index c0860f5c63d..c9e31a575fe 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 aaf4dad7113..f5ed407ced0 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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 30138fe8931..c53296ad6d7 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); this.getSpellAbility().addEffect(new SleepEffect()); } diff --git a/Mage.Sets/src/mage/sets/magic2010/SoulBleed.java b/Mage.Sets/src/mage/sets/magic2010/SoulBleed.java index ebfdcbc9c13..9ea7f9987cb 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 578faaaf3d3..6821346bece 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); this.getSpellAbility().addEffect(new GainLifeEffect(new PermanentsOnBattlefieldCount(filter))); } diff --git a/Mage.Sets/src/mage/sets/magic2010/TomeScour.java b/Mage.Sets/src/mage/sets/magic2010/TomeScour.java index c9fd377a7c0..df4b3dab179 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(5)); } diff --git a/Mage.Sets/src/mage/sets/magic2010/VampireAristocrat.java b/Mage.Sets/src/mage/sets/magic2010/VampireAristocrat.java index 6c65af0fd40..5837260a8aa 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())); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2010/Weakness.java b/Mage.Sets/src/mage/sets/magic2010/Weakness.java index b24191eed80..e0d1d9b42a0 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/magic2011/AetherAdept.java b/Mage.Sets/src/mage/sets/magic2011/AetherAdept.java index fae2ecddb6e..8d34d45d53c 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2011/BrittleEffigy.java b/Mage.Sets/src/mage/sets/magic2011/BrittleEffigy.java index 54111bdbf76..51f924797bc 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2011/CaptivatingVampire.java b/Mage.Sets/src/mage/sets/magic2011/CaptivatingVampire.java index c79763eada0..c8ee6f0ed8f 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2011/ChandrasOutrage.java b/Mage.Sets/src/mage/sets/magic2011/ChandrasOutrage.java index 39adfe37125..e151f4b176f 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } public ChandrasOutrage(final ChandrasOutrage card) { diff --git a/Mage.Sets/src/mage/sets/magic2011/Diminish.java b/Mage.Sets/src/mage/sets/magic2011/Diminish.java index 53972b169ca..33b280af1cd 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 07de7d14a90..985aea049c2 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 5a14b67702f..f569fba4d73 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())); + this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); 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 90f9463ad85..3e8d8f464de 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()); + this.addTarget(new TargetPermanent(true)); } 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 dfe7c5f42e7..69bd646e5a7 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 7b125394bb5..2926452ab1f 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2011/JinxedIdol.java b/Mage.Sets/src/mage/sets/magic2011/JinxedIdol.java index 9ca81ab7c45..70503ed2493 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())); - ability.addTarget(new TargetOpponent()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new JinxedIdolEffect(), new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addTarget(new TargetOpponent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java b/Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java index f26a4315485..4638cc34ff3 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()); + this.addTarget(new TargetPlayer(true)); getTargets().get(0).add(event.getPlayerId(), game); return true; } diff --git a/Mage.Sets/src/mage/sets/magic2011/MightyLeap.java b/Mage.Sets/src/mage/sets/magic2011/MightyLeap.java index 70aa7cf4c0a..dc174416793 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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/NecroticPlague.java b/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java index 244b1762762..51d6444110b 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/PrimalCocoon.java b/Mage.Sets/src/mage/sets/magic2011/PrimalCocoon.java index fd5db83c102..daf88f61568 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 b39b61a8088..f4ec5235da0 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 f718f679954..2d7ae920c68 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 276af3a45d5..e9bcd14a5b5 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 35aea54f718..a8b01312d55 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 644ff170cf1..099c4e2a0cd 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2011/VisceraSeer.java b/Mage.Sets/src/mage/sets/magic2011/VisceraSeer.java index f0061d56804..1ce0f720aa1 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()))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1), new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); } 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 b1942502673..a593c0fa5e9 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/AlabasterMage.java b/Mage.Sets/src/mage/sets/magic2012/AlabasterMage.java index 923e24c928a..9621d3111e9 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()); + ability.addTarget(new TargetControlledCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2012/AngelicDestiny.java b/Mage.Sets/src/mage/sets/magic2012/AngelicDestiny.java index d3012b52bbd..7a013386899 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 d0eacdfbf62..5ee5694772c 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2012/ArachnusWeb.java b/Mage.Sets/src/mage/sets/magic2012/ArachnusWeb.java index 45bdddb0e17..66846f4d754 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/CrimsonMage.java b/Mage.Sets/src/mage/sets/magic2012/CrimsonMage.java index 327ef80114c..2258336e41d 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()); + ability.addTarget(new TargetControlledCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2012/CrownOfEmpires.java b/Mage.Sets/src/mage/sets/magic2012/CrownOfEmpires.java index 225d4ae0df7..ab1656a1025 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 603820118e8..b937117a3ee 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 e186a07f8c5..de174105a3e 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()))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); } 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 d1d9a73c9ff..971592b8382 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 d90de453307..40fd066bc9b 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 d75fd07be04..e29e96db763 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 528a5cd84b2..948592d12f8 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2012/GoblinFireslinger.java b/Mage.Sets/src/mage/sets/magic2012/GoblinFireslinger.java index 854d4ea0baa..b9633a262b9 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2012/HuntersInsight.java b/Mage.Sets/src/mage/sets/magic2012/HuntersInsight.java index 2636304b695..19f9ec77efc 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()); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); } 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 8b3386f497a..8b93b1af558 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()); + ability1.addTarget(new TargetPlayer(true)); 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()); + ability2.addTarget(new TargetPlayer(true)); 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 f154effc544..0683ee8a044 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/MerfolkMesmerist.java b/Mage.Sets/src/mage/sets/magic2012/MerfolkMesmerist.java index 4d1300f2280..ddd528fae00 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2012/Monomania.java b/Mage.Sets/src/mage/sets/magic2012/Monomania.java index df5adc89245..490ba0926ed 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } 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 0541aa0fc91..f839ea68e84 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()); + ability.addTarget(new TargetControlledCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2012/ScepterOfEmpires.java b/Mage.Sets/src/mage/sets/magic2012/ScepterOfEmpires.java index a4badbcbc78..d4750bc6b68 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2012/SorinsThirst.java b/Mage.Sets/src/mage/sets/magic2012/SorinsThirst.java index 70d605d80b0..e20c43ee5e0 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 8a49ad7610c..1f2c1adfc67 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } 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 a4b485a7832..e4d7bb35410 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 b1c1a8217fd..f8e46b2f431 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); this.getSpellAbility().addChoice(new ChoiceColor()); } diff --git a/Mage.Sets/src/mage/sets/magic2012/StonehornDignitary.java b/Mage.Sets/src/mage/sets/magic2012/StonehornDignitary.java index 8dd8b1e827e..91c3ba95723 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(); + Target target = new TargetOpponent(true); 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 074c40a7ff1..f9e549fe9cc 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } public TasteOfBlood (final TasteOfBlood card) { diff --git a/Mage.Sets/src/mage/sets/magic2012/Trollhide.java b/Mage.Sets/src/mage/sets/magic2012/Trollhide.java index 83f4ab00cf6..06e53a02b72 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 0af1145b9f4..c090c5589d2 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 66c57934e7c..e1eeaeba85d 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } public WringFlesh(final WringFlesh card) { diff --git a/Mage.Sets/src/mage/sets/magic2013/ArmsDealer.java b/Mage.Sets/src/mage/sets/magic2013/ArmsDealer.java index 17445ac32c8..b9a2265000f 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2013/BattleflightEagle.java b/Mage.Sets/src/mage/sets/magic2013/BattleflightEagle.java index 1ebd6962a86..f8fe1f80698 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2013/BloodhunterBat.java b/Mage.Sets/src/mage/sets/magic2013/BloodhunterBat.java index 34c1c6bcbd3..47ea228a0d6 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2013/ChandrasFury.java b/Mage.Sets/src/mage/sets/magic2013/ChandrasFury.java index 6f6dc488008..38299f82b96 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } 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 9ee49bf2a87..f8bcba717ff 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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()); + ability2.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/sets/magic2013/CripplingBlight.java b/Mage.Sets/src/mage/sets/magic2013/CripplingBlight.java index e893f8e22d5..811e411b419 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(); + TargetPermanent target = new TargetCreaturePermanent(true); 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/GoblinBattleJester.java b/Mage.Sets/src/mage/sets/magic2013/GoblinBattleJester.java index 85577dd6292..7b88c871fc8 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2013/Hydrosurge.java b/Mage.Sets/src/mage/sets/magic2013/Hydrosurge.java index 649a21ac0ff..dc09f89bb13 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 eeaca4f1686..c571aa6377d 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 4a63c19fc72..dfac1b6f9a8 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(); + TargetPermanent target = new TargetCreaturePermanent(true); 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 82aefe5e9b1..55e997ea394 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()); + this.getSpellAbility().addTarget(new TargetOpponent(true)); } 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 bb1c1f5900e..928e2a44d09 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()); + ability.addTarget(new TargetOpponent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2013/Murder.java b/Mage.Sets/src/mage/sets/magic2013/Murder.java index e9cabd3bf27..4429529198c 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } public Murder(final Murder card) { diff --git a/Mage.Sets/src/mage/sets/magic2013/SandsOfDelirium.java b/Mage.Sets/src/mage/sets/magic2013/SandsOfDelirium.java index 0b4cf76473f..66d3aa7cbfb 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2013/SerpentsGift.java b/Mage.Sets/src/mage/sets/magic2013/SerpentsGift.java index 44caa9566ac..6e2a3193fda 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 724be7605c1..af574b04e4c 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 ee7e92fcada..156ba889950 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(); + TargetPermanent target = new TargetCreaturePermanent(true); 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 e64efb61285..34cdd67dad4 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2013/WitsEnd.java b/Mage.Sets/src/mage/sets/magic2013/WitsEnd.java index 0557d21bb48..92936bf5a95 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } public WitsEnd(final WitsEnd card) { diff --git a/Mage.Sets/src/mage/sets/magic2014/BarrageOfExpendables.java b/Mage.Sets/src/mage/sets/magic2014/BarrageOfExpendables.java index ffe0aadca01..15d26f6c34e 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())); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/magic2014/CelestialFlare.java b/Mage.Sets/src/mage/sets/magic2014/CelestialFlare.java index b1bbf3852c2..79b24f92581 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } diff --git a/Mage.Sets/src/mage/sets/magic2014/GnawingZombie.java b/Mage.Sets/src/mage/sets/magic2014/GnawingZombie.java index 18212b1041f..3ed25f8b130 100644 --- a/Mage.Sets/src/mage/sets/magic2014/GnawingZombie.java +++ b/Mage.Sets/src/mage/sets/magic2014/GnawingZombie.java @@ -61,7 +61,7 @@ public class GnawingZombie extends CardImpl { 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())); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2014/IllusionaryArmor.java b/Mage.Sets/src/mage/sets/magic2014/IllusionaryArmor.java index bf8b5542f95..3d3d00b6cf8 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/LifebaneZombie.java b/Mage.Sets/src/mage/sets/magic2014/LifebaneZombie.java index 17be7c74b91..b18ba5d02c0 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()); + ability.addTarget(new TargetOpponent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2014/VialOfPoison.java b/Mage.Sets/src/mage/sets/magic2014/VialOfPoison.java index 64c0341d9d4..0ab38eccc61 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/magic2014/ZephyrCharge.java b/Mage.Sets/src/mage/sets/magic2014/ZephyrCharge.java index fe4634f1c7d..0f3034deb9d 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/CateranOverlord.java b/Mage.Sets/src/mage/sets/mercadianmasques/CateranOverlord.java index 4b069675667..7fcd38dabc1 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()))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); // {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 a43cf187fa9..70075d4e446 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())); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Muzzle.java b/Mage.Sets/src/mage/sets/mercadianmasques/Muzzle.java index e95f93e4ad1..f41297f50a3 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/WaterfrontBouncer.java b/Mage.Sets/src/mage/sets/mercadianmasques/WaterfrontBouncer.java index 616a168ff29..5924ae3577b 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirage/AbyssalHunter.java b/Mage.Sets/src/mage/sets/mirage/AbyssalHunter.java index 3aa0387e69d..ec471d7021f 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirage/Afterlife.java b/Mage.Sets/src/mage/sets/mirage/Afterlife.java index e39f109d4fd..49329f94bf6 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 419d5ecd894..77c8118001b 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/BlightedShaman.java b/Mage.Sets/src/mage/sets/mirage/BlightedShaman.java index 1bc06820b19..833d4d01b1a 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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())); - ability.addTarget(new TargetCreaturePermanent()); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirage/HarmattanEfreet.java b/Mage.Sets/src/mage/sets/mirage/HarmattanEfreet.java index 6c302b88190..6df92b86e88 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirage/UnseenWalker.java b/Mage.Sets/src/mage/sets/mirage/UnseenWalker.java index 94c118b03cb..16c34908c32 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/Arrest.java b/Mage.Sets/src/mage/sets/mirrodin/Arrest.java index 6144910054e..2b871613dc3 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 89c88ab9a6e..42c9956695f 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/Battlegrowth.java b/Mage.Sets/src/mage/sets/mirrodin/Battlegrowth.java index 9cb96788ef7..3788881ad2e 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } public Battlegrowth(final Battlegrowth card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/DragonBlood.java b/Mage.Sets/src/mage/sets/mirrodin/DragonBlood.java index e3c6c1015c2..412bdae340e 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/NecrogenSpellbomb.java b/Mage.Sets/src/mage/sets/mirrodin/NecrogenSpellbomb.java index fcb16b0875d..2f8cd45fcd1 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()); + firstAbility.addTarget(new TargetPlayer(true)); 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 873e948861b..4ffc40625f6 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/NimShambler.java b/Mage.Sets/src/mage/sets/mirrodin/NimShambler.java index 687b4303d33..a0d88f8b394 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()))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); } 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 184dcc1ab32..34439008c71 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()); + ability.addTarget(new TargetPermanent(true)); 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 7835f1c835b..a3f567aefdb 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 13ce1b6bb82..0d6e1875b17 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()); + this.getSpellAbility().addTarget(new TargetPermanent(true)); } public Regress (final Regress card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/ScaleOfChissGoria.java b/Mage.Sets/src/mage/sets/mirrodin/ScaleOfChissGoria.java index 91db3241e50..22454d15eb9 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/ToothOfChissGoria.java b/Mage.Sets/src/mage/sets/mirrodin/ToothOfChissGoria.java index 74841a781d3..1e5aa3dfeb5 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/TowerOfChampions.java b/Mage.Sets/src/mage/sets/mirrodin/TowerOfChampions.java index f6593dfd27b..9c2ca6728c4 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/TowerOfMurmurs.java b/Mage.Sets/src/mage/sets/mirrodin/TowerOfMurmurs.java index 74cbf64bce8..ef6dd19f931 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/BlueSunsZenith.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/BlueSunsZenith.java index 55905c84baf..66b9080e6c4 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } 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 840ad8fc7c0..d6021d7ac67 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()); + ability.addTarget(new TargetControlledCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/BurntheImpure.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/BurntheImpure.java index 4b067caa1b1..456678c13aa 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 404c235c00e..28daa2b283a 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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 3590fbd064a..a3dc58cfdf0 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 802e5009669..cd1fe942323 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Cryptoplasm.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Cryptoplasm.java @@ -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()); + upkeepAbility.addTarget(new TargetCreaturePermanent(true)); 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 ca96120c0a0..94311776958 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()); + ability.addTarget(new TargetOpponent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/FleshEaterImp.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/FleshEaterImp.java index d3a396c022e..e77ca5f3503 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()))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); } public FleshEaterImp (final FleshEaterImp card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/GoreVassal.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/GoreVassal.java index 5ed79b2f346..35b879923c7 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 4839c91ac67..67f8c58942b 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); this.getSpellAbility().addEffect(new DiscardTargetEffect(1)); this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/MagneticMine.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/MagneticMine.java index b84b9b7c1ee..3f8da7212e1 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/MirranMettle.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/MirranMettle.java index 4a9990ff44a..4aca1eddcc0 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 889ed6c9045..bbeb2757f25 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Phyresis.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Phyresis.java index 76a2d0b3479..452ebebf71a 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 96775f45e1c..73e057639fe 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()); + ability.addTarget(new TargetOpponent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/PistonSledge.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PistonSledge.java index bdf5808877c..840038f8376 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()); + ability.addTarget(new TargetControlledCreaturePermanent(true)); 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/PlaguemawBeast.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PlaguemawBeast.java index ee01e81aeeb..5319491f5f7 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())); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Shriekhorn.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Shriekhorn.java index f00327d6472..b95e00b582f 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpinEngine.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpinEngine.java index 603b89c8938..e543316f57f 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpineOfIshSah.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpineOfIshSah.java index b1e7fade349..214edd19a4a 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()); + ability.addTarget(new TargetPermanent(true)); 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 3ab6ece6d80..b7eb0638b2c 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 dc5c9c99a7b..c049035e10e 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/TezzeretAgentOfBolas.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/TezzeretAgentOfBolas.java @@ -87,7 +87,7 @@ public class TezzeretAgentOfBolas extends CardImpl { // -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()); + ability2.addTarget(new TargetPlayer(true)); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/UnnaturalPredation.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/UnnaturalPredation.java index 83251c146dd..a971e1b8317 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 215b826cd3c..27859b9d71f 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/VirulentWound.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/VirulentWound.java index 7a844caf73b..c80f168c2fe 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); // 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 0bcb1ff9dc3..55d1a04efa1 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())); + this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); } 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 4e29641ed60..95d4c7a82f2 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/RiftElemental.java b/Mage.Sets/src/mage/sets/modernmasters/RiftElemental.java index cac5f234db5..5b658673fd5 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(), CounterType.TIME)); + ability.addCost(new RemoveCounterCost(new TargetControlledCreaturePermanent(true), 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 1475350bd5f..da6fede1ac7 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(); + Target targetCreature = new TargetControlledCreaturePermanent(true); 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 0475362f013..5d28f92dbe1 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(); + TargetPermanent auraTarget = new TargetPermanent(true); 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/ThievingSprite.java b/Mage.Sets/src/mage/sets/modernmasters/ThievingSprite.java index a78526eee27..90e683adcc9 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(); + TargetPlayer target = new TargetPlayer(true); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/modernmasters/WarrenWeirding.java b/Mage.Sets/src/mage/sets/modernmasters/WarrenWeirding.java index 499b417f9a2..4d8b319ff8b 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } 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 78d9036e05e..eb7d7583c15 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/morningtide/DailyRegimen.java b/Mage.Sets/src/mage/sets/morningtide/DailyRegimen.java index f5d69cd8d39..b645fae6cee 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 9d382a82885..40dae3aa095 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 e951b02d6a7..db74a8fb0da 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/morningtide/Meadowboon.java b/Mage.Sets/src/mage/sets/morningtide/Meadowboon.java index 8f7b03353ff..bba368d06d5 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); // Evoke {3}{W} this.addAbility(new EvokeAbility(this, "{3}{W}")); diff --git a/Mage.Sets/src/mage/sets/morningtide/ScarbladeElite.java b/Mage.Sets/src/mage/sets/morningtide/ScarbladeElite.java index 02914a7b27b..77f61e3962e 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/morningtide/Slithermuse.java b/Mage.Sets/src/mage/sets/morningtide/Slithermuse.java index a3266b28967..5e331d8ad13 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(); + TargetOpponent target = new TargetOpponent(true); target.setRequired(true); target.setNotTarget(true); if (player.choose(this.outcome, target, source.getSourceId(), game)) { diff --git a/Mage.Sets/src/mage/sets/morningtide/VendilionClique.java b/Mage.Sets/src/mage/sets/morningtide/VendilionClique.java index 3b9baa80d52..a6e5715a66d 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/nemesis/SealOfRemoval.java b/Mage.Sets/src/mage/sets/nemesis/SealOfRemoval.java index cbe1e1e0cd0..ea67ceb2dee 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/nemesis/SealOfStrength.java b/Mage.Sets/src/mage/sets/nemesis/SealOfStrength.java index 57884dc01ac..26907b04b46 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/nemesis/ViciousHunger.java b/Mage.Sets/src/mage/sets/nemesis/ViciousHunger.java index 5430ce69ac4..976574828d8 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 3bc272d4b75..33d085ece37 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 23f53d6bb8b..4cf0c907dd9 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()); + this.getSpellAbility().addTarget(new TargetPermanent(true)); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/BeastWithin.java b/Mage.Sets/src/mage/sets/newphyrexia/BeastWithin.java index ebb01375cc9..3ad38d65a90 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()); + this.getSpellAbility().addTarget(new TargetPermanent(true)); 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 d9740b4895f..35b42f84448 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())); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/BlindingSouleater.java b/Mage.Sets/src/mage/sets/newphyrexia/BlindingSouleater.java index 34cd7866f8d..915e8c276b7 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/CaressOfPhyrexia.java b/Mage.Sets/src/mage/sets/newphyrexia/CaressOfPhyrexia.java index eccae4934d3..daf3f50f41f 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } 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 98a6a462fec..f75ef8836db 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/DeceiverExarch.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/DeceiverExarch.java @@ -68,7 +68,7 @@ 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()); + ability.addTarget(new TargetControlledPermanent(true)); Mode mode = new Mode(); mode.getEffects().add(new TapTargetEffect()); mode.getTargets().add(new TargetPermanent(filter)); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/DefensiveStance.java b/Mage.Sets/src/mage/sets/newphyrexia/DefensiveStance.java index 08dfd643463..fd55a64540c 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 c6a532f13c9..9b6b075ade1 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Despise.java b/Mage.Sets/src/mage/sets/newphyrexia/Despise.java index 2e5ccce5684..3096b3e6c9e 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()); + this.getSpellAbility().addTarget(new TargetOpponent(true)); 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 c801131c3ed..620bf522231 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Dismember.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Dismember.java @@ -48,7 +48,7 @@ public class Dismember extends CardImpl { this.expansionSetCode = "NPH"; this.color.setBlack(true); this.getSpellAbility().addEffect(new BoostTargetEffect(-5, -5, Duration.EndOfTurn)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 2ff620c2b5a..725fe4ba6fe 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 792cf1d45f3..1c0b18d3e94 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 1ab3cffbd75..ba042046310 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()); + mode.getTargets().add(new TargetOpponent(true)); 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 dc59c0b44a5..868bb5e8fc2 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ForcedWorship.java b/Mage.Sets/src/mage/sets/newphyrexia/ForcedWorship.java index beea6560be0..6dd4dc82898 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 7411a6e11a0..59c0c58b38d 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } 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 c4f4f69d3fd..a3b30dd64c6 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); // 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 e41c09ea171..031e76fb251 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 2be41b2e032..2820c4f1e04 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 3165f8f1c19..b186633bceb 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 b2d5753aeaa..c8a65058b63 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()); + ability.addTarget(new TargetPermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/IchorExplosion.java b/Mage.Sets/src/mage/sets/newphyrexia/IchorExplosion.java index d5ae15680d2..d789a18da3c 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())); + this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); // 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 bddef69470c..429326ba026 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()); + mode.getTargets().add(new TargetPlayer(true)); ability.addMode(mode); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/LifesFinale.java b/Mage.Sets/src/mage/sets/newphyrexia/LifesFinale.java index 4b15ccfb93f..d0c4699ef16 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()); + this.getSpellAbility().addTarget(new TargetOpponent(true)); } 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 52e832b8737..503f92e24da 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()); + this.getSpellAbility().addTarget(new TargetOpponent(true)); 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 0827741d89f..b7926e38f9e 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/MutagenicGrowth.java b/Mage.Sets/src/mage/sets/newphyrexia/MutagenicGrowth.java index 83028869855..fc8ac4f2af5 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ParasiticImplant.java b/Mage.Sets/src/mage/sets/newphyrexia/ParasiticImplant.java index 38de176613a..a8eb6985af6 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/PithDriller.java b/Mage.Sets/src/mage/sets/newphyrexia/PithDriller.java index 4ed93a0acd1..d274a0f6649 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PraetorsGrasp.java b/Mage.Sets/src/mage/sets/newphyrexia/PraetorsGrasp.java index 2a97b40ba62..078f50bb5e4 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()); + this.getSpellAbility().addTarget(new TargetOpponent(true)); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ScrapyardSalvo.java b/Mage.Sets/src/mage/sets/newphyrexia/ScrapyardSalvo.java index 1e94cc2978b..5273c550ad3 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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 33996080b20..b957e8da9d3 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/SoulConduit.java b/Mage.Sets/src/mage/sets/newphyrexia/SoulConduit.java index 7e8db7de5d8..1322fcff678 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()); - ability.addTarget(new TargetPlayer()); + ability.addTarget(new TargetPlayer(true)); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/SwordOfWarAndPeace.java b/Mage.Sets/src/mage/sets/newphyrexia/SwordOfWarAndPeace.java index 916322cc5a2..66de0ab1589 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()); + this.addTarget(new TargetPlayer(true)); } 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 cd67c3ccd4c..a36c0db7500 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()); + ability.addTarget(new TargetCreaturePermanent(true)); Mode mode = new Mode(); mode.getEffects().add(new BoostTargetEffect(0, -2, Duration.EndOfTurn)); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.getTargets().add(new TargetCreaturePermanent(true)); ability.addMode(mode); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ninthedition/AvenWindreader.java b/Mage.Sets/src/mage/sets/ninthedition/AvenWindreader.java index 68ec9f0be92..ced68c34655 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ninthedition/ContaminatedBond.java b/Mage.Sets/src/mage/sets/ninthedition/ContaminatedBond.java index 7a1849f03f7..af43fec935b 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 89cfdfd664e..70bcce09c8e 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } 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 f2356c2c740..22de623a55b 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } public Enrage(final Enrage card) { diff --git a/Mage.Sets/src/mage/sets/ninthedition/GravePact.java b/Mage.Sets/src/mage/sets/ninthedition/GravePact.java index 962db273c30..063ef52af36 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(); + Target target = new TargetControlledCreaturePermanent(true); 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/TemporalAdept.java b/Mage.Sets/src/mage/sets/ninthedition/TemporalAdept.java index b870d35314e..b695c8e3065 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()); + ability.addTarget(new TargetPermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/odyssey/AboshansDesire.java b/Mage.Sets/src/mage/sets/odyssey/AboshansDesire.java index 257b8bdbf9b..f2f155c55ca 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/AegisOfHonor.java b/Mage.Sets/src/mage/sets/odyssey/AegisOfHonor.java index a0adf6d86ff..77bf02f8288 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(); + TargetPermanent target = new TargetPermanent(true); target.add(spell.getControllerId(), game); redirectTarget = target; return true; diff --git a/Mage.Sets/src/mage/sets/odyssey/DevotedCaretaker.java b/Mage.Sets/src/mage/sets/odyssey/DevotedCaretaker.java index 63bd03e800b..68c11f3d81d 100644 --- a/Mage.Sets/src/mage/sets/odyssey/DevotedCaretaker.java +++ b/Mage.Sets/src/mage/sets/odyssey/DevotedCaretaker.java @@ -71,8 +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(); - target.setRequired(true); + Target target = new TargetControlledPermanent(true); ability.addTarget(target); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/odyssey/DruidsCall.java b/Mage.Sets/src/mage/sets/odyssey/DruidsCall.java index c8eab25cb05..e73f4b55bc8 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/Extract.java b/Mage.Sets/src/mage/sets/odyssey/Extract.java index de89b62a74c..3fe3b4143a6 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } diff --git a/Mage.Sets/src/mage/sets/odyssey/ImmobilizingInk.java b/Mage.Sets/src/mage/sets/odyssey/ImmobilizingInk.java index c3365bca867..49a86257107 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 fdeb01927e5..bbf2c96e21a 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/NantukoDisciple.java b/Mage.Sets/src/mage/sets/odyssey/NantukoDisciple.java index 10613b75b50..68b6ba24734 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/odyssey/PatriarchsDesire.java b/Mage.Sets/src/mage/sets/odyssey/PatriarchsDesire.java index f7627229771..760b6018476 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 6422cac131f..f64ffe05722 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 116d483c98f..80e53cc91ac 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/Repel.java b/Mage.Sets/src/mage/sets/odyssey/Repel.java index 066e380be08..bd454c1ea9f 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true)); } diff --git a/Mage.Sets/src/mage/sets/odyssey/SkullFracture.java b/Mage.Sets/src/mage/sets/odyssey/SkullFracture.java index 9365eb65cd2..97720c67a2f 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); // 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 d55aab04dd3..5bb9129be91 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()); + this.addTarget(new TargetCreaturePermanent(true)); } public SparkMageTriggeredAbility(final SparkMageTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/odyssey/ThermalBlast.java b/Mage.Sets/src/mage/sets/odyssey/ThermalBlast.java index cf04e6fdb1b..5ceafe8677e 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/sets/onslaught/AstralSlide.java b/Mage.Sets/src/mage/sets/onslaught/AstralSlide.java index 572bbee0cd9..28164a2a812 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()); + this.addTarget(new TargetCreaturePermanent(true)); } public AstralSlideTriggeredAbility(final AstralSlideTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/onslaught/CatapultMaster.java b/Mage.Sets/src/mage/sets/onslaught/CatapultMaster.java index ecbf6db3336..8cb0804c969 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/onslaught/Sparksmith.java b/Mage.Sets/src/mage/sets/onslaught/Sparksmith.java index 8f69f90e6bb..02304d7a1c6 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 994cd3dba23..a23006ea779 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/onslaught/WordsOfWind.java b/Mage.Sets/src/mage/sets/onslaught/WordsOfWind.java index f4ed9fc3d07..9075ef36ce2 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(); + TargetControlledPermanent target = new TargetControlledPermanent(true); 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/DawnCharm.java b/Mage.Sets/src/mage/sets/planarchaos/DawnCharm.java index 41c78014cde..5558c23cda5 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()); + mode.getTargets().add(new TargetCreaturePermanent(true)); this.getSpellAbility().addMode(mode); mode = new Mode(); diff --git a/Mage.Sets/src/mage/sets/planarchaos/FatalFrenzy.java b/Mage.Sets/src/mage/sets/planarchaos/FatalFrenzy.java index 752afb725ba..77d341d2d7b 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()); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); } diff --git a/Mage.Sets/src/mage/sets/planarchaos/FuryCharm.java b/Mage.Sets/src/mage/sets/planarchaos/FuryCharm.java index 12a173c0480..0957125000f 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()); + mode.getTargets().add(new TargetCreaturePermanent(true)); this.getSpellAbility().getModes().addMode(mode); // or remove two time counters from target permanent or suspended card. mode = new Mode(); diff --git a/Mage.Sets/src/mage/sets/planarchaos/KeenSense.java b/Mage.Sets/src/mage/sets/planarchaos/KeenSense.java index 6ef7cfe7e29..45982d4f36e 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/NecroticSliver.java b/Mage.Sets/src/mage/sets/planarchaos/NecroticSliver.java index 42543a5d71c..458407a26b2 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()); + ability.addTarget(new TargetPermanent(true)); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, filter, diff --git a/Mage.Sets/src/mage/sets/planarchaos/RathiTrapper.java b/Mage.Sets/src/mage/sets/planarchaos/RathiTrapper.java index 9abe8985935..38340d8e461 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planarchaos/SaltfieldRecluse.java b/Mage.Sets/src/mage/sets/planarchaos/SaltfieldRecluse.java index ca2b2220663..f0aaf3439dc 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planechase/BogardanRager.java b/Mage.Sets/src/mage/sets/planechase/BogardanRager.java index 88756a008af..240073f02c6 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planechase/CranialPlating.java b/Mage.Sets/src/mage/sets/planechase/CranialPlating.java index ad30b0f295c..c9d43a46d03 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()); + ability.addTarget(new TargetControlledCreaturePermanent(true)); 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 2b2a7d0bedf..61998afe0c1 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planechase/EtchedOracle.java b/Mage.Sets/src/mage/sets/planechase/EtchedOracle.java index 3901493fee7..c5a20a43deb 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planechase/FiresOfYavimaya.java b/Mage.Sets/src/mage/sets/planechase/FiresOfYavimaya.java index e8e3c369b05..f3cebb4e287 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planechase/FlametongueKavu.java b/Mage.Sets/src/mage/sets/planechase/FlametongueKavu.java index a0f7023a993..049222a032a 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planechase/PhyrexianGhoul.java b/Mage.Sets/src/mage/sets/planechase/PhyrexianGhoul.java index e3699a9dcfa..b0a76cc8532 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()))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); } 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 c4cf9e07748..19500aab44c 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()); - ability.addTarget(new TargetCreaturePermanent()); + ability.addTarget(new TargetControlledCreaturePermanent(true)); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planechase/RecklessCharge.java b/Mage.Sets/src/mage/sets/planechase/RecklessCharge.java index 9b28c48f5f3..0cd8adfc16b 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 fa645a1635d..5dcf31951e0 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planechase2012/FelidarUmbra.java b/Mage.Sets/src/mage/sets/planechase2012/FelidarUmbra.java index 532dbae3f50..f40bde58f57 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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()); + ability.addTarget(new TargetControlledCreaturePermanent(true)); 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 29a6a2a26be..1d217f6b64b 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 db822952545..9ac45f96bad 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()); + ability.addTarget(new TargetPermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planechase2012/PollenbrightWings.java b/Mage.Sets/src/mage/sets/planechase2012/PollenbrightWings.java index 38b5fbc0fe0..765b828d95d 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/planeshift/GaeasMight.java b/Mage.Sets/src/mage/sets/planeshift/GaeasMight.java index 248a515cd18..fc63f5d0c98 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 60395e43380..6e14812ecd5 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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 f189cf192e3..f0a8240f5a1 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()); + this.getSpellAbility().addTarget(new TargetOpponent(true)); this.getSpellAbility().addEffect(new BurningOfXinyeEffect()); this.getSpellAbility().addEffect(new DamageAllEffect(4, new FilterCreaturePermanent())); } diff --git a/Mage.Sets/src/mage/sets/prophecy/AgentOfShauku.java b/Mage.Sets/src/mage/sets/prophecy/AgentOfShauku.java index 601ff2c5daf..58136094f27 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/prophecy/ShieldDancer.java b/Mage.Sets/src/mage/sets/prophecy/ShieldDancer.java index 34568fe6a8a..81dd886f7cd 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(); + TargetPermanent target = new TargetPermanent(true); 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 ac78d709de3..810a228982e 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()); + gainAbility.addTarget(new TargetCreaturePermanent(true)); 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 52c228db79c..943ecb6e05c 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{W}")); - ability.addTarget(new TargetCreaturePermanent()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/Caregiver.java b/Mage.Sets/src/mage/sets/ravnika/Caregiver.java index 801d057516b..054caaf3b08 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())); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); 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 109e64c7dfb..394392f98c3 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 af6e377d066..7f451237d80 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); // 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 bad9ca49407..c023c103895 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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 3a5dcf2451f..23262fdbdd6 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); this.getSpellAbility().addEffect(new DrawCardTargetEffect(2)); Mode mode = new Mode(); - mode.getTargets().add(new TargetPlayer()); + mode.getTargets().add(new TargetPlayer(true)); 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 6de2cf086e3..d9f72a4d90e 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 49cec5b4ffe..52ad1a5464e 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); // 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 1116c55b1ae..c0fc8906b32 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()); + firstAbility.addTarget(new TargetPlayer(true)); 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()); + secondAbility.addTarget(new TargetPlayer(true)); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/sets/ravnika/DimirHouseGuard.java b/Mage.Sets/src/mage/sets/ravnika/DimirHouseGuard.java index 2856b1170bd..5ea6bfaa7d1 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()))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); // 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 1ef299ac131..4e2ff3ef410 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); // 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 1f0e0904f56..bc0e0a7603c 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/ElvishSkysweeper.java b/Mage.Sets/src/mage/sets/ravnika/ElvishSkysweeper.java index 2748c4e0104..dd49b7a84f1 100644 --- a/Mage.Sets/src/mage/sets/ravnika/ElvishSkysweeper.java +++ b/Mage.Sets/src/mage/sets/ravnika/ElvishSkysweeper.java @@ -69,7 +69,7 @@ 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())); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); 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 53eabac8602..156df17ac3b 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 be143eb5f0f..79723003354 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())); + this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); // Fiery Conclusion deals 5 damage to target creature. this.getSpellAbility().addEffect(new DamageTargetEffect(5)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 fc210d0cee5..c59b4ae12ac 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 f113825292f..b0d9be9fe79 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 39bffff9665..b6cca0288ee 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 cdc89318faa..8014a675a67 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 8e14e3a6ae6..79cc61dbcbf 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } 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 4785a06f54a..b6dab138535 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())); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/GolgariRotwurm.java b/Mage.Sets/src/mage/sets/ravnika/GolgariRotwurm.java index ebd6f69f9ed..3e032ea8a5f 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())); - ability.addTarget(new TargetPlayer()); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/HuntedDragon.java b/Mage.Sets/src/mage/sets/ravnika/HuntedDragon.java index e58488d9a01..85b239e364d 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(); + Target target = new TargetOpponent(true); 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 103720ef09a..0a7ef6865a9 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(); + Target target = new TargetOpponent(true); 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 ae898d85e4c..7158d342a67 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(); + Target target = new TargetOpponent(true); 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 b16c21e7ca9..0aadc3d9047 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(); + Target target = new TargetOpponent(true); 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 49526c2ed3f..3440e079dd6 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(); + Target target = new TargetOpponent(true); 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 b8b87707b9a..b036fbfca02 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/IvyDancer.java b/Mage.Sets/src/mage/sets/ravnika/IvyDancer.java index 0e15622f518..3de230d80f3 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/KeeningBanshee.java b/Mage.Sets/src/mage/sets/ravnika/KeeningBanshee.java index e1dc592adfb..1648f1c13fa 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/LastGasp.java b/Mage.Sets/src/mage/sets/ravnika/LastGasp.java index 21150aed833..ef99eb42781 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 12ca814623f..4a013398503 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()); + this.getSpellAbility().addTarget(new TargetPermanent(true)); } 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 924878ee3f9..0365a647882 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/Sandsower.java b/Mage.Sets/src/mage/sets/ravnika/Sandsower.java index f45239b0344..567fb9aec9c 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/ShamblingShell.java b/Mage.Sets/src/mage/sets/ravnika/ShamblingShell.java index c7d2f8590bc..b85aff9552c 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); // Dredge 3 this.addAbility(new DredgeAbility(3)); diff --git a/Mage.Sets/src/mage/sets/ravnika/Ursapine.java b/Mage.Sets/src/mage/sets/ravnika/Ursapine.java index 8adb724fd19..1557d9d4eac 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/VedalkenDismisser.java b/Mage.Sets/src/mage/sets/ravnika/VedalkenDismisser.java index b501f8f3dc8..07953f5e08c 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/ravnika/VedalkenEntrancer.java b/Mage.Sets/src/mage/sets/ravnika/VedalkenEntrancer.java index ebb25d175d7..8862053e832 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AquusSteed.java b/Mage.Sets/src/mage/sets/returntoravnica/AquusSteed.java index 1df9543901a..4c32f3c5025 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()); + secondAbility.addTarget(new TargetCreaturePermanent(true)); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AssassinsStrike.java b/Mage.Sets/src/mage/sets/returntoravnica/AssassinsStrike.java index 2e666dd68b3..e58307a4915 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 4ef8482304b..84538989544 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } public AugerSpree(final AugerSpree card) { diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ChorusOfMight.java b/Mage.Sets/src/mage/sets/returntoravnica/ChorusOfMight.java index db8c94d9914..3daa0185513 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 194b4111ac3..fd62629ad89 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()); + ability.addTarget(new TargetPlayer(true)); 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/DeathsPresence.java b/Mage.Sets/src/mage/sets/returntoravnica/DeathsPresence.java index 499fe6410a7..55964579e5f 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()); + this.addTarget(new TargetControlledCreaturePermanent(true)); this.getEffects().clear(); this.addEffect(new AddCountersTargetEffect(CounterType.P1P1.createInstance(permanent.getPower().getValue()))); return true; diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DeviantGlee.java b/Mage.Sets/src/mage/sets/returntoravnica/DeviantGlee.java index e0e754f44f6..0863bb092fb 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 4470fde5d7e..54b95ab27ab 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DrainpipeVermin.java b/Mage.Sets/src/mage/sets/returntoravnica/DrainpipeVermin.java index e88e7e06c62..43783ee17ac 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DramaticRescue.java b/Mage.Sets/src/mage/sets/returntoravnica/DramaticRescue.java index 7732e7877a8..2a8b14c461f 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Dynacharge.java b/Mage.Sets/src/mage/sets/returntoravnica/Dynacharge.java index d933a36886d..62679953aa2 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()); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); 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/GuildFeud.java b/Mage.Sets/src/mage/sets/returntoravnica/GuildFeud.java index e91817adb0f..e1c984acaeb 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()); + ability.addTarget(new TargetOpponent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/HellholeFlailer.java b/Mage.Sets/src/mage/sets/returntoravnica/HellholeFlailer.java index 0a0afef1d8d..4f81afd675b 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()); + ability.addTarget(new TargetPlayer(true)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Inspiration.java b/Mage.Sets/src/mage/sets/returntoravnica/Inspiration.java index 0193760d860..384b3e063cc 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/IzzetCharm.java b/Mage.Sets/src/mage/sets/returntoravnica/IzzetCharm.java index f4272d2356e..3c72cd6910f 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()); + mode.getTargets().add(new TargetCreaturePermanent(true)); 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 f1a9637b6c6..c3c146eb7f1 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/JaceArchitectOfThought.java b/Mage.Sets/src/mage/sets/returntoravnica/JaceArchitectOfThought.java index 17576fda6ed..93caf1f13f9 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(); + TargetOpponent targetOpponent = new TargetOpponent(true); if (player.chooseTarget(Outcome.Neutral, targetOpponent, source, game)) { opponent = game.getPlayer(targetOpponent.getFirstTarget()); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/KnightlyValor.java b/Mage.Sets/src/mage/sets/returntoravnica/KnightlyValor.java index 26fea7fe6b9..24eca0c4cd6 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 019da82b764..ed869c24efe 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/KorozdaGuildmage.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/KorozdaGuildmage.java @@ -76,7 +76,7 @@ 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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. diff --git a/Mage.Sets/src/mage/sets/returntoravnica/LaunchParty.java b/Mage.Sets/src/mage/sets/returntoravnica/LaunchParty.java index 3e3b5dc0b5b..2ce30a1aa6b 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())); + this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); // Destroy target creature. Its controller loses 2 life. - this.getSpellAbility().addTarget(new TargetCreaturePermanent()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new LoseLifeTargetControllerEffect(2)); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/MercurialChemister.java b/Mage.Sets/src/mage/sets/returntoravnica/MercurialChemister.java index 00e7f9f37fb..17860f2fb5e 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()); + ability.addTarget(new TargetCreaturePermanent(true)); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/NewPrahvGuildmage.java b/Mage.Sets/src/mage/sets/returntoravnica/NewPrahvGuildmage.java index d598efa91ab..a1f2271e58a 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 8449bf4ab0d..cb96acbcde5 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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 b3878fb9f19..890f72e35a0 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 cfbae2f0c2d..f90dfe14929 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()); + gainedAbility.addTarget(new TargetCreaturePermanent(true)); 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 abc02b708da..b18fdf45943 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); // 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 397f6680fd2..83add00ba78 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()); + this.getSpellAbility().addTarget(new TargetOpponent(true)); } 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 d9b610d862b..bd9d33da28c 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/RoguesPassage.java b/Mage.Sets/src/mage/sets/returntoravnica/RoguesPassage.java index 74ae0771741..dc8deadddb8 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SavageSurge.java b/Mage.Sets/src/mage/sets/returntoravnica/SavageSurge.java index 9dd7f3edc11..bb90ab92b48 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 a1934ae916f..5c443a09acf 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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 499257cd46d..fc6f1966c18 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaCharm.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaCharm.java @@ -66,7 +66,7 @@ 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()); + this.getSpellAbility().getTargets().add(new TargetCreaturePermanent(true)); // or exile target creature with power 5 or greater; Mode mode = new Mode(); diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SlaughterGames.java b/Mage.Sets/src/mage/sets/returntoravnica/SlaughterGames.java index ec7f2dd1190..71766607d11 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()); + this.getSpellAbility().addTarget(new TargetOpponent(true)); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/StabWound.java b/Mage.Sets/src/mage/sets/returntoravnica/StabWound.java index 0d1f50440b5..9eeedd0fe7f 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/Teleportal.java b/Mage.Sets/src/mage/sets/returntoravnica/Teleportal.java index 5154fb55cba..07147a3f827 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()); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); 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 48787509e39..2e2fbe53f41 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); this.getSpellAbility().addEffect(new PopulateEffect("then")); } diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Voidwielder.java b/Mage.Sets/src/mage/sets/returntoravnica/Voidwielder.java index b51971756bb..67036face17 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/revisededition/DesertTwister.java b/Mage.Sets/src/mage/sets/revisededition/DesertTwister.java index a6f9215dd82..84be67d8438 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()); + this.getSpellAbility().addTarget(new TargetPermanent(true)); } 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 42b98038180..4c1cd3a1c3f 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraFinesse.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraFinesse.java index 46597756a4f..40ad6f65868 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraFinesse.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraFinesse.java @@ -66,7 +66,7 @@ public class AuraFinesse extends CardImpl { // Attach target Aura you control to target creature. this.getSpellAbility().addEffect(new AuraFinesseEffect()); this.getSpellAbility().addTarget(new TargetPermanent(filter)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BattleRampart.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BattleRampart.java index 7734e17777b..b5be060ef45 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BattleRattleShaman.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BattleRattleShaman.java index f1c4db3ab3d..ff60a2f13d2 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BearUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BearUmbra.java index eeb8576a493..80ba24a3677 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 c92030c198d..45adba7fb0c 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodthroneVampire.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BloodthroneVampire.java index e75960ef25b..cf3cd794b4e 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()))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); } 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 d2e0344118a..3efe66076f9 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 88481046d67..ec4328bef74 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()))); + new TapTargetCost(new TargetControlledCreaturePermanent(true)))); } 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 7d546640a79..e17ced92661 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConsumingVapors.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ConsumingVapors.java index 6e6041dd3ca..c7df28a7014 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); // 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/CrabUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/CrabUmbra.java index 717ee5e646c..79b33da0f61 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 c6ace5049ed..3aa3ea96353 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DeathCultist.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DeathCultist.java index 28b5e5f567c..b285a369b3a 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DeathlessAngel.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DeathlessAngel.java index 9baaec567ec..348f0ff2c32 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DemonicAppetite.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DemonicAppetite.java index 517ffa6e374..fb14f47c1f6 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(); + TargetPermanent auraTarget = new TargetControlledCreaturePermanent(true); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/DistortionStrike.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/DistortionStrike.java index 3c9464310a8..a52d1eb2e16 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 9c659b421bb..95e27b7ead8 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 b22a1f8bdae..373ce019ef1 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 e9ca35cd5dc..057d7db77de 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EelUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EelUmbra.java index 550191bc434..b0515575538 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 79dc30b3a6e..f5fe581d6b8 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 92753d37f4b..8cdd59107a6 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 7fbfb4be0a5..f85066ebc2c 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()); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); 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 65331c254c5..7440f258082 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } public EssenceFeed (final EssenceFeed card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/FlameSlash.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/FlameSlash.java index c25e4999545..c21a3085532 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 0ff101f35db..8af8a1b9b60 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 8d4694c3c47..a2c0664646f 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java @@ -72,7 +72,7 @@ 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()); + ability1.addTarget(new TargetOpponent(true)); this.addAbility(ability1); LoyaltyAbility ability2 = new LoyaltyAbility(new DestroyTargetEffect(), -2); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Gigantomancer.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Gigantomancer.java index b6232c5155e..f417a3984c8 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()); + ability.addTarget(new TargetControlledCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuardDuty.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GuardDuty.java index 560c43a1c0b..62163a795cb 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 ab413234b74..10cfbea4404 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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()); + ability2.addTarget(new TargetCreaturePermanent(true)); 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 4e33df0b4fe..b8f300e6d77 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 26390441194..846c3d58dab 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 749695c3403..efbf3695e3f 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } public InduceDespair(final InduceDespair card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/IrresistiblePrey.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/IrresistiblePrey.java index 9641bdc65db..edcde342231 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KeeningStone.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KeeningStone.java index cc5a39bd65a..7871018dfb2 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LastKiss.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LastKiss.java index 2e51c50e0b3..687d8e1b6d9 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } public LastKiss (final LastKiss card) { diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LuminousWake.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LuminousWake.java index a15773efca9..ec8324d680b 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 a443932b0e8..31482ed8a5b 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 18287b23a29..598562d112d 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 a975724228f..6161b768a37 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MerfolkSkyscout.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MerfolkSkyscout.java index 6343ad7026a..0d32dfef071 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()); + ability.addTarget(new TargetPermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MightOfTheMasses.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MightOfTheMasses.java index 2ac8c44c1e4..f4f958bbb9f 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 96bd1ca94e2..a2fb0cb152e 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())); + this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); // 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/Nighthaze.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Nighthaze.java index fc1dd93e661..36086418045 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 c52ab425cbb..7ce3d7723f6 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 80b037ca5c4..cf96eb0036d 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()); + this.getSpellAbility().addTarget(new TargetOpponent(true)); } 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 8301cc93a81..654e16540d4 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); this.addAbility(new ReboundAbility()); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RageNimbus.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RageNimbus.java index 07e84fad38f..f19aee5b7a6 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RecurringInsight.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RecurringInsight.java index e2bfab453be..6d7044503f6 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(); + TargetOpponent target = new TargetOpponent(true); 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 f24ea04a61e..4b2f42641a3 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(); + Target targetCreature = new TargetCreaturePermanent(true); Ability sacAbility = new LoyaltyAbility(new SarkhanTheMadSacEffect(), -2); sacAbility.addTarget(targetCreature); this.addAbility(sacAbility); Ability damageAbility = new LoyaltyAbility(new SarkhanTheMadDragonDamageEffect(), -4); - damageAbility.addTarget(new TargetPlayer()); + damageAbility.addTarget(new TargetPlayer(true)); this.addAbility(damageAbility); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SnakeUmbra.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SnakeUmbra.java index 3380471a66c..09b088aceb5 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 ecc85bb62a1..2c7f69e8119 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 7a139f7bb00..c5e14e208ad 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 dac5f741d92..4219068eeaf 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } 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 4a054dfef4e..db5d6b84ce8 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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/VentSentinel.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/VentSentinel.java index 559da4fd1b8..36fa8b040cb 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/WildheartInvoker.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/WildheartInvoker.java index b813b3d8a71..bdd7164ab42 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/AkkiDrillmaster.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/AkkiDrillmaster.java index a26c47a5b7d..9a109a7dfbe 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/BloodClock.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/BloodClock.java index a73a7aaeb25..94edede5f8b 100644 --- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/BloodClock.java +++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/BloodClock.java @@ -96,8 +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(); - target.isRequired(); + Target target = new TargetControlledPermanent(true); 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 9e7e0b3c932..883ddbfab4f 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/CaptiveFlame.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/CaptiveFlame.java index 75b39fc9284..8bd0f3d63c5 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/FreedFromTheReal.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/FreedFromTheReal.java index c9f80dc8bbf..ebf05f86325 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 ec9dcfc8221..78ea06de4c7 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()); + ability2.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitRaider.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitRaider.java index 6049c92472c..f62b9821a76 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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()); + ability2.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitStalker.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GhostLitStalker.java index 47aceabea15..3de2765d5f5 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()); + ability.addTarget(new TargetPlayer(true)); 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()); + ability2.addTarget(new TargetPlayer(true)); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GodosIrregulars.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GodosIrregulars.java index 2206574414f..a8c5ccbfd66 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KemuriOnna.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KemuriOnna.java index ef3d67f80a9..1e8cc34252b 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()); + ability.addTarget(new TargetPlayer(true)); 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 0be4e84e03b..55853eb94e1 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 23d8f0d1dd6..d4a202c7d83 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MoltingSkin.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MoltingSkin.java index afd3627ccd9..0f8f54ee4b8 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfFearsChill.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfFearsChill.java index 2ff9127c8b9..156f284b3f3 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfFlightsWings.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfFlightsWings.java index ef43b518a2c..23490fdb09d 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfFurysFire.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfFurysFire.java index 5e6119f6178..406d5cb0aa1 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfLifesRoar.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfLifesRoar.java index d0564232610..44f0c7e8318 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfStarsLight.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ShinenOfStarsLight.java index 99b2c75b31e..f8ae9eadb36 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/WineOfBloodAndIron.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/WineOfBloodAndIron.java index d8d214fa747..5e7f69b391c 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ArgentumArmor.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ArgentumArmor.java index 64169aefc92..db356ef9999 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()); + ability.addTarget(new TargetPermanent(true)); this.addAbility(ability); this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(6))); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/AssaultStrobe.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/AssaultStrobe.java index 51c601dfd24..09e84e877d2 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 d8f7ca6e296..6c25ba155fd 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(); + Target target = new TargetPlayer(true); 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 495ef3e0fef..fede4de329a 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 61fa100d5cb..390ce9a6db1 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 c8b34542e56..33ba5b724a5 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()); + this.getSpellAbility().addTarget(new TargetOpponent(true)); 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 7409279475d..dacb4e61fbc 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(); + TargetCreaturePermanent target = new TargetCreaturePermanent(true); 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 b93cef49cb1..5cd9fd1e9ca 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()); + ability.addTarget(new TargetPlayer(true)); 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 360dcf63580..b69214512f5 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())); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/CullingDais.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/CullingDais.java index f140c5b32a9..ab2cf71801e 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())); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); 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 b417a9d0915..ae0ba9fa1e8 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } 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 0ea922f78b4..2eb4e3c9a58 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()))); + new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); } 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 17337cb995f..aa9b962fb2b 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())); + this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 b4703882bd8..7aa1d207211 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 ac9645b7c89..38ca3937495 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GlimmerpointStag.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GlimmerpointStag.java index f26347489c5..4fd2ff53df2 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(); + Target etbTarget = new TargetPermanent(true); etbTarget.setRequired(true); Ability etbAbility = new EntersBattlefieldTriggeredAbility(new GlimmerpointStagEffect()); etbAbility.addTarget(etbTarget); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GraspOfDarkness.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GraspOfDarkness.java index a8a71d8b3d6..aea6d0e773f 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 31a3787df35..f3de508440f 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/HandOfThePraetors.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/HandOfThePraetors.java index d760c97fd51..9ccf707e3c3 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/InstillInfection.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/InstillInfection.java index f16d9eb75bc..548de73b328 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 47525b023f4..c100734fed4 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()); + ability.addTarget(new TargetPermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/LumengridDrake.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/LumengridDrake.java index 65019607d12..bb08c3553c8 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()); + conditional.addTarget(new TargetCreaturePermanent(true)); this.addAbility(conditional); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/LuxCannon.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/LuxCannon.java index 4b7a65720db..946796fd09c 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()); + ability.addTarget(new TargetPermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Memoricide.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Memoricide.java index f162eeaf056..0cbc6c0706e 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); this.getSpellAbility().addEffect(new MemoricideEffect()); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/NecrogenCenser.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/NecrogenCenser.java index 382edc5cf92..0419f7b253a 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Necropede.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Necropede.java index 01c91f304d2..93e2d1f10fd 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/NeurokInvisimancer.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/NeurokInvisimancer.java index 0521e79134d..769a9bb6da2 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/NeurokReplica.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/NeurokReplica.java index 84486d28155..94de3703479 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 7f5571e9a1d..846b57536b4 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()); + ability.addTarget(new TargetPlayer(true)); 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/Painsmith.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Painsmith.java index 83926f46ee5..a9ad28341f9 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/PanicSpellbomb.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/PanicSpellbomb.java index 5aec33ea8b6..3e8fb93aa26 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 cff01fb6d6b..68ae203021e 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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 83f4f1713d9..bb400c5f6ce 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SeizeTheInitiative.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SeizeTheInitiative.java index 89ece3b2c8f..121f5588a36 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } public SeizeTheInitiative (final SeizeTheInitiative card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Skinrender.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Skinrender.java index 076476dde42..5a56b936839 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(); + Target target = new TargetCreaturePermanent(true); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TaintedStrike.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TaintedStrike.java index f46344e55e6..fd7c978bc92 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 fe1f44d16ce..d4b6088ee25 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladDefiance.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladDefiance.java index 83894fe8956..3e865d9a6d3 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 c60c6e84bea..ac6f27ac1d2 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 b4b699b363e..1d809b01cb4 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(); + Target target = new TargetCreaturePermanent(true); 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 d3f682f3ddf..3a130d7304b 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(); + Target target = new TargetCreaturePermanent(true); target.setRequired(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TurnToSlag.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TurnToSlag.java index 696c9be40d7..f7b871b052b 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 bbe00ca6032..5dd94ff79b8 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 abb527367ce..62a17585244 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 e0406e6ed48..5d0ddc54528 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } public VaultSkyward (final VaultSkyward card) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VenserTheSojourner.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VenserTheSojourner.java index 2b8329f3a99..869a485310f 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(); + Target target = new TargetControlledPermanent(true); 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(); + Target target = new TargetPermanent(true); 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 30154624575..5c4a2c866c3 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(); + TargetPermanent auraTarget = new TargetPermanent(true); 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 7d75688b750..1d0cce51d3c 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VulshokReplica.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VulshokReplica.java index 3d53303bc20..f238e48fcba 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/WingPuncture.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/WingPuncture.java index 4a0654614bc..20f5845848a 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/WingPuncture.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/WingPuncture.java @@ -61,7 +61,7 @@ public class WingPuncture extends CardImpl { this.color.setGreen(true); - this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); 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 553e4f92868..233481d60ea 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 66f9ff91a9b..4456e7bd136 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 2cbb8e54096..3f9029d3fa5 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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 b2f3f809f3e..9ef358bd81e 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()))); + new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); } public CarrionFeeder(final CarrionFeeder card) { diff --git a/Mage.Sets/src/mage/sets/scourge/Scattershot.java b/Mage.Sets/src/mage/sets/scourge/Scattershot.java index b94f5228c20..955c2567900 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 494b1575d77..be2ecd2f3a7 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()); + this.getSpellAbility().addTarget(new TargetPermanent(true)); 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 72d1e0542d9..78b737982ad 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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 2aa1e349260..762326a8982 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); // 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 44f6946bdfc..2a9423df315 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/seventhedition/FallenAngel.java b/Mage.Sets/src/mage/sets/seventhedition/FallenAngel.java index 47d00f209cd..db545753081 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()))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 1, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); } 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 23e653bf84b..9883225f2c7 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()); + ability.addTarget(new TargetCreaturePermanent(true)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/seventhedition/HealingSalve.java b/Mage.Sets/src/mage/sets/seventhedition/HealingSalve.java index 9adaaf2b1c6..5fbfa8153ad 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); Mode mode = new Mode(); mode.getEffects().add(new PreventDamageToTargetEffect(Duration.EndOfTurn, 3)); diff --git a/Mage.Sets/src/mage/sets/seventhedition/MonstrousGrowth.java b/Mage.Sets/src/mage/sets/seventhedition/MonstrousGrowth.java index a8704fcd382..422074e63d9 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } public MonstrousGrowth(final MonstrousGrowth card) { diff --git a/Mage.Sets/src/mage/sets/seventhedition/SpiritLink.java b/Mage.Sets/src/mage/sets/seventhedition/SpiritLink.java index 13034049447..b5c5037e4e3 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 13d5ce9ea94..8cf9333d3e9 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } public StreamOfLife(final StreamOfLife card) { diff --git a/Mage.Sets/src/mage/sets/shadowmoor/AphoticWisps.java b/Mage.Sets/src/mage/sets/shadowmoor/AphoticWisps.java index fe5cd6cefed..42793494953 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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/BitingTether.java b/Mage.Sets/src/mage/sets/shadowmoor/BitingTether.java index d79ed85f738..1ac2310af31 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/CeruleanWisps.java b/Mage.Sets/src/mage/sets/shadowmoor/CeruleanWisps.java index 4e1e5544cad..673c71db98f 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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/CrimsonWisps.java b/Mage.Sets/src/mage/sets/shadowmoor/CrimsonWisps.java index 31349e9cf84..2a4a2430448 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 d3a42d6d3d2..9f77bf4871d 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/FistsOfTheDemigod.java b/Mage.Sets/src/mage/sets/shadowmoor/FistsOfTheDemigod.java index 1efbf08a951..295d9f97fb5 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 b5a962adf5f..14c5f2a8bb0 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/HelmOfTheGhastlord.java b/Mage.Sets/src/mage/sets/shadowmoor/HelmOfTheGhastlord.java index 22386d31817..ce0cd3226dd 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/MistmeadowWitch.java b/Mage.Sets/src/mage/sets/shadowmoor/MistmeadowWitch.java index fb98fb4e9d8..85b99bc3063 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/NiveousWisps.java b/Mage.Sets/src/mage/sets/shadowmoor/NiveousWisps.java index 7a07c77e527..f83de522e56 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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/PrisonTerm.java b/Mage.Sets/src/mage/sets/shadowmoor/PrisonTerm.java index 55800945144..a439a417381 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 b84c2d4834c..ba86f75ea29 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 a1db4e31a34..33808d9eed5 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()); + ability.addTarget(new TargetPermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/Reknit.java b/Mage.Sets/src/mage/sets/shadowmoor/Reknit.java index 1826f7053af..7ea71400f5d 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()); + this.getSpellAbility().addTarget(new TargetPermanent(true)); } 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 01a0448b7a0..ac88c9ac26a 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())); - ability.addTarget(new TargetCreaturePermanent()); + ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/RunesOfTheDeus.java b/Mage.Sets/src/mage/sets/shadowmoor/RunesOfTheDeus.java index 15365761a13..ea37d1a379b 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 194002cd5c3..af699cab744 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 b25541e2b86..f10c76464af 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ShieldOfTheOversoul.java b/Mage.Sets/src/mage/sets/shadowmoor/ShieldOfTheOversoul.java index 315063f752d..003f9ab2c06 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/Somnomancer.java b/Mage.Sets/src/mage/sets/shadowmoor/Somnomancer.java index b8a213d0813..57913cf8dbe 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SteelOfTheGodhead.java b/Mage.Sets/src/mage/sets/shadowmoor/SteelOfTheGodhead.java index 451cd41ce48..1d74f3a7d54 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/TurnToMist.java b/Mage.Sets/src/mage/sets/shadowmoor/TurnToMist.java index d61fdc66a75..6593c1d5a39 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 d4899d932bb..79549d0bfc7 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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/shardsofalara/AjaniVengeant.java b/Mage.Sets/src/mage/sets/shardsofalara/AjaniVengeant.java index 9452763e315..147c28de053 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()); + ability1.addTarget(new TargetPermanent(true)); 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()); + ability3.addTarget(new TargetPlayer(true)); this.addAbility(ability3); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/AngelicBenediction.java b/Mage.Sets/src/mage/sets/shardsofalara/AngelicBenediction.java index f752e61605e..3ca8097de65 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()); + this.addTarget(new TargetCreaturePermanent(true)); } 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 a5080df5ddd..2108671262c 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 af05a998f94..1cf37bde6a6 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BantCharm.java b/Mage.Sets/src/mage/sets/shardsofalara/BantCharm.java index 65e6f4d4091..d8753588d5d 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()); + mode.getTargets().add(new TargetCreaturePermanent(true)); this.getSpellAbility().addMode(mode); // or counter target instant spell. mode = new Mode(); diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BlisterBeetle.java b/Mage.Sets/src/mage/sets/shardsofalara/BlisterBeetle.java index 17d1862bebc..a65a6a9ad23 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BloodCultist.java b/Mage.Sets/src/mage/sets/shardsofalara/BloodCultist.java index bec0fbbee6f..999dc3ea24a 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 4143ec00341..26c37a7e99b 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BoneSplinters.java b/Mage.Sets/src/mage/sets/shardsofalara/BoneSplinters.java index 0306b339f15..64da4ba330a 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())); + this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); // Destroy target creature. - this.getSpellAbility().addTarget(new TargetCreaturePermanent()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CallToHeel.java b/Mage.Sets/src/mage/sets/shardsofalara/CallToHeel.java index 1ba540f2a2f..b2905b0bf26 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 250aaf7ea21..f72bf76d119 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CovenantOfMinds.java b/Mage.Sets/src/mage/sets/shardsofalara/CovenantOfMinds.java index 8bb39c490d9..8c7e544c1b4 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()); + this.getSpellAbility().addTarget(new TargetOpponent(true)); } 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 abc5fec5713..60e2926d2a5 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CruelUltimatum.java b/Mage.Sets/src/mage/sets/shardsofalara/CruelUltimatum.java index aee2fb0b4ab..a619e404edc 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()); + this.getSpellAbility().addTarget(new TargetOpponent(true)); 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/ElspethKnightErrant.java b/Mage.Sets/src/mage/sets/shardsofalara/ElspethKnightErrant.java index 9c34765b64a..cf8d98b7307 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()); + ability1.addTarget(new TargetCreaturePermanent(true)); 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 6fb007d9dca..017840590ef 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/EsperCharm.java b/Mage.Sets/src/mage/sets/shardsofalara/EsperCharm.java index e8d72531789..223a686eb24 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/EsperCharm.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/EsperCharm.java @@ -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()); + mode.getTargets().add(new TargetPlayer(true)); 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 495e538708b..5adf29d306f 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true)); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ExuberantFirestoker.java b/Mage.Sets/src/mage/sets/shardsofalara/ExuberantFirestoker.java index 64cfc36d001..61fe134aa3e 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()); + this.addTarget(new TargetPlayer(true)); } public ExuberantFirestokerTriggeredAbility(final ExuberantFirestokerTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/GrixisBattlemage.java b/Mage.Sets/src/mage/sets/shardsofalara/GrixisBattlemage.java index c32c8db9168..fb2bfda575e 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()); + ability2.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/GrixisCharm.java b/Mage.Sets/src/mage/sets/shardsofalara/GrixisCharm.java index e401783963d..f4450626e16 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()); + this.getSpellAbility().addTarget(new TargetPermanent(true)); // 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()); + mode.getTargets().add(new TargetCreaturePermanent(true)); 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 34693b88214..950560fbb00 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/JundBattlemage.java b/Mage.Sets/src/mage/sets/shardsofalara/JundBattlemage.java index 03b2f960693..3c83bf17d05 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()); + ability.addTarget(new TargetPlayer(true)); 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 cb93c3f93ea..81663918867 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); // 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()); + mode.getTargets().add(new TargetCreaturePermanent(true)); 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 929aca2548e..0210f5f7bc2 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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 768e3000e02..1bf082a4d7e 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 b7971fbeaad..0cd31e73971 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); // 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/NayaBattlemage.java b/Mage.Sets/src/mage/sets/shardsofalara/NayaBattlemage.java index 806fdc11f2d..8eee74a6c20 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{W}")); ability.addCost(new TapSourceCost()); - ability.addTarget(new TargetCreaturePermanent()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/NayaCharm.java b/Mage.Sets/src/mage/sets/shardsofalara/NayaCharm.java index 3914673d82f..c634bbded31 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); // 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()); + mode.getTargets().add(new TargetPlayer(true)); 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 6db9e9f7594..82eb262bf58 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RelicOfProgenitus.java b/Mage.Sets/src/mage/sets/shardsofalara/RelicOfProgenitus.java index 4c722ecfa1a..3a34edc6950 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()); + firstAbility.addTarget(new TargetPlayer(true)); 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 028d43f06f4..c87aa8f9cc8 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingRoar.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingRoar.java @@ -54,7 +54,7 @@ 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); // 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. diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingScream.java b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingScream.java index 777f3b193fa..e6c099c03f3 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingScream.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingScream.java @@ -52,7 +52,7 @@ public class ResoundingScream extends CardImpl { // Target player discards a card at random. this.getSpellAbility().addEffect(new DiscardTargetEffect(1, true)); - this.getSpellAbility().addTarget(new TargetPlayer()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); // 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. diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ResoundingWave.java b/Mage.Sets/src/mage/sets/shardsofalara/ResoundingWave.java index bdfa76d8c3a..846c66cd070 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()); + this.getSpellAbility().addTarget(new TargetPermanent(true)); // 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 a1307ee8e23..3138a9bf4ed 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 c1ff1dcf9b2..cbc0b3c2cca 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 6408baa4ce6..562face3102 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 f47fcb23aa3..a8fa63d30e4 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()); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); 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 1845d723e44..eec3e0dc976 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())); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Skeletonize.java b/Mage.Sets/src/mage/sets/shardsofalara/Skeletonize.java index 829316d6fbd..2727660410e 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); // 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 4d79f609195..ae39ea55cd1 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()); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); 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 01b4d1bea13..4eb0ebb00b7 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 0a35aeffa5f..b668af9d7ee 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } public SoulsMight(final SoulsMight card) { diff --git a/Mage.Sets/src/mage/sets/shardsofalara/TarFiend.java b/Mage.Sets/src/mage/sets/shardsofalara/TarFiend.java index c02ece3ede7..4abd35ee851 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ThoughtcutterAgent.java b/Mage.Sets/src/mage/sets/shardsofalara/ThoughtcutterAgent.java index 3356432ecfd..6bb25abdc3f 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/VeinDrinker.java b/Mage.Sets/src/mage/sets/shardsofalara/VeinDrinker.java index 7d7fbc3015f..f0630ea4593 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 7ee8ea2cb0e..ab84aac8af3 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/WelkinGuide.java b/Mage.Sets/src/mage/sets/shardsofalara/WelkinGuide.java index 067d9f11749..c26f050bd9d 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/AdvanceScout.java b/Mage.Sets/src/mage/sets/tempest/AdvanceScout.java index 6c64e14054d..e59000d8b18 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/AltarOfDementia.java b/Mage.Sets/src/mage/sets/tempest/AltarOfDementia.java index 057d22782de..b92108c1e36 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/BrokenFall.java b/Mage.Sets/src/mage/sets/tempest/BrokenFall.java index 07ed993ec92..5a38d8bc63a 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/Capsize.java b/Mage.Sets/src/mage/sets/tempest/Capsize.java index cf068a9af47..29b1aa64e2a 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()); + this.getSpellAbility().addTarget(new TargetPermanent(true)); } public Capsize(final Capsize card) { diff --git a/Mage.Sets/src/mage/sets/tempest/CommanderGrevenIlVec.java b/Mage.Sets/src/mage/sets/tempest/CommanderGrevenIlVec.java index bdc7026f2e0..d4db5c98de5 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()); + ability.addTarget(new TargetControlledCreaturePermanent(true)); 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 b1c00944daa..a44dfa6d5c6 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/DiabolicEdict.java b/Mage.Sets/src/mage/sets/tempest/DiabolicEdict.java index 32400da733f..da9c72dde2a 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } public DiabolicEdict(final DiabolicEdict card) { diff --git a/Mage.Sets/src/mage/sets/tempest/ElvishFury.java b/Mage.Sets/src/mage/sets/tempest/ElvishFury.java index bd8ae72bd28..e97ba99f7c0 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 2c41ff46e03..5f171316f88 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 02cb74ca86c..26484766c52 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/FrogTongue.java b/Mage.Sets/src/mage/sets/tempest/FrogTongue.java index 966e0cfa67f..f9b95a105b5 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/GaseousForm.java b/Mage.Sets/src/mage/sets/tempest/GaseousForm.java index d067cee399c..d52c9eba5ac 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 0caeb159a03..d95a4f64e6b 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/HeartwoodGiant.java b/Mage.Sets/src/mage/sets/tempest/HeartwoodGiant.java index 62b58da0836..b06737102f8 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/HerosResolve.java b/Mage.Sets/src/mage/sets/tempest/HerosResolve.java index cb1c1cec77e..a462476319e 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(); +TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 00c089533ff..d5994cb3fb7 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()); + this.getSpellAbility().addTarget(new TargetOpponent(true)); } 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 b9a57f6effc..20c44d5ca23 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } 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 48cda64a6af..9194f52c118 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/MoggRaider.java b/Mage.Sets/src/mage/sets/tempest/MoggRaider.java index b8b059b1b7d..293c5a47d64 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/NaturalSpring.java b/Mage.Sets/src/mage/sets/tempest/NaturalSpring.java index d4eb8af4f54..eb784675f85 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } public NaturalSpring(final NaturalSpring card) { diff --git a/Mage.Sets/src/mage/sets/tempest/PuppetStrings.java b/Mage.Sets/src/mage/sets/tempest/PuppetStrings.java index 92ddfcc896b..1e09409e7bb 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/RootwaterMatriarch.java b/Mage.Sets/src/mage/sets/tempest/RootwaterMatriarch.java index 1a0a2e02a6f..8f40b5b68f5 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/SeekerOfSkybreak.java b/Mage.Sets/src/mage/sets/tempest/SeekerOfSkybreak.java index 0d006e5d8d5..097bd233b3d 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/ShimmeringWings.java b/Mage.Sets/src/mage/sets/tempest/ShimmeringWings.java index 03f8eff083a..a77bfe9fc0e 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 ae719c78ccf..f0574df029c 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/SpontaneousCombustion.java b/Mage.Sets/src/mage/sets/tempest/SpontaneousCombustion.java index 5d9baaad602..c8e00773313 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())); + this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); 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 3fb14172ca5..3a7641e4582 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/TimeEbb.java b/Mage.Sets/src/mage/sets/tempest/TimeEbb.java index 30fc92487a3..6d51c224f1e 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 47f6118b856..371a0295a19 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/TradewindRider.java b/Mage.Sets/src/mage/sets/tempest/TradewindRider.java index ffe945e9a68..583c8855b34 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()); + ability.addTarget(new TargetPermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tempest/WindDancer.java b/Mage.Sets/src/mage/sets/tempest/WindDancer.java index ebfd6d34722..e8bcf240d95 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/Afflict.java b/Mage.Sets/src/mage/sets/tenth/Afflict.java index 3f12740a3a1..e8b21b0a543 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 381f1b68126..55cee125920 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 ae628853fe3..232f2609175 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/AngelicBlessing.java b/Mage.Sets/src/mage/sets/tenth/AngelicBlessing.java index e2d56e119d0..e39fb4e291f 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 1bdca96bb90..bd70c9e244c 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/BeaconOfImmortality.java b/Mage.Sets/src/mage/sets/tenth/BeaconOfImmortality.java index a0a46a020ed..feb17e44bf2 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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 824c9a1b466..49a3726c4cb 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 6d1f6824371..b7b10905e6e 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()); + this.getSpellAbility().addTarget(new TargetPermanent(true)); } public Boomerang(final Boomerang card) { diff --git a/Mage.Sets/src/mage/sets/tenth/CruelEdict.java b/Mage.Sets/src/mage/sets/tenth/CruelEdict.java index d94a0eca588..59cdd40d32d 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()); + this.getSpellAbility().addTarget(new TargetOpponent(true)); // Target opponent sacrifices a creature. } diff --git a/Mage.Sets/src/mage/sets/tenth/Dehydration.java b/Mage.Sets/src/mage/sets/tenth/Dehydration.java index 0518d4e34d1..c84897a6c94 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/Fear.java b/Mage.Sets/src/mage/sets/tenth/Fear.java index f88118e314e..c18b5225c69 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/FistsOfTheAnvil.java b/Mage.Sets/src/mage/sets/tenth/FistsOfTheAnvil.java index dc9f5990c25..35ef8935903 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 303cd10798f..369cf9f39db 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/GhostWarden.java b/Mage.Sets/src/mage/sets/tenth/GhostWarden.java index 9cef811df90..b4236ecceca 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/GiantGrowth.java b/Mage.Sets/src/mage/sets/tenth/GiantGrowth.java index 8f2695d640a..b83477df66e 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); this.getSpellAbility().addEffect(new BoostTargetEffect(3, 3, Duration.EndOfTurn)); } diff --git a/Mage.Sets/src/mage/sets/tenth/HighwayRobber.java b/Mage.Sets/src/mage/sets/tenth/HighwayRobber.java index dbbeec15b07..e296730ed75 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()); + ability.addTarget(new TargetOpponent(true)); 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 997d5781dfa..580e161e1b6 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 393ef518b78..cf4df9a2dbd 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/LavaAxe.java b/Mage.Sets/src/mage/sets/tenth/LavaAxe.java index 8683a4bccde..00eff98d617 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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 3acfd8e2e08..48a0bff411e 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()); + this.addTarget(new TargetOpponent(true)); } MergimTriggeredAbility(final MergimTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/tenth/MindRot.java b/Mage.Sets/src/mage/sets/tenth/MindRot.java index 5e4e609874b..af5beb133d3 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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 c0e2490c5e1..d8fbd9b7963 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()))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)))); } public NantukoHusk(final NantukoHusk card) { diff --git a/Mage.Sets/src/mage/sets/tenth/Pacifism.java b/Mage.Sets/src/mage/sets/tenth/Pacifism.java index 84360bc28de..11516ae387c 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 f0cb4100c14..daa55a6a182 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); // 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 c39b9526b1b..c702cfc688b 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 c635a65f654..c7f135faaca 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())); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/Puppeteer.java b/Mage.Sets/src/mage/sets/tenth/Puppeteer.java index 4ad3b524973..7e3a2e1ba6c 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/RazormaneMasticore.java b/Mage.Sets/src/mage/sets/tenth/RazormaneMasticore.java index d07511add9d..cd7243b39bd 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/RobeOfMirrors.java b/Mage.Sets/src/mage/sets/tenth/RobeOfMirrors.java index a1746c64a85..036b78c3584 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/SerrasEmbrace.java b/Mage.Sets/src/mage/sets/tenth/SerrasEmbrace.java index 6a00a869bb8..c36d416b6ae 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/SoulFeast.java b/Mage.Sets/src/mage/sets/tenth/SoulFeast.java index 43538a53118..8904f7c5d74 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); this.getSpellAbility().addEffect(new GainLifeEffect(4)); } diff --git a/Mage.Sets/src/mage/sets/tenth/SpittingEarth.java b/Mage.Sets/src/mage/sets/tenth/SpittingEarth.java index 9bade44fd8a..5bb34bf7a59 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } public SpittingEarth(final SpittingEarth card) { diff --git a/Mage.Sets/src/mage/sets/tenth/Threaten.java b/Mage.Sets/src/mage/sets/tenth/Threaten.java index 19922d04010..a1d71799a03 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 9fcfa2f6b85..b983239628d 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/tenth/Traumatize.java b/Mage.Sets/src/mage/sets/tenth/Traumatize.java index 52ff17b6c9f..e9fbf9662e8 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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 f5114d56d60..e86c79ff782 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/VedalkenMastermind.java b/Mage.Sets/src/mage/sets/tenth/VedalkenMastermind.java index 7720d040789..dbebaaf4cc4 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()); + ability.addTarget(new TargetControlledPermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/thedark/BarlsCage.java b/Mage.Sets/src/mage/sets/thedark/BarlsCage.java index 520004dace0..b93b911533f 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/thedark/Venom.java b/Mage.Sets/src/mage/sets/thedark/Venom.java index 3ba7367bf85..e9ec266d822 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/AqueousForm.java b/Mage.Sets/src/mage/sets/theros/AqueousForm.java index 62d98ad863a..f2e78b7255e 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/BowOfNylea.java b/Mage.Sets/src/mage/sets/theros/BowOfNylea.java index 41f8a176d08..4a44d2439a2 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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/ChosenByHeliod.java b/Mage.Sets/src/mage/sets/theros/ChosenByHeliod.java index 97d627c9729..89e27cb2714 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/DragonMantle.java b/Mage.Sets/src/mage/sets/theros/DragonMantle.java index 2e51cff385e..8d3f7799106 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/FateForetold.java b/Mage.Sets/src/mage/sets/theros/FateForetold.java index 669c0fa76eb..134b3e98fbc 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 bcda73a1b0f..05ab3d14bc9 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/GiftOfImmortality.java b/Mage.Sets/src/mage/sets/theros/GiftOfImmortality.java index 9b4f78f983d..b6980ddd5fd 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/MessengersSpeed.java b/Mage.Sets/src/mage/sets/theros/MessengersSpeed.java index 38fd73e321f..c10495686b8 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 b0d11163a81..bedc03139a6 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/theros/OrdealOfErebos.java b/Mage.Sets/src/mage/sets/theros/OrdealOfErebos.java index 8a600674d6b..9146e35e65e 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/OrdealOfHeliod.java b/Mage.Sets/src/mage/sets/theros/OrdealOfHeliod.java index 57bd57d8061..4e7d9923048 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 c3a6a9cdd11..62c6412b930 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 fb9cdd9bc79..0c98201e675 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 31523ea53d5..b8df8c301e5 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/PsychicIntrusion.java b/Mage.Sets/src/mage/sets/theros/PsychicIntrusion.java index 3e188afdf19..e12a22e1973 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()); + this.getSpellAbility().addTarget(new TargetOpponent(true)); this.getSpellAbility().addEffect(new PsychicIntrusionExileEffect()); } diff --git a/Mage.Sets/src/mage/sets/theros/Scourgemark.java b/Mage.Sets/src/mage/sets/theros/Scourgemark.java index 93e30b37ac7..add24d2a9f6 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/VipersKiss.java b/Mage.Sets/src/mage/sets/theros/VipersKiss.java index f87ce50b0eb..253a2060692 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/timeshifted/FireWhip.java b/Mage.Sets/src/mage/sets/timeshifted/FireWhip.java index 791f49fca2e..04532a7377c 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(); + TargetPermanent auraTarget = new TargetControlledCreaturePermanent(true); 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 19b9d80b82c..2773fc31709 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); Mode mode = new Mode(); mode.getEffects().add(new BoostTargetEffect(2, -1, Duration.EndOfTurn)); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.getTargets().add(new TargetCreaturePermanent(true)); this.getSpellAbility().addMode(mode); mode = new Mode(); mode.getEffects().add(new GainAbilityTargetEffect(new SwampwalkAbility(), Duration.EndOfTurn)); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.getTargets().add(new TargetCreaturePermanent(true)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/sets/timeshifted/SpikeFeeder.java b/Mage.Sets/src/mage/sets/timeshifted/SpikeFeeder.java index d294b4bfd3f..0f2cda68c9a 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 1e9ac8706f0..cb4f7e5d7d1 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()); + this.getSpellAbility().addTarget(new TargetOpponent(true)); } 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 917c3dbe792..fd9d269ca27 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/timespiral/AncestralVision.java b/Mage.Sets/src/mage/sets/timespiral/AncestralVision.java index a76e35201e5..794966f4260 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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 b9a064f7d7b..081b95acdaa 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/Bewilder.java b/Mage.Sets/src/mage/sets/timespiral/Bewilder.java index 99c7ad90579..feb99d95c35 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/timespiral/EternitySnare.java b/Mage.Sets/src/mage/sets/timespiral/EternitySnare.java index 5328c4d9732..9d614971c15 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 ce6f7a18679..ad13979b0da 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/IgniteMemories.java b/Mage.Sets/src/mage/sets/timespiral/IgniteMemories.java index 8de89911f26..3363f9ae0ab 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); this.getSpellAbility().addEffect(new IgniteMemoriesEffect()); // Storm this.addAbility(new StormAbility()); diff --git a/Mage.Sets/src/mage/sets/timespiral/LightningAxe.java b/Mage.Sets/src/mage/sets/timespiral/LightningAxe.java index 743b6df8827..20dcea6603b 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 1f531d8f736..83f21f6d4c0 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()); + ability.addTarget(new TargetPermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/timespiral/MightOfOldKrosa.java b/Mage.Sets/src/mage/sets/timespiral/MightOfOldKrosa.java index e55cad979d9..700f07923bc 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } public MightOfOldKrosa(final MightOfOldKrosa card) { diff --git a/Mage.Sets/src/mage/sets/timespiral/MomentaryBlink.java b/Mage.Sets/src/mage/sets/timespiral/MomentaryBlink.java index 681ea1827f0..f4521fc606e 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()); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); this.getSpellAbility().addEffect(new ExileTargetForSourceEffect("Momentary Blink")); this.getSpellAbility().addEffect(new ReturnToBattlefieldUnderYourControlTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/timespiral/RiftwingCloudskate.java b/Mage.Sets/src/mage/sets/timespiral/RiftwingCloudskate.java index f58289791db..5c5d8d9ed1a 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()); + ability.addTarget(new TargetPermanent(true)); 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 65ab1b7341e..c7085403a8a 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(); + TargetPlayer target = new TargetPlayer(true); 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/SuddenSpoiling.java b/Mage.Sets/src/mage/sets/timespiral/SuddenSpoiling.java index ab9a2ec973a..94a40b9e853 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } diff --git a/Mage.Sets/src/mage/sets/timespiral/TemporalIsolation.java b/Mage.Sets/src/mage/sets/timespiral/TemporalIsolation.java index bd92298a0af..76e9cb7c50d 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/WalkTheAeons.java b/Mage.Sets/src/mage/sets/timespiral/WalkTheAeons.java index c91545836ca..17766f4b19a 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } 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 74bde676f06..1c03b6d0f6d 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()); + this.getSpellAbility().addTarget(new TargetPermanent(true)); 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 478f7e03310..d8643917fe7 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); // 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 e772e445d9c..505539d28e4 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); // Flashback-{1}{U}, Pay 3 life. CostsImpl costs = new CostsImpl(); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/Attrition.java b/Mage.Sets/src/mage/sets/urzasdestiny/Attrition.java index b2b3b80e285..f2fbeccec10 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/Attrition.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/Attrition.java @@ -62,7 +62,7 @@ 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())); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); 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 779ea3f1768..3e354f02240 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())); + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BloodshotCyclopsEffect(), new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); 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 300007b8b70..ab18245369e 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/FodderCannon.java b/Mage.Sets/src/mage/sets/urzasdestiny/FodderCannon.java index 7373a9b3b4f..e8a26a9f8a7 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()); + ability.addTarget(new TargetCreaturePermanent(true)); ability.addCost(new TapSourceCost()); - ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/SigilOfSleep.java b/Mage.Sets/src/mage/sets/urzasdestiny/SigilOfSleep.java index 98f3dc1ee3e..14ce187a0a0 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/urzasdestiny/Treachery.java b/Mage.Sets/src/mage/sets/urzasdestiny/Treachery.java index dd2996d0c40..d08ce10ff55 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/urzaslegacy/AboutFace.java b/Mage.Sets/src/mage/sets/urzaslegacy/AboutFace.java index 8ead0ddde0b..6d2b918806d 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } public AboutFace(final AboutFace card) { diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/BrinkOfMadness.java b/Mage.Sets/src/mage/sets/urzaslegacy/BrinkOfMadness.java index 57cc45d3a36..31e2e315187 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()); + ability.addTarget(new TargetOpponent(true)); 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 f6991e6c53d..66b1085e075 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()); + this.getSpellAbility().addTarget(new TargetPermanent(true)); } 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 47a2c116099..723295c97d4 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/GhituWarCry.java b/Mage.Sets/src/mage/sets/urzaslegacy/GhituWarCry.java index 412d255f505..961fa7c7acc 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/GraniteGrip.java b/Mage.Sets/src/mage/sets/urzaslegacy/GraniteGrip.java index 0c9c0410203..c1b56ef06db 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 2e54f7b04c0..309539a9614 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); // Cycling {2} this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/MotherOfRunes.java b/Mage.Sets/src/mage/sets/urzaslegacy/MotherOfRunes.java index 4bb9cc9fb34..55f2307a9a8 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()); + ability.addTarget(new TargetControlledCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Opportunity.java b/Mage.Sets/src/mage/sets/urzaslegacy/Opportunity.java index 7e7396dcc3d..6df66466695 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } 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 9066035620a..8825914c4e3 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()); + this.getSpellAbility().addTarget(new TargetOpponent(true)); this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(new FilterCreatureCard("a creature card"))); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianBroodlings.java b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianBroodlings.java index 1d51fd44f77..96a05b30190 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())); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); } 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 93c440e40a4..ee4a6b5405c 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDefiler.java b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDefiler.java index 976eb072f49..90ef3c25cf9 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDenouncer.java b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianDenouncer.java index 5a11658c4d7..607bfffc9cf 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianPlaguelord.java b/Mage.Sets/src/mage/sets/urzaslegacy/PhyrexianPlaguelord.java index e90655b1fba..86652210cad 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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())); - ability.addTarget(new TargetCreaturePermanent()); + new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Rancor.java b/Mage.Sets/src/mage/sets/urzaslegacy/Rancor.java index ae08d0fe3fc..cebe04649e5 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 3a43f24f62a..683e15155a2 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); this.getSpellAbility().addEffect(new RepopulateEffect()); // Cycling {2} this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/SilkNet.java b/Mage.Sets/src/mage/sets/urzaslegacy/SilkNet.java index 1124c6a20a4..02b52c41155 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 77bf7968794..33914d63086 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 3593a25e684..809b21a4c08 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 1d17c6ca012..fa9279168d2 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 e076d9eb28a..fa592d2ad9f 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 ab7392d5f14..484dac642fa 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/AbyssalHorror.java b/Mage.Sets/src/mage/sets/urzassaga/AbyssalHorror.java index 53c27942baf..73121b7fd94 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/BarrinMasterWizard.java b/Mage.Sets/src/mage/sets/urzassaga/BarrinMasterWizard.java index 8c0229a5f86..3baca757598 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())); - ability.addTarget(new TargetCreaturePermanent()); + ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(true))); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/Bravado.java b/Mage.Sets/src/mage/sets/urzassaga/Bravado.java index 06b83cedfd2..8985ccc8661 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 10625e07603..cb184f2f5f8 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 d44930dbaa4..1f332f2504b 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 dee1a4edf0e..666d4915cf9 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()); + ability.addTarget(new TargetOpponent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/CarpetOfFlowers.java b/Mage.Sets/src/mage/sets/urzassaga/CarpetOfFlowers.java index 0dafee1d22a..31d1a6acf35 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/CarpetOfFlowers.java +++ b/Mage.Sets/src/mage/sets/urzassaga/CarpetOfFlowers.java @@ -83,7 +83,7 @@ class CarpetOfFlowersTriggeredAbility extends TriggeredAbilityImpl { public CarpetOfFlowersTriggeredAbility() { super(Zone.BATTLEFIELD, new CarpetOfFlowersEffect(), true); this.addChoice(new ChoiceColor()); - this.addTarget(new TargetOpponent()); + this.addTarget(new TargetOpponent(true)); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/ClawsOfGix.java b/Mage.Sets/src/mage/sets/urzassaga/ClawsOfGix.java index 448f5e9b6bb..de8c4d66a92 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())); + ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(true))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/CloakOfMists.java b/Mage.Sets/src/mage/sets/urzassaga/CloakOfMists.java index 5c319d88935..33916d1b995 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 31776a8b428..fc80cb4bf32 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(); + TargetPermanent auraTarget = new TargetPermanent(true); 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 328b5f5c728..39017687625 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } public Congregate(final Congregate card) { diff --git a/Mage.Sets/src/mage/sets/urzassaga/GaeasEmbrace.java b/Mage.Sets/src/mage/sets/urzassaga/GaeasEmbrace.java index ce035365e87..b6626472576 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/Pariah.java b/Mage.Sets/src/mage/sets/urzassaga/Pariah.java index f5ac3d9fdd3..dd5f73b348b 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 b01f622138a..0b533dcade6 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())); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzassaga/Reflexes.java b/Mage.Sets/src/mage/sets/urzassaga/Reflexes.java index 5544aa4ff71..2ea633f194b 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 ef4b4d0cfc0..0a3714e3eb6 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()); + this.getSpellAbility().addTarget(new TargetPermanent(true)); 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 21e2407ddfd..ae2f730a77a 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/StrokeOfGenius.java b/Mage.Sets/src/mage/sets/urzassaga/StrokeOfGenius.java index 97ccc7be094..aeab1c2602d 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } 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 49a11973eca..78ec0bc537f 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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 1f65b1b7515..7f7d0e7f027 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/ZephidsEmbrace.java b/Mage.Sets/src/mage/sets/urzassaga/ZephidsEmbrace.java index 5720bf7c617..1382b6bd634 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 5d1ef12e92a..adfea5628fb 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()); + this.getSpellAbility().addTarget(new TargetOpponent(true)); this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect()); } diff --git a/Mage.Sets/src/mage/sets/visions/DragonMask.java b/Mage.Sets/src/mage/sets/visions/DragonMask.java index 1b3a7d71085..219f799f33d 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()); + ability.addTarget(new TargetControlledCreaturePermanent(true)); 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/Necrosavant.java b/Mage.Sets/src/mage/sets/visions/Necrosavant.java index 026bcc39ba5..ceca3edda33 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())); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); 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 d27e189990b..2327c114ecf 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/visions/WandOfDenial.java b/Mage.Sets/src/mage/sets/visions/WandOfDenial.java index 01044803616..af8a403933b 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/weatherlight/Abduction.java b/Mage.Sets/src/mage/sets/weatherlight/Abduction.java index 8fcb792bee8..e18bbd4c4b5 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/FitOfRage.java b/Mage.Sets/src/mage/sets/weatherlight/FitOfRage.java index 40ab76c054e..be0297d7562 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 ffec7eb9102..9c64cbce7ea 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/worldwake/AEtherTradewinds.java b/Mage.Sets/src/mage/sets/worldwake/AEtherTradewinds.java index ee9919c5fb4..b6e3ca45970 100644 --- a/Mage.Sets/src/mage/sets/worldwake/AEtherTradewinds.java +++ b/Mage.Sets/src/mage/sets/worldwake/AEtherTradewinds.java @@ -59,7 +59,7 @@ 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()); + this.getSpellAbility().addTarget(new TargetControlledPermanent(true)); this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new AEtherTradewindsEffect()); diff --git a/Mage.Sets/src/mage/sets/worldwake/BazaarTrader.java b/Mage.Sets/src/mage/sets/worldwake/BazaarTrader.java index c583628c5be..d83f8e1612c 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()); + ability.addTarget(new TargetPlayer(true)); 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 00a6b030fa8..8b3668647f0 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()); + ability.addTarget(new TargetOpponent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/worldwake/BrinkOfDisaster.java b/Mage.Sets/src/mage/sets/worldwake/BrinkOfDisaster.java index 52796725118..89d7c5439c8 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(); + TargetPermanent auraTarget = new TargetPermanent(true); 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 8dd1e2b49be..9c795ba98b9 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 f05548e03c6..a7b26bab2c4 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 daf311a496a..27d0056f73d 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/worldwake/ClawsOfValakut.java b/Mage.Sets/src/mage/sets/worldwake/ClawsOfValakut.java index 7e4e31955a5..55b55dfc55b 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 b0ba1f4c694..2ec8d1c7cd5 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/worldwake/DeadReckoning.java b/Mage.Sets/src/mage/sets/worldwake/DeadReckoning.java index 309759e2acf..2363e624f5e 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(); + TargetCreaturePermanent target2 = new TargetCreaturePermanent(true); 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 0cd93aee4c2..7f4099e38a1 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/worldwake/FeralContest.java b/Mage.Sets/src/mage/sets/worldwake/FeralContest.java index c6a4fd8493d..478fa85b44f 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()); + this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); // Another target creature blocks it this turn if able. this.getSpellAbility().addEffect(new FeralContestEffect()); - this.getSpellAbility().addTarget(new TargetCreaturePermanent()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 710503a8df6..2ffc47c52b3 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/worldwake/Groundswell.java b/Mage.Sets/src/mage/sets/worldwake/Groundswell.java index 4e1f387359c..ad744c1ae20 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 5e378f28dac..65d41f1a281 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/worldwake/JaceTheMindSculptor.java b/Mage.Sets/src/mage/sets/worldwake/JaceTheMindSculptor.java index 68e6e9fa089..65b8552a6c9 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()); + ability1.addTarget(new TargetPlayer(true)); this.addAbility(ability1); LoyaltyAbility ability2 = new LoyaltyAbility(new JaceTheMindSculptorEffect2(), 0); this.addAbility(ability2); LoyaltyAbility ability3 = new LoyaltyAbility(new ReturnToHandTargetEffect(), -1); - ability3.addTarget(new TargetCreaturePermanent()); + ability3.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability3); LoyaltyAbility ability4 = new LoyaltyAbility(new JaceTheMindSculptorEffect3(), -12); - ability4.addTarget(new TargetPlayer()); + ability4.addTarget(new TargetPlayer(true)); this.addAbility(ability4); } diff --git a/Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java b/Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java index a0690be87c4..89d283733a1 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()); + this.addTarget(new TargetPlayer(true)); this.getEffects().add(new GainLifeEffect(2)); } diff --git a/Mage.Sets/src/mage/sets/worldwake/RestForTheWeary.java b/Mage.Sets/src/mage/sets/worldwake/RestForTheWeary.java index 3bc9a48a1c4..e685f833760 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } 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 71deb979b39..4beb9f3ce2c 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()); + ability.addTarget(new TargetPlayer(true)); 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 5bea9198425..3faed42f34b 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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 1d2b52d6f60..e57c386f1e2 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()); + ability.addTarget(new TargetControlledCreaturePermanent(true)); 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 24ca9ef6877..47d20219496 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/worldwake/TombHex.java b/Mage.Sets/src/mage/sets/worldwake/TombHex.java index cea357df5cd..2fa35a77276 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } public TombHex(final TombHex card) { diff --git a/Mage.Sets/src/mage/sets/worldwake/VaporSnare.java b/Mage.Sets/src/mage/sets/worldwake/VaporSnare.java index f7b9905cbe8..f4a9d226b14 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 60cb7aefa06..e52be68231a 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 88447a01d5a..8a7bf1cf982 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()); + this.addTarget(new TargetCreaturePermanent(true)); } 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 8828fc67718..97567662cf0 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()); + this.getSpellAbility().addTarget(new TargetOpponent(true)); 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 28ab242ab3a..10e864476a1 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(); + TargetPlayer target = new TargetPlayer(true); 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 b62db9aee3a..11197f14a60 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()); + this.getSpellAbility().addTarget(new TargetOpponent(true)); 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 52297772f1f..f7d39d12462 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/CarnageAltar.java b/Mage.Sets/src/mage/sets/zendikar/CarnageAltar.java index b08ac5a0f8c..18e4deabdde 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())); + ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/CelestialMantle.java b/Mage.Sets/src/mage/sets/zendikar/CelestialMantle.java index 39ce256a430..3afb33aebe9 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 853a7942357..5b77928e47d 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 fd9bfa46d93..2f04af59150 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(); + TargetControlledPermanent target = new TargetControlledCreaturePermanent(true); target.setRequired(true); Player player = game.getPlayer(source.getControllerId()); if (target.canChoose(source.getControllerId(), game)) { diff --git a/Mage.Sets/src/mage/sets/zendikar/FeastOfBlood.java b/Mage.Sets/src/mage/sets/zendikar/FeastOfBlood.java index 7e21bf4629f..0e9d536722b 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 5d8c50d6e14..d6bf2053996 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()); + conditionalAbility.addTarget(new TargetPlayer(true)); this.addAbility(conditionalAbility); } diff --git a/Mage.Sets/src/mage/sets/zendikar/Gigantiform.java b/Mage.Sets/src/mage/sets/zendikar/Gigantiform.java index 2fc26068f3b..5a221088fc7 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 a01364ddd24..dab43b5e98e 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/GoblinWarPaint.java b/Mage.Sets/src/mage/sets/zendikar/GoblinWarPaint.java index 2fcd9e72e96..76719f35276 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 21373847ab2..ec2b267506e 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 5c4ac47398f..5fa8e0e6f98 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/HeartstabberMosquito.java b/Mage.Sets/src/mage/sets/zendikar/HeartstabberMosquito.java index 9fb5972e815..a0af51df154 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 d137424f4a9..d2133a49c39 100644 --- a/Mage.Sets/src/mage/sets/zendikar/HedronCrab.java +++ b/Mage.Sets/src/mage/sets/zendikar/HedronCrab.java @@ -28,12 +28,12 @@ package mage.sets.zendikar; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.target.TargetPlayer; /** @@ -50,8 +50,9 @@ public class HedronCrab extends CardImpl { this.color.setBlue(true); this.power = new MageInt(0); 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/InfernoTrap.java b/Mage.Sets/src/mage/sets/zendikar/InfernoTrap.java index e494a9f9c52..bba456eebe9 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } public InfernoTrap(final InfernoTrap card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/KalitasBloodchiefOfGhet.java b/Mage.Sets/src/mage/sets/zendikar/KalitasBloodchiefOfGhet.java index 5ee1c2e514c..97b0e87e647 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/KorAeronaut.java b/Mage.Sets/src/mage/sets/zendikar/KorAeronaut.java index 5d55d2fd922..9b671c523fe 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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/KorOutfitter.java b/Mage.Sets/src/mage/sets/zendikar/KorOutfitter.java index b668f4369ce..d5909f4be50 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()); + ability.addTarget(new TargetControlledCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/MagmaRift.java b/Mage.Sets/src/mage/sets/zendikar/MagmaRift.java index 226b18c1ffd..3153f06132b 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); } 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 6f017fb55e2..2ce6245d302 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 ca0c2d595ef..3fcfa2ecfd4 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } public MarshCasualties(final MarshCasualties card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/MindSludge.java b/Mage.Sets/src/mage/sets/zendikar/MindSludge.java index 65084de8f4e..1fdea24ee60 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); 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 a8f12dbb7f3..14b9fd272d4 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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/MurasaPyromancer.java b/Mage.Sets/src/mage/sets/zendikar/MurasaPyromancer.java index 75e2f54e6cf..209bbc1dfaa 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/NarrowEscape.java b/Mage.Sets/src/mage/sets/zendikar/NarrowEscape.java index e15e07d2b31..d2d3943e064 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 861eef51997..ac8378e7c0f 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } 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 a55081f1527..110523cb8b3 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 91eeca3164c..36561d815d8 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/ObNixilisTheFallen.java b/Mage.Sets/src/mage/sets/zendikar/ObNixilisTheFallen.java index 78dfef2c37b..0606099936b 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/ParalyzingGrasp.java b/Mage.Sets/src/mage/sets/zendikar/ParalyzingGrasp.java index 0e1a0c6cccd..8aed1532270 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 7cef1dc5e16..1ef7db71b90 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/PredatoryUrge.java b/Mage.Sets/src/mage/sets/zendikar/PredatoryUrge.java index 2bcb75b8d0c..4fcc66c8730 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 20ea99489a8..4701de97743 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 5b5082a38e6..7bd434bd005 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/QuestForTheGemblades.java b/Mage.Sets/src/mage/sets/zendikar/QuestForTheGemblades.java index 7f21d09812b..62029cafe11 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/QuestForTheHolyRelic.java b/Mage.Sets/src/mage/sets/zendikar/QuestForTheHolyRelic.java index 2d1008c2622..00998fe5810 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(); + Target targetCreature = new TargetControlledCreaturePermanent(true); 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 1a690766e22..9da66fe0613 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } 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 efbb3375a9f..777e3a9f454 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()); + ability.addTarget(new TargetPlayer(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/RiteOfReplication.java b/Mage.Sets/src/mage/sets/zendikar/RiteOfReplication.java index 143bbfc6fff..01d860dc366 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 00336ecd7a1..3b5755c98c8 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java b/Mage.Sets/src/mage/sets/zendikar/RuneflareTrap.java index 7a8f5090562..626becd41ff 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } diff --git a/Mage.Sets/src/mage/sets/zendikar/SadisticSacrament.java b/Mage.Sets/src/mage/sets/zendikar/SadisticSacrament.java index af599542b99..5eed9059f68 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } 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 890fa199a59..bf9dd9e7183 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(); + TargetPermanent auraTarget = new TargetCreaturePermanent(true); 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 b7aabd1f075..1ee074be59c 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 ef74f7ab959..a155bbc5496 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/SorinMarkov.java b/Mage.Sets/src/mage/sets/zendikar/SorinMarkov.java index 1c69ad1d876..267a53eb7da 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()); + ability2.addTarget(new TargetOpponent(true)); 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()); + ability3.addTarget(new TargetPlayer(true)); this.addAbility(ability3); } diff --git a/Mage.Sets/src/mage/sets/zendikar/TeeteringPeaks.java b/Mage.Sets/src/mage/sets/zendikar/TeeteringPeaks.java index 515ac0bde88..72e5ee6f94c 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 d0ab599e601..f36c459be6a 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()); + ability.addTarget(new TargetCreaturePermanent(true)); 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 92b1487b80e..3279a64662a 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()); + this.getSpellAbility().addTarget(new TargetPlayer(true)); } 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 90ecd914d43..9c6663c6944 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/TurntimberGrove.java b/Mage.Sets/src/mage/sets/zendikar/TurntimberGrove.java index b5d3ec33abe..fe89e099bc2 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()); + ability.addTarget(new TargetCreaturePermanent(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/zendikar/UnstableFooting.java b/Mage.Sets/src/mage/sets/zendikar/UnstableFooting.java index 3f4b9489352..40f8310e894 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()); + ability.addTarget(new TargetPlayer(true)); } } } diff --git a/Mage.Sets/src/mage/sets/zendikar/VampireHexmage.java b/Mage.Sets/src/mage/sets/zendikar/VampireHexmage.java index af36336c078..5df960ece58 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()); + vampireHexmageAbility.addTarget(new TargetPermanent(true)); this.addAbility(vampireHexmageAbility); } diff --git a/Mage.Sets/src/mage/sets/zendikar/VampiresBite.java b/Mage.Sets/src/mage/sets/zendikar/VampiresBite.java index fad2070ba0d..0aaaaf860b3 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()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); 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 795aadd1e9f..0c04b978af8 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(); + TargetCreaturePermanent target = new TargetCreaturePermanent(true); this.getSpellAbility().addTarget(target); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HexproofAbility.getInstance(), Duration.EndOfTurn)); diff --git a/Mage/src/mage/target/common/TargetControlledPermanent.java b/Mage/src/mage/target/common/TargetControlledPermanent.java index e1eaccfa2da..92047478af9 100644 --- a/Mage/src/mage/target/common/TargetControlledPermanent.java +++ b/Mage/src/mage/target/common/TargetControlledPermanent.java @@ -42,6 +42,11 @@ 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); }