From f072ba8d37ae402873c1daa749f971b657164181 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Thu, 19 Apr 2018 14:41:38 -0400 Subject: [PATCH] updated all cards that use any target (with a few possible exceptions, it's hard to tell) --- Mage.Sets/src/mage/cards/a/AcidicSliver.java | 4 ++-- .../src/mage/cards/a/AcolytesReward.java | 4 ++-- Mage.Sets/src/mage/cards/a/AcornCatapult.java | 2 +- Mage.Sets/src/mage/cards/a/Aeolipile.java | 2 +- .../src/mage/cards/a/AetherfluxReservoir.java | 2 +- Mage.Sets/src/mage/cards/a/AirdropCondor.java | 2 +- Mage.Sets/src/mage/cards/a/AjaniVengeant.java | 2 +- Mage.Sets/src/mage/cards/a/AkoumHellkite.java | 2 +- .../src/mage/cards/a/AlabasterPotion.java | 2 +- Mage.Sets/src/mage/cards/a/AlabasterWall.java | 2 +- Mage.Sets/src/mage/cards/a/AladdinsRing.java | 2 +- Mage.Sets/src/mage/cards/a/AmuletOfKroog.java | 2 +- Mage.Sets/src/mage/cards/a/AnabaShaman.java | 2 +- Mage.Sets/src/mage/cards/a/AncientHydra.java | 2 +- .../src/mage/cards/a/AnnihilatingFire.java | 2 +- .../src/mage/cards/a/ApocalypseHydra.java | 2 +- .../src/mage/cards/a/ApprenticeSorcerer.java | 2 +- Mage.Sets/src/mage/cards/a/ArcBlade.java | 2 +- Mage.Sets/src/mage/cards/a/ArcSlogger.java | 2 +- Mage.Sets/src/mage/cards/a/ArcTrail.java | 2 +- .../mage/cards/a/ArlinnEmbracedByTheMoon.java | 4 ++-- Mage.Sets/src/mage/cards/a/ArrowStorm.java | 2 +- .../src/mage/cards/a/AssaultBattery.java | 4 ++-- Mage.Sets/src/mage/cards/a/AtarkaEfreet.java | 4 ++-- Mage.Sets/src/mage/cards/a/AuroraEidolon.java | 2 +- Mage.Sets/src/mage/cards/a/AvenRedeemer.java | 2 +- .../src/mage/cards/b/BallistaCharger.java | 2 +- .../src/mage/cards/b/BalmOfRestoration.java | 2 +- Mage.Sets/src/mage/cards/b/Banefire.java | 4 ++-- Mage.Sets/src/mage/cards/b/Banshee.java | 4 ++-- Mage.Sets/src/mage/cards/b/BarbarianRing.java | 2 +- Mage.Sets/src/mage/cards/b/BarbedField.java | 4 ++-- .../mage/cards/b/BarrageOfExpendables.java | 2 +- Mage.Sets/src/mage/cards/b/BarrageTyrant.java | 4 ++-- .../src/mage/cards/b/BarrentonMedic.java | 2 +- Mage.Sets/src/mage/cards/b/BeeSting.java | 2 +- .../src/mage/cards/b/BenevolentAncestor.java | 2 +- Mage.Sets/src/mage/cards/b/BlastOfGenius.java | 2 +- .../src/mage/cards/b/BlastingStation.java | 2 +- Mage.Sets/src/mage/cards/b/Blaze.java | 2 +- .../src/mage/cards/b/BlazingHellhound.java | 2 +- Mage.Sets/src/mage/cards/b/BlazingTorch.java | 4 ++-- Mage.Sets/src/mage/cards/b/BlightedGorge.java | 2 +- .../src/mage/cards/b/BloodhallPriest.java | 4 ++-- .../src/mage/cards/b/BloodshotCyclops.java | 2 +- Mage.Sets/src/mage/cards/b/BomberCorps.java | 2 +- .../src/mage/cards/b/BonethornValesk.java | 2 +- .../src/mage/cards/b/BorborygmosEnraged.java | 2 +- Mage.Sets/src/mage/cards/b/BorosReckoner.java | 4 ++-- Mage.Sets/src/mage/cards/b/BoshIronGolem.java | 4 ++-- .../src/mage/cards/b/BrimstoneVolley.java | 2 +- .../src/mage/cards/b/BrothersOfFire.java | 2 +- .../src/mage/cards/b/BurnAtTheStake.java | 4 ++-- .../src/mage/cards/b/BurnFromWithin.java | 4 ++-- Mage.Sets/src/mage/cards/b/BurnTrail.java | 2 +- Mage.Sets/src/mage/cards/b/BurningAnger.java | 6 +++--- .../src/mage/cards/b/BurningEyeZubera.java | 4 ++-- .../src/mage/cards/b/BurningVengeance.java | 4 ++-- .../src/mage/cards/b/BurstLightning.java | 2 +- .../src/mage/cards/c/CacklingFlames.java | 2 +- Mage.Sets/src/mage/cards/c/CandlesGlow.java | 4 ++-- .../src/mage/cards/c/CapriciousSorcerer.java | 2 +- Mage.Sets/src/mage/cards/c/Carbonize.java | 2 +- Mage.Sets/src/mage/cards/c/Caregiver.java | 2 +- Mage.Sets/src/mage/cards/c/CauterySliver.java | 4 ++-- .../src/mage/cards/c/ChainLightning.java | 4 ++-- Mage.Sets/src/mage/cards/c/ChainOfPlasma.java | 4 ++-- Mage.Sets/src/mage/cards/c/Chainflinger.java | 4 ++-- Mage.Sets/src/mage/cards/c/ChandraAblaze.java | 4 ++-- .../src/mage/cards/c/ChandraTheFirebrand.java | 2 +- .../mage/cards/c/ChandraTorchOfDefiance.java | 2 +- Mage.Sets/src/mage/cards/c/Char.java | 2 +- .../src/mage/cards/c/CinderElemental.java | 2 +- Mage.Sets/src/mage/cards/c/CinderStorm.java | 2 +- .../src/mage/cards/c/ClockworkHydra.java | 4 ++-- Mage.Sets/src/mage/cards/c/CloseQuarters.java | 2 +- .../src/mage/cards/c/CollateralDamage.java | 2 +- Mage.Sets/src/mage/cards/c/CombatMedic.java | 2 +- Mage.Sets/src/mage/cards/c/CometStorm.java | 6 +++--- Mage.Sets/src/mage/cards/c/ConeOfFlame.java | 2 +- Mage.Sets/src/mage/cards/c/ConsumeSpirit.java | 4 ++-- Mage.Sets/src/mage/cards/c/Corrupt.java | 4 ++-- .../src/mage/cards/c/CovenantOfBlood.java | 4 ++-- Mage.Sets/src/mage/cards/c/Crackleburr.java | 2 +- .../src/mage/cards/c/CracklingTriton.java | 2 +- Mage.Sets/src/mage/cards/c/CratersClaws.java | 2 +- .../src/mage/cards/c/CuombajjWitches.java | 4 ++-- Mage.Sets/src/mage/cards/c/CursedScroll.java | 4 ++-- .../src/mage/cards/d/DAvenantHealer.java | 2 +- .../src/mage/cards/d/DanceWithDevils.java | 6 +++--- .../src/mage/cards/d/DarigaazsCharm.java | 2 +- .../src/mage/cards/d/DarkNourishment.java | 2 +- Mage.Sets/src/mage/cards/d/DaruHealer.java | 2 +- Mage.Sets/src/mage/cards/d/Dawnfluke.java | 2 +- Mage.Sets/src/mage/cards/d/Deadapult.java | 2 +- Mage.Sets/src/mage/cards/d/DeathSpark.java | 2 +- .../src/mage/cards/d/DeathbringerThoctar.java | 2 +- Mage.Sets/src/mage/cards/d/DefenderEnVec.java | 2 +- Mage.Sets/src/mage/cards/d/Demonfire.java | 4 ++-- Mage.Sets/src/mage/cards/d/DemonicPact.java | 2 +- Mage.Sets/src/mage/cards/d/DevilsPlay.java | 2 +- .../src/mage/cards/d/DevilsPlayground.java | 6 +++--- Mage.Sets/src/mage/cards/d/Disintegrate.java | 2 +- .../src/mage/cards/d/DivineDeflection.java | 4 ++-- Mage.Sets/src/mage/cards/d/Dogpile.java | 4 ++-- Mage.Sets/src/mage/cards/d/DoomCannon.java | 2 +- Mage.Sets/src/mage/cards/d/DragonTempest.java | 4 ++-- Mage.Sets/src/mage/cards/d/DrainLife.java | 4 ++-- Mage.Sets/src/mage/cards/d/DynavoltTower.java | 2 +- .../src/mage/cards/e/ElaborateFirecannon.java | 2 +- .../src/mage/cards/e/Electropotence.java | 6 +++--- Mage.Sets/src/mage/cards/e/EmberShot.java | 2 +- .../src/mage/cards/e/EmbermageGoblin.java | 2 +- Mage.Sets/src/mage/cards/e/Embersmith.java | 2 +- Mage.Sets/src/mage/cards/e/Endbringer.java | 2 +- .../src/mage/cards/e/ErraticExplosion.java | 2 +- .../src/mage/cards/e/EruptingDreadwolf.java | 2 +- .../src/mage/cards/e/ExplosiveApparatus.java | 2 +- .../src/mage/cards/e/ExplosiveImpact.java | 2 +- .../src/mage/cards/e/ExplosiveRevelation.java | 2 +- .../src/mage/cards/e/ExquisiteFirecraft.java | 2 +- Mage.Sets/src/mage/cards/e/ExtraArms.java | 2 +- .../src/mage/cards/f/FallenFerromancer.java | 2 +- .../src/mage/cards/f/FanaticalFirebrand.java | 2 +- .../src/mage/cards/f/FanningTheFlames.java | 2 +- .../src/mage/cards/f/FatefulShowdown.java | 4 ++-- Mage.Sets/src/mage/cards/f/FemerefHealer.java | 2 +- .../src/mage/cards/f/FieryBombardment.java | 4 ++-- Mage.Sets/src/mage/cards/f/FieryTemper.java | 2 +- Mage.Sets/src/mage/cards/f/FireAmbush.java | 2 +- Mage.Sets/src/mage/cards/f/FireBowman.java | 2 +- Mage.Sets/src/mage/cards/f/FireWhip.java | 6 +++--- Mage.Sets/src/mage/cards/f/Fireblast.java | 2 +- Mage.Sets/src/mage/cards/f/Firebolt.java | 2 +- .../mage/cards/f/FireforgersPuzzleknot.java | 4 ++-- .../src/mage/cards/f/FiremaneAvenger.java | 2 +- .../src/mage/cards/f/FiresOfUndeath.java | 2 +- .../mage/cards/f/FiresongAndSunspeaker.java | 4 ++-- Mage.Sets/src/mage/cards/f/FiveAlarmFire.java | 2 +- Mage.Sets/src/mage/cards/f/FlameBurst.java | 4 ++-- .../src/mage/cards/f/FlameFusillade.java | 2 +- Mage.Sets/src/mage/cards/f/FlameJab.java | 2 +- Mage.Sets/src/mage/cards/f/FlameJavelin.java | 2 +- Mage.Sets/src/mage/cards/f/FlameLash.java | 2 +- .../src/mage/cards/f/FlameblastDragon.java | 6 +++--- Mage.Sets/src/mage/cards/f/Flamewright.java | 2 +- Mage.Sets/src/mage/cards/f/Flare.java | 2 +- .../mage/cards/f/FlayerOfTheHatebound.java | 6 +++--- .../src/mage/cards/f/FledglingMawcor.java | 2 +- Mage.Sets/src/mage/cards/f/FleshBlood.java | 4 ++-- Mage.Sets/src/mage/cards/f/Fling.java | 2 +- .../src/mage/cards/f/FloweringField.java | 4 ++-- Mage.Sets/src/mage/cards/f/ForceDrain.java | 4 ++-- Mage.Sets/src/mage/cards/f/ForceHealing.java | 2 +- .../src/mage/cards/f/ForceLightning.java | 2 +- Mage.Sets/src/mage/cards/f/ForceSpark.java | 2 +- .../src/mage/cards/f/ForgebornOreads.java | 2 +- .../src/mage/cards/f/FormOfTheDragon.java | 2 +- .../src/mage/cards/f/FoundryChampion.java | 2 +- Mage.Sets/src/mage/cards/f/Frostwielder.java | 2 +- .../src/mage/cards/f/FurystokeGiant.java | 4 ++-- Mage.Sets/src/mage/cards/g/GalvanicArc.java | 2 +- Mage.Sets/src/mage/cards/g/GalvanicBlast.java | 2 +- Mage.Sets/src/mage/cards/g/Geistblast.java | 2 +- Mage.Sets/src/mage/cards/g/Geistflame.java | 2 +- .../src/mage/cards/g/GhirapurAetherGrid.java | 2 +- Mage.Sets/src/mage/cards/g/GhituFire.java | 2 +- .../src/mage/cards/g/GhituFireEater.java | 2 +- Mage.Sets/src/mage/cards/g/GhituSlinger.java | 2 +- Mage.Sets/src/mage/cards/g/Ghostfire.java | 2 +- Mage.Sets/src/mage/cards/g/GlacialRay.java | 2 +- .../src/mage/cards/g/GoblinArsonist.java | 2 +- .../src/mage/cards/g/GoblinBangchuckers.java | 4 ++-- Mage.Sets/src/mage/cards/g/GoblinBoomKeg.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinCannon.java | 2 +- .../src/mage/cards/g/GoblinCharbelcher.java | 4 ++-- Mage.Sets/src/mage/cards/g/GoblinDynamo.java | 4 ++-- .../src/mage/cards/g/GoblinFestival.java | 2 +- .../src/mage/cards/g/GoblinFirestarter.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinMedics.java | 2 +- .../src/mage/cards/g/GoblinSharpshooter.java | 2 +- .../src/mage/cards/g/GoblinTestPilot.java | 2 +- Mage.Sets/src/mage/cards/g/GrabTheReins.java | 4 ++-- .../src/mage/cards/g/GrangerGuildmage.java | 2 +- Mage.Sets/src/mage/cards/g/GraniteShard.java | 2 +- Mage.Sets/src/mage/cards/g/Grapeshot.java | 2 +- Mage.Sets/src/mage/cards/g/GuardianAngel.java | 4 ++-- .../src/mage/cards/g/GuerrillaTactics.java | 4 ++-- .../src/mage/cards/h/HallowedHealer.java | 4 ++-- .../src/mage/cards/h/HammerOfBogardan.java | 2 +- Mage.Sets/src/mage/cards/h/Hankyu.java | 4 ++-- Mage.Sets/src/mage/cards/h/HarmsWay.java | 4 ++-- .../src/mage/cards/h/HarshSustenance.java | 4 ++-- Mage.Sets/src/mage/cards/h/HatchetBully.java | 4 ++-- Mage.Sets/src/mage/cards/h/Hateflayer.java | 2 +- Mage.Sets/src/mage/cards/h/Heal.java | 2 +- .../src/mage/cards/h/HealersHeaddress.java | 4 ++-- Mage.Sets/src/mage/cards/h/HealingLeaves.java | 2 +- Mage.Sets/src/mage/cards/h/HealingSalve.java | 2 +- .../mage/cards/h/HeartPiercerManticore.java | 6 +++--- Mage.Sets/src/mage/cards/h/HeavyArbalest.java | 2 +- Mage.Sets/src/mage/cards/h/Hecatomb.java | 2 +- Mage.Sets/src/mage/cards/h/Heliophial.java | 4 ++-- .../src/mage/cards/h/HereticsPunishment.java | 2 +- Mage.Sets/src/mage/cards/h/HermeticStudy.java | 4 ++-- Mage.Sets/src/mage/cards/h/HoldAtBay.java | 2 +- .../mage/cards/h/HondenOfInfiniteRage.java | 2 +- .../src/mage/cards/h/HonorablePassage.java | 4 ++-- Mage.Sets/src/mage/cards/h/HotSprings.java | 4 ++-- .../src/mage/cards/h/HypervoltGrasp.java | 2 +- Mage.Sets/src/mage/cards/h/Hypochondria.java | 4 ++-- .../src/mage/cards/i/IcatianJavelineers.java | 2 +- Mage.Sets/src/mage/cards/i/ImminentDoom.java | 4 ++-- .../src/mage/cards/i/IncendiaryFlow.java | 2 +- Mage.Sets/src/mage/cards/i/InfernoFist.java | 2 +- Mage.Sets/src/mage/cards/i/IonStorm.java | 2 +- Mage.Sets/src/mage/cards/i/IreOfKaminari.java | 2 +- Mage.Sets/src/mage/cards/i/IvoryCharm.java | 2 +- .../src/mage/cards/j/JayaBallardTaskMage.java | 2 +- .../src/mage/cards/j/JeskaWarriorAdept.java | 2 +- .../src/mage/cards/j/JhessianBalmgiver.java | 2 +- .../src/mage/cards/j/JundSojourners.java | 2 +- .../src/mage/cards/k/KaervekTheMerciless.java | 4 ++-- Mage.Sets/src/mage/cards/k/KaerveksTorch.java | 2 +- .../src/mage/cards/k/KarplusanMinotaur.java | 8 +++---- .../src/mage/cards/k/KarplusanWolverine.java | 2 +- .../src/mage/cards/k/KeldonMegaliths.java | 4 ++-- .../src/mage/cards/k/KeldonNecropolis.java | 2 +- .../src/mage/cards/k/KeranosGodOfStorms.java | 4 ++-- .../src/mage/cards/k/KilnmouthDragon.java | 2 +- Mage.Sets/src/mage/cards/k/Kindle.java | 4 ++-- Mage.Sets/src/mage/cards/k/KitsuneHealer.java | 2 +- .../mage/cards/k/KnollspineInvocation.java | 2 +- .../src/mage/cards/k/KnowledgeAndPower.java | 2 +- .../src/mage/cards/k/KolaghansCommand.java | 2 +- .../src/mage/cards/k/KothOfTheHammer.java | 2 +- Mage.Sets/src/mage/cards/k/KrisMage.java | 2 +- .../src/mage/cards/k/KrovikanHorror.java | 2 +- .../src/mage/cards/k/KrovikanPlague.java | 2 +- .../mage/cards/k/KumanoMasterYamabushi.java | 2 +- .../src/mage/cards/l/LabyrinthChampion.java | 2 +- .../src/mage/cards/l/LastDitchEffort.java | 4 ++-- .../mage/cards/l/LatullaKeldonOverseer.java | 2 +- Mage.Sets/src/mage/cards/l/LavaDart.java | 2 +- .../src/mage/cards/l/LightningCloud.java | 2 +- .../src/mage/cards/l/LightningCrafter.java | 2 +- .../src/mage/cards/l/LightningDiadem.java | 2 +- .../src/mage/cards/l/LightningJavelin.java | 2 +- .../src/mage/cards/l/LightningProwess.java | 2 +- Mage.Sets/src/mage/cards/l/LightningRift.java | 2 +- .../src/mage/cards/l/LightningStorm.java | 4 ++-- .../src/mage/cards/l/LightningStrike.java | 2 +- .../src/mage/cards/l/LightningSurge.java | 2 +- .../src/mage/cards/l/LightningVolley.java | 4 ++-- Mage.Sets/src/mage/cards/l/LivewireLash.java | 2 +- .../src/mage/cards/l/LoxodonAnchorite.java | 2 +- .../mage/cards/l/LyzoldaTheBloodWitch.java | 4 ++-- Mage.Sets/src/mage/cards/m/MageIlVec.java | 2 +- Mage.Sets/src/mage/cards/m/MagmaBurst.java | 12 +++++------ Mage.Sets/src/mage/cards/m/MagmaJet.java | 2 +- Mage.Sets/src/mage/cards/m/MagmaMine.java | 2 +- Mage.Sets/src/mage/cards/m/MagmaticForce.java | 2 +- .../src/mage/cards/m/MagusOfTheScroll.java | 4 ++-- Mage.Sets/src/mage/cards/m/MakeMischief.java | 4 ++-- .../src/mage/cards/m/MakeshiftMunitions.java | 2 +- .../src/mage/cards/m/MarathWillOfTheWild.java | 2 +- .../src/mage/cards/m/MarduHeartPiercer.java | 4 ++-- Mage.Sets/src/mage/cards/m/Martyrdom.java | 21 +++++++------------ Mage.Sets/src/mage/cards/m/MartyrsCause.java | 2 +- Mage.Sets/src/mage/cards/m/MassiveRaid.java | 2 +- .../src/mage/cards/m/MasterApothecary.java | 2 +- Mage.Sets/src/mage/cards/m/MasterHealer.java | 2 +- Mage.Sets/src/mage/cards/m/MasterTheWay.java | 4 ++-- Mage.Sets/src/mage/cards/m/MendingHands.java | 2 +- Mage.Sets/src/mage/cards/m/MeteorStorm.java | 2 +- Mage.Sets/src/mage/cards/m/Meteorite.java | 2 +- Mage.Sets/src/mage/cards/m/MilitantMonk.java | 2 +- Mage.Sets/src/mage/cards/m/MoggFanatic.java | 2 +- Mage.Sets/src/mage/cards/m/MoltenHydra.java | 2 +- Mage.Sets/src/mage/cards/m/MoltenNursery.java | 2 +- .../src/mage/cards/m/MoltenTailMasticore.java | 2 +- Mage.Sets/src/mage/cards/m/MoltenVortex.java | 2 +- .../src/mage/cards/m/MoongloveExtract.java | 2 +- Mage.Sets/src/mage/cards/m/MorbidHunger.java | 2 +- Mage.Sets/src/mage/cards/m/MorgueBurst.java | 4 ++-- Mage.Sets/src/mage/cards/m/Mortarpod.java | 4 ++-- .../mage/cards/m/MudbuttonTorchrunner.java | 2 +- .../src/mage/cards/m/MurderousRedcap.java | 4 ++-- Mage.Sets/src/mage/cards/n/NeedleDrop.java | 2 +- .../mage/cards/n/NicolBolasGodPharaoh.java | 2 +- .../src/mage/cards/n/NightfireGiant.java | 2 +- .../mage/cards/n/NivMizzetDracogenius.java | 2 +- .../mage/cards/n/NivMizzetTheFiremind.java | 2 +- Mage.Sets/src/mage/cards/o/OgreShaman.java | 2 +- .../src/mage/cards/o/OmnathLocusOfRage.java | 2 +- Mage.Sets/src/mage/cards/o/OpenFire.java | 2 +- .../src/mage/cards/o/OrcishArtillery.java | 2 +- .../src/mage/cards/o/OrcishBloodpainter.java | 2 +- .../src/mage/cards/o/OrcishCannonade.java | 2 +- .../src/mage/cards/o/OrcishCannoneers.java | 2 +- .../src/mage/cards/o/OrcishMechanics.java | 2 +- .../src/mage/cards/o/OrdealOfPurphoros.java | 2 +- .../src/mage/cards/o/OrimSamiteHealer.java | 2 +- Mage.Sets/src/mage/cards/o/OrimsCure.java | 2 +- Mage.Sets/src/mage/cards/o/OrimsTouch.java | 2 +- Mage.Sets/src/mage/cards/o/OutpostSiege.java | 4 ++-- Mage.Sets/src/mage/cards/p/Panacea.java | 2 +- Mage.Sets/src/mage/cards/p/Pandemonium.java | 4 ++-- Mage.Sets/src/mage/cards/p/Parch.java | 2 +- .../src/mage/cards/p/PardicArsonist.java | 4 ++-- Mage.Sets/src/mage/cards/p/PearlShard.java | 2 +- Mage.Sets/src/mage/cards/p/PerilousMyr.java | 2 +- .../src/mage/cards/p/PiaAndKiranNalaar.java | 2 +- Mage.Sets/src/mage/cards/p/PillarOfFlame.java | 2 +- Mage.Sets/src/mage/cards/p/PirateShip.java | 2 +- .../src/mage/cards/p/PitchburnDevils.java | 2 +- Mage.Sets/src/mage/cards/p/PowerOfFire.java | 4 ++-- .../src/mage/cards/p/PreyseizerDragon.java | 2 +- .../src/mage/cards/p/ProdigalSorcerer.java | 2 +- .../src/mage/cards/p/ProfanePrayers.java | 2 +- Mage.Sets/src/mage/cards/p/PropheticBolt.java | 2 +- Mage.Sets/src/mage/cards/p/PsionicBlast.java | 2 +- Mage.Sets/src/mage/cards/p/PsionicEntity.java | 2 +- Mage.Sets/src/mage/cards/p/PsionicGift.java | 2 +- Mage.Sets/src/mage/cards/p/PsionicSliver.java | 6 +++--- Mage.Sets/src/mage/cards/p/PsychicPurge.java | 2 +- Mage.Sets/src/mage/cards/p/PunishingFire.java | 2 +- Mage.Sets/src/mage/cards/p/PyreZombie.java | 2 +- .../src/mage/cards/p/Pyroconvergence.java | 2 +- .../src/mage/cards/p/PyromancersAssault.java | 4 ++-- Mage.Sets/src/mage/cards/p/Pyromancy.java | 2 +- Mage.Sets/src/mage/cards/p/Pyromania.java | 4 ++-- Mage.Sets/src/mage/cards/p/Pyromatics.java | 2 +- .../src/mage/cards/q/QuicksmithRebel.java | 4 ++-- Mage.Sets/src/mage/cards/r/RageExtractor.java | 2 +- .../src/mage/cards/r/RagingRegisaur.java | 2 +- Mage.Sets/src/mage/cards/r/Rakalite.java | 2 +- Mage.Sets/src/mage/cards/r/RalZarek.java | 2 +- Mage.Sets/src/mage/cards/r/RathsEdge.java | 2 +- .../src/mage/cards/r/RazorBoomerang.java | 4 ++-- .../src/mage/cards/r/RealityHemorrhage.java | 2 +- .../src/mage/cards/r/RecklessAbandon.java | 2 +- .../src/mage/cards/r/RecklessAssault.java | 2 +- .../src/mage/cards/r/RecklessEmbermage.java | 2 +- Mage.Sets/src/mage/cards/r/RedSunsZenith.java | 2 +- .../src/mage/cards/r/RefractionTrap.java | 4 ++-- .../src/mage/cards/r/RekindledFlame.java | 2 +- .../src/mage/cards/r/ReleaseTheAnts.java | 2 +- .../src/mage/cards/r/RepeatingBarrage.java | 2 +- .../src/mage/cards/r/ResoundingThunder.java | 4 ++-- .../src/mage/cards/r/RevekaWizardSavant.java | 2 +- .../src/mage/cards/r/RhysticLightning.java | 4 ++-- .../src/mage/cards/r/RiddleOfLightning.java | 2 +- Mage.Sets/src/mage/cards/r/RiftBolt.java | 2 +- .../src/mage/cards/r/RoarOfTheCrowd.java | 4 ++-- .../src/mage/cards/r/RocketLauncher.java | 2 +- .../src/mage/cards/r/RumblingAftershocks.java | 4 ++-- Mage.Sets/src/mage/cards/s/SamiteArcher.java | 4 ++-- .../src/mage/cards/s/SanctumCustodian.java | 2 +- .../src/mage/cards/s/SanctumGuardian.java | 2 +- Mage.Sets/src/mage/cards/s/SarkhansRage.java | 2 +- Mage.Sets/src/mage/cards/s/Scaldkin.java | 2 +- Mage.Sets/src/mage/cards/s/ScorchingLava.java | 2 +- .../src/mage/cards/s/ScorchingSpear.java | 2 +- .../src/mage/cards/s/ScourgeOfValkas.java | 4 ++-- Mage.Sets/src/mage/cards/s/SealOfFire.java | 2 +- .../src/mage/cards/s/SearingMeditation.java | 2 +- Mage.Sets/src/mage/cards/s/SearingSpear.java | 2 +- Mage.Sets/src/mage/cards/s/SearingTouch.java | 2 +- Mage.Sets/src/mage/cards/s/SearingWind.java | 2 +- .../src/mage/cards/s/SeismicAssault.java | 2 +- Mage.Sets/src/mage/cards/s/SerraPaladin.java | 2 +- .../src/mage/cards/s/ShadowGuildmage.java | 2 +- Mage.Sets/src/mage/cards/s/ShardVolley.java | 2 +- .../src/mage/cards/s/ShieldmageAdvocate.java | 4 ++-- Mage.Sets/src/mage/cards/s/ShiningShoal.java | 4 ++-- Mage.Sets/src/mage/cards/s/ShivanFire.java | 2 +- Mage.Sets/src/mage/cards/s/ShockTroops.java | 2 +- Mage.Sets/src/mage/cards/s/SithMarauder.java | 4 ++-- .../src/mage/cards/s/SkarrganSkybreaker.java | 2 +- Mage.Sets/src/mage/cards/s/SkirkMarauder.java | 2 +- .../src/mage/cards/s/SkirsdagCultist.java | 2 +- Mage.Sets/src/mage/cards/s/SkullCatapult.java | 2 +- Mage.Sets/src/mage/cards/s/SolarBlast.java | 4 ++-- Mage.Sets/src/mage/cards/s/SonicBurst.java | 2 +- Mage.Sets/src/mage/cards/s/SonicSeizure.java | 2 +- Mage.Sets/src/mage/cards/s/SorinMarkov.java | 2 +- Mage.Sets/src/mage/cards/s/SoulBurn.java | 4 ++-- Mage.Sets/src/mage/cards/s/SoulSpike.java | 2 +- Mage.Sets/src/mage/cards/s/Soulblast.java | 4 ++-- Mage.Sets/src/mage/cards/s/SoulsFire.java | 4 ++-- Mage.Sets/src/mage/cards/s/SparkJolt.java | 2 +- Mage.Sets/src/mage/cards/s/SparkSpray.java | 2 +- .../src/mage/cards/s/SpawnOfThraxes.java | 2 +- .../src/mage/cards/s/SphinxBoneWand.java | 4 ++-- .../src/mage/cards/s/SpikeshotElder.java | 2 +- .../src/mage/cards/s/SpikeshotGoblin.java | 4 ++-- .../src/mage/cards/s/SpiralingEmbers.java | 4 ++-- Mage.Sets/src/mage/cards/s/SpireBarrage.java | 2 +- Mage.Sets/src/mage/cards/s/Spitemare.java | 4 ++-- .../src/mage/cards/s/SpitfireBastion.java | 2 +- Mage.Sets/src/mage/cards/s/SplitTailMiko.java | 2 +- Mage.Sets/src/mage/cards/s/StaffOfNin.java | 2 +- .../src/mage/cards/s/SteamcoreWeird.java | 4 ++-- .../src/mage/cards/s/StingingBarrier.java | 2 +- .../src/mage/cards/s/StokeTheFlames.java | 2 +- Mage.Sets/src/mage/cards/s/StompingSlabs.java | 4 ++-- .../mage/cards/s/StormFleetPyromancer.java | 4 ++-- Mage.Sets/src/mage/cards/s/Stormbind.java | 2 +- Mage.Sets/src/mage/cards/s/SuddenShock.java | 2 +- Mage.Sets/src/mage/cards/s/SunfireBalm.java | 4 ++-- .../src/mage/cards/s/SunflareShaman.java | 4 ++-- .../src/mage/cards/s/SuqAtaFirewalker.java | 2 +- Mage.Sets/src/mage/cards/s/SurgingFlame.java | 2 +- Mage.Sets/src/mage/cards/s/SwiftManeuver.java | 2 +- .../src/mage/cards/s/SwordOfFireAndIce.java | 4 ++-- .../src/mage/cards/s/SwordOfTheAges.java | 4 ++-- Mage.Sets/src/mage/cards/t/TalonOfPain.java | 2 +- Mage.Sets/src/mage/cards/t/TarPitcher.java | 2 +- Mage.Sets/src/mage/cards/t/Tarfire.java | 2 +- Mage.Sets/src/mage/cards/t/ThornThallid.java | 2 +- .../src/mage/cards/t/ThornbiteStaff.java | 4 ++-- .../src/mage/cards/t/ThorncasterSliver.java | 4 ++-- .../mage/cards/t/ThornscapeBattlemage.java | 4 ++-- .../src/mage/cards/t/ThornwindFaeries.java | 2 +- Mage.Sets/src/mage/cards/t/ThrowingKnife.java | 2 +- .../src/mage/cards/t/ThunderbladeCharge.java | 2 +- .../src/mage/cards/t/ThunderousWrath.java | 2 +- Mage.Sets/src/mage/cards/t/TickingGnomes.java | 2 +- .../src/mage/cards/t/TitanOfEternalFire.java | 4 ++-- Mage.Sets/src/mage/cards/t/TitansRevenge.java | 2 +- Mage.Sets/src/mage/cards/t/TorchSong.java | 2 +- Mage.Sets/src/mage/cards/t/TorrentOfFire.java | 4 ++-- .../src/mage/cards/t/TouchOfTheVoid.java | 2 +- .../src/mage/cards/t/TreefolkHealer.java | 2 +- Mage.Sets/src/mage/cards/t/TrialOfZeal.java | 2 +- Mage.Sets/src/mage/cards/t/TribalFlames.java | 2 +- Mage.Sets/src/mage/cards/t/Triskelavus.java | 2 +- Mage.Sets/src/mage/cards/t/Triskelion.java | 2 +- .../src/mage/cards/t/TroubledHealer.java | 2 +- Mage.Sets/src/mage/cards/t/TurnBurn.java | 4 ++-- .../src/mage/cards/t/TyrantOfValakut.java | 4 ++-- .../src/mage/cards/u/UginTheSpiritDragon.java | 2 +- Mage.Sets/src/mage/cards/u/UndyingFlames.java | 4 ++-- .../src/mage/cards/u/UnfriendlyFire.java | 2 +- .../src/mage/cards/u/UnyaroBeeSting.java | 2 +- Mage.Sets/src/mage/cards/u/UnyaroBees.java | 2 +- Mage.Sets/src/mage/cards/u/UrzasRage.java | 2 +- .../src/mage/cards/v/ValakutInvoker.java | 2 +- .../cards/v/ValakutTheMoltenPinnacle.java | 4 ++-- Mage.Sets/src/mage/cards/v/VampiricFeast.java | 4 ++-- .../src/mage/cards/v/VengefulRebirth.java | 4 ++-- .../src/mage/cards/v/ViashinoFangtail.java | 2 +- .../src/mage/cards/v/VigilanteJustice.java | 2 +- .../src/mage/cards/v/ViridianLongbow.java | 4 ++-- .../src/mage/cards/v/VithianStinger.java | 2 +- .../src/mage/cards/v/VolcanicGeyser.java | 2 +- .../src/mage/cards/v/VolcanicHammer.java | 2 +- .../src/mage/cards/v/VoraciousDragon.java | 2 +- .../src/mage/cards/v/VulshokSorcerer.java | 2 +- .../src/mage/cards/w/WalkingBallista.java | 2 +- Mage.Sets/src/mage/cards/w/WardOfPiety.java | 4 ++-- .../src/mage/cards/w/WarleadersHelix.java | 4 ++-- Mage.Sets/src/mage/cards/w/WarstormSurge.java | 6 +++--- .../src/mage/cards/w/WhereAncientsTread.java | 2 +- Mage.Sets/src/mage/cards/w/WildSlash.java | 2 +- Mage.Sets/src/mage/cards/w/Withstand.java | 2 +- .../src/mage/cards/w/WolfhuntersQuiver.java | 4 ++-- Mage.Sets/src/mage/cards/w/WordsOfWar.java | 4 ++-- Mage.Sets/src/mage/cards/w/WuLongbowman.java | 2 +- .../src/mage/cards/y/YamabushisFlame.java | 2 +- Mage.Sets/src/mage/cards/z/Zap.java | 2 +- .../src/mage/cards/z/ZhalfirinCrusader.java | 2 +- .../src/mage/cards/z/ZuranSpellcaster.java | 2 +- .../mage/game/permanent/token/DevilToken.java | 4 ++-- 475 files changed, 638 insertions(+), 643 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AcidicSliver.java b/Mage.Sets/src/mage/cards/a/AcidicSliver.java index c3a39a94a3..be2b1cd08a 100644 --- a/Mage.Sets/src/mage/cards/a/AcidicSliver.java +++ b/Mage.Sets/src/mage/cards/a/AcidicSliver.java @@ -58,14 +58,14 @@ public class AcidicSliver extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // All Slivers have "{2}, Sacrifice this permanent: This permanent deals 2 damage to target creature or player." + // All Slivers have "{2}, Sacrifice this permanent: This permanent deals 2 damage to any target." Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new SacrificeSourceCost()); ability.addCost(new GenericManaCost(2)); ability.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE_SLIVERS, - "All Slivers have \"{2}, Sacrifice this permanent: This permanent deals 2 damage to target creature or player.\""))); + "All Slivers have \"{2}, Sacrifice this permanent: This permanent deals 2 damage to any target.\""))); } public AcidicSliver(final AcidicSliver card) { diff --git a/Mage.Sets/src/mage/cards/a/AcolytesReward.java b/Mage.Sets/src/mage/cards/a/AcolytesReward.java index 06ae85b620..74f96abad3 100644 --- a/Mage.Sets/src/mage/cards/a/AcolytesReward.java +++ b/Mage.Sets/src/mage/cards/a/AcolytesReward.java @@ -53,7 +53,7 @@ public class AcolytesReward extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{W}"); - // Prevent the next X damage that would be dealt to target creature this turn, where X is your devotion to white. If damage is prevented this way, Acolyte's Reward deals that much damage to target creature or player. + // Prevent the next X damage that would be dealt to target creature this turn, where X is your devotion to white. If damage is prevented this way, Acolyte's Reward deals that much damage to any target. this.getSpellAbility().addEffect(new AcolytesRewardEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addTarget(new TargetAnyTarget()); @@ -75,7 +75,7 @@ class AcolytesRewardEffect extends PreventionEffectImpl { public AcolytesRewardEffect() { super(Duration.EndOfTurn); - staticText = "Prevent the next X damage that would be dealt to target creature this turn, where X is your devotion to white. If damage is prevented this way, {this} deals that much damage to target creature or player"; + staticText = "Prevent the next X damage that would be dealt to target creature this turn, where X is your devotion to white. If damage is prevented this way, {this} deals that much damage to any target"; } public AcolytesRewardEffect(final AcolytesRewardEffect effect) { diff --git a/Mage.Sets/src/mage/cards/a/AcornCatapult.java b/Mage.Sets/src/mage/cards/a/AcornCatapult.java index 10b7998a20..fb2d3d3efc 100644 --- a/Mage.Sets/src/mage/cards/a/AcornCatapult.java +++ b/Mage.Sets/src/mage/cards/a/AcornCatapult.java @@ -54,7 +54,7 @@ public class AcornCatapult extends CardImpl { public AcornCatapult(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); - // {1}, {tap}: Acorn Catapult deals 1 damage to target creature or player. That creature's controller or that player creates a 1/1 green Squirrel creature token. + // {1}, {tap}: Acorn Catapult deals 1 damage to any target. That creature's controller or that player creates a 1/1 green Squirrel creature token. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}")); ability.addCost(new TapSourceCost()); ability.addEffect(new AcornCatapultEffect()); diff --git a/Mage.Sets/src/mage/cards/a/Aeolipile.java b/Mage.Sets/src/mage/cards/a/Aeolipile.java index 5586877804..d7b7c269d1 100644 --- a/Mage.Sets/src/mage/cards/a/Aeolipile.java +++ b/Mage.Sets/src/mage/cards/a/Aeolipile.java @@ -49,7 +49,7 @@ public class Aeolipile extends CardImpl { public Aeolipile(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); - // {1}, {tap}, Sacrifice Aeolipile: Aeolipile deals 2 damage to target creature or player. + // {1}, {tap}, Sacrifice Aeolipile: Aeolipile deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{1}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/a/AetherfluxReservoir.java b/Mage.Sets/src/mage/cards/a/AetherfluxReservoir.java index 2d2b2269c8..7fe71f66d9 100644 --- a/Mage.Sets/src/mage/cards/a/AetherfluxReservoir.java +++ b/Mage.Sets/src/mage/cards/a/AetherfluxReservoir.java @@ -56,7 +56,7 @@ public class AetherfluxReservoir extends CardImpl { // Whenever you cast a spell, you gain 1 life for each spell you've cast this turn. this.addAbility(new SpellCastControllerTriggeredAbility(new GainLifeEffect(new AetherfluxReservoirDynamicValue()), false)); - // Pay 50 life: Aetherflux Reservoir deals 50 damage to target creature or player. + // Pay 50 life: Aetherflux Reservoir deals 50 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(50), new PayLifeCost(50)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AirdropCondor.java b/Mage.Sets/src/mage/cards/a/AirdropCondor.java index d8fca9e800..364baf2004 100644 --- a/Mage.Sets/src/mage/cards/a/AirdropCondor.java +++ b/Mage.Sets/src/mage/cards/a/AirdropCondor.java @@ -67,7 +67,7 @@ public class AirdropCondor extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // {1}{R}, Sacrifice a Goblin creature: Airdrop Condor deals damage equal to the sacrificed creature's power to target creature or player. + // {1}{R}, Sacrifice a Goblin creature: Airdrop Condor deals damage equal to the sacrificed creature's power to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new SacrificeCostCreaturesPower()), new ManaCostsImpl("{1}{R}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(filter))); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/a/AjaniVengeant.java b/Mage.Sets/src/mage/cards/a/AjaniVengeant.java index 8f0bca4b1b..4bf61182c4 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniVengeant.java +++ b/Mage.Sets/src/mage/cards/a/AjaniVengeant.java @@ -70,7 +70,7 @@ public class AjaniVengeant extends CardImpl { ability1.addTarget(new TargetPermanent()); this.addAbility(ability1); - // −2: Ajani Vengeant deals 3 damage to target creature or player and you gain 3 life. + // −2: Ajani Vengeant deals 3 damage to any target and you gain 3 life. Effects effects1 = new Effects(); effects1.add(new DamageTargetEffect(3)); effects1.add(new GainLifeEffect(3)); diff --git a/Mage.Sets/src/mage/cards/a/AkoumHellkite.java b/Mage.Sets/src/mage/cards/a/AkoumHellkite.java index 4a75696f44..04ac8ad3a3 100644 --- a/Mage.Sets/src/mage/cards/a/AkoumHellkite.java +++ b/Mage.Sets/src/mage/cards/a/AkoumHellkite.java @@ -63,7 +63,7 @@ public class AkoumHellkite extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // Landfall-Whenever a land enters the battlefield under you control, Akoum Hellkite deals 1 damage to target creature or player. + // Landfall-Whenever a land enters the battlefield under you control, Akoum Hellkite deals 1 damage to any target. // If that land is a Mountain, Akoum Hellkite deals 2 damage to that creature or player instead. Ability ability = new AkoumHellkiteTriggeredAbility(); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/a/AlabasterPotion.java b/Mage.Sets/src/mage/cards/a/AlabasterPotion.java index 2fa5a72939..36fdbf72b3 100644 --- a/Mage.Sets/src/mage/cards/a/AlabasterPotion.java +++ b/Mage.Sets/src/mage/cards/a/AlabasterPotion.java @@ -48,7 +48,7 @@ public class AlabasterPotion extends CardImpl { public AlabasterPotion(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{X}{W}{W}"); - // Choose one - Target player gains X life; or prevent the next X damage that would be dealt to target creature or player this turn. + // Choose one - Target player gains X life; or prevent the next X damage that would be dealt to any target this turn. this.getSpellAbility().addEffect(new GainLifeTargetEffect(new ManacostVariableValue())); this.getSpellAbility().addTarget(new TargetPlayer()); Mode mode = new Mode(); diff --git a/Mage.Sets/src/mage/cards/a/AlabasterWall.java b/Mage.Sets/src/mage/cards/a/AlabasterWall.java index 9eff4d2ff8..d23ce849f6 100644 --- a/Mage.Sets/src/mage/cards/a/AlabasterWall.java +++ b/Mage.Sets/src/mage/cards/a/AlabasterWall.java @@ -56,7 +56,7 @@ public class AlabasterWall extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); - // {tap}: Prevent the next 1 damage that would be dealt to target creature or player this turn. + // {tap}: Prevent the next 1 damage that would be dealt to any target this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AladdinsRing.java b/Mage.Sets/src/mage/cards/a/AladdinsRing.java index 925f341920..f50c083cbf 100644 --- a/Mage.Sets/src/mage/cards/a/AladdinsRing.java +++ b/Mage.Sets/src/mage/cards/a/AladdinsRing.java @@ -48,7 +48,7 @@ public class AladdinsRing extends CardImpl { public AladdinsRing(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{8}"); - // {8}, {tap}: Aladdin's Ring deals 4 damage to target creature or player. + // {8}, {tap}: Aladdin's Ring deals 4 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4), new ManaCostsImpl("{8}")); ability.addTarget(new TargetAnyTarget()); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/a/AmuletOfKroog.java b/Mage.Sets/src/mage/cards/a/AmuletOfKroog.java index c35e7eb1db..fbe7b6b4d4 100644 --- a/Mage.Sets/src/mage/cards/a/AmuletOfKroog.java +++ b/Mage.Sets/src/mage/cards/a/AmuletOfKroog.java @@ -49,7 +49,7 @@ public class AmuletOfKroog extends CardImpl { public AmuletOfKroog(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); - // {2}, {tap}: Prevent the next 1 damage that would be dealt to target creature or player this turn. + // {2}, {tap}: Prevent the next 1 damage that would be dealt to any target this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/a/AnabaShaman.java b/Mage.Sets/src/mage/cards/a/AnabaShaman.java index 1145978867..c7423ba1d4 100644 --- a/Mage.Sets/src/mage/cards/a/AnabaShaman.java +++ b/Mage.Sets/src/mage/cards/a/AnabaShaman.java @@ -55,7 +55,7 @@ public class AnabaShaman extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // {R}, {tap}: Anaba Shaman deals 1 damage to target creature or player. + // {R}, {tap}: Anaba Shaman deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/a/AncientHydra.java b/Mage.Sets/src/mage/cards/a/AncientHydra.java index 7c760bd74a..9268475e05 100644 --- a/Mage.Sets/src/mage/cards/a/AncientHydra.java +++ b/Mage.Sets/src/mage/cards/a/AncientHydra.java @@ -57,7 +57,7 @@ public class AncientHydra extends CardImpl { // Fading 5 this.addAbility(new FadingAbility(5, this)); - // {1}, Remove a fade counter from Ancient Hydra: Ancient Hydra deals 1 damage to target creature or player. + // {1}, Remove a fade counter from Ancient Hydra: Ancient Hydra deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}")); ability.addCost(new RemoveCountersSourceCost(CounterType.FADE.createInstance(1))); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/a/AnnihilatingFire.java b/Mage.Sets/src/mage/cards/a/AnnihilatingFire.java index 9fa26c8665..9af1d8e8f9 100644 --- a/Mage.Sets/src/mage/cards/a/AnnihilatingFire.java +++ b/Mage.Sets/src/mage/cards/a/AnnihilatingFire.java @@ -48,7 +48,7 @@ public class AnnihilatingFire extends CardImpl { public AnnihilatingFire(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{R}{R}"); - // Annihilating Fire deals 3 damage to target creature or player. + // Annihilating Fire deals 3 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/a/ApocalypseHydra.java b/Mage.Sets/src/mage/cards/a/ApocalypseHydra.java index b1b0f5bbda..60b87e04ef 100644 --- a/Mage.Sets/src/mage/cards/a/ApocalypseHydra.java +++ b/Mage.Sets/src/mage/cards/a/ApocalypseHydra.java @@ -65,7 +65,7 @@ public class ApocalypseHydra extends CardImpl { // Apocalypse Hydra enters the battlefield with X +1/+1 counters on it. If X is 5 or more, it enters the battlefield with an additional X +1/+1 counters on it. this.addAbility(new EntersBattlefieldAbility(new ApocalypseHydraEffect())); - // {1}{R}, Remove a +1/+1 counter from Apocalypse Hydra: Apocalypse Hydra deals 1 damage to target creature or player. + // {1}{R}, Remove a +1/+1 counter from Apocalypse Hydra: Apocalypse Hydra deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}{R}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/a/ApprenticeSorcerer.java b/Mage.Sets/src/mage/cards/a/ApprenticeSorcerer.java index 3a89715bd0..fe71009991 100644 --- a/Mage.Sets/src/mage/cards/a/ApprenticeSorcerer.java +++ b/Mage.Sets/src/mage/cards/a/ApprenticeSorcerer.java @@ -54,7 +54,7 @@ public class ApprenticeSorcerer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // {tap}: Apprentice Sorcerer deals 1 damage to target creature or player. Activate this ability only during your turn, before attackers are declared. + // {tap}: Apprentice Sorcerer deals 1 damage to any target. Activate this ability only during your turn, before attackers are declared. Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost(), MyTurnBeforeAttackersDeclaredCondition.instance); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/a/ArcBlade.java b/Mage.Sets/src/mage/cards/a/ArcBlade.java index 4dfd8ac9b7..b800c6330c 100644 --- a/Mage.Sets/src/mage/cards/a/ArcBlade.java +++ b/Mage.Sets/src/mage/cards/a/ArcBlade.java @@ -50,7 +50,7 @@ public class ArcBlade extends CardImpl { public ArcBlade(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{R}{R}"); - // Arc Blade deals 2 damage to target creature or player. + // Arc Blade deals 2 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); // Exile Arc Blade this.getSpellAbility().addEffect(ExileSpellEffect.getInstance()); diff --git a/Mage.Sets/src/mage/cards/a/ArcSlogger.java b/Mage.Sets/src/mage/cards/a/ArcSlogger.java index c6baf8aebb..2525d35386 100644 --- a/Mage.Sets/src/mage/cards/a/ArcSlogger.java +++ b/Mage.Sets/src/mage/cards/a/ArcSlogger.java @@ -54,7 +54,7 @@ public class ArcSlogger extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(5); - // {R}, Exile the top ten cards of your library: Arc-Slogger deals 2 damage to target creature or player. + // {R}, Exile the top ten cards of your library: Arc-Slogger deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{R}")); ability.addCost(new ExileFromTopOfLibraryCost(10)); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/a/ArcTrail.java b/Mage.Sets/src/mage/cards/a/ArcTrail.java index 9706bd2bbd..eaeec496df 100644 --- a/Mage.Sets/src/mage/cards/a/ArcTrail.java +++ b/Mage.Sets/src/mage/cards/a/ArcTrail.java @@ -53,7 +53,7 @@ public class ArcTrail extends CardImpl { public ArcTrail(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{R}"); - // Arc Trail deals 2 damage to target creature or player and 1 damage to another target creature or player + // Arc Trail deals 2 damage to any target and 1 damage to another any target FilterCreaturePlayerOrPlaneswalker filter1 = new FilterCreaturePlayerOrPlaneswalker("creature, player or planeswalker to deal 2 damage"); TargetAnyTarget target1 = new TargetAnyTarget(1, 1, filter1); target1.setTargetTag(1); diff --git a/Mage.Sets/src/mage/cards/a/ArlinnEmbracedByTheMoon.java b/Mage.Sets/src/mage/cards/a/ArlinnEmbracedByTheMoon.java index 70f9836e0c..b101d4c664 100644 --- a/Mage.Sets/src/mage/cards/a/ArlinnEmbracedByTheMoon.java +++ b/Mage.Sets/src/mage/cards/a/ArlinnEmbracedByTheMoon.java @@ -72,14 +72,14 @@ public class ArlinnEmbracedByTheMoon extends CardImpl { ability.addEffect(effect); this.addAbility(ability); - // -1: Arlinn, Embraced by the Moon deals 3 damage to target creature or player. Transform Arlinn, Embraced by the Moon. + // -1: Arlinn, Embraced by the Moon deals 3 damage to any target. Transform Arlinn, Embraced by the Moon. this.addAbility(new TransformAbility()); ability = new LoyaltyAbility(new DamageTargetEffect(3), -1); ability.addTarget(new TargetAnyTarget()); ability.addEffect(new TransformSourceEffect(false)); this.addAbility(ability); - // -6: You get an emblem with "Creatures you control have haste and '{T}: This creature deals damage equal to its power to target creature or player.'" + // -6: You get an emblem with "Creatures you control have haste and '{T}: This creature deals damage equal to its power to any target.'" this.addAbility(new LoyaltyAbility(new GetEmblemEffect(new ArlinnEmbracedByTheMoonEmblem()), -6)); } diff --git a/Mage.Sets/src/mage/cards/a/ArrowStorm.java b/Mage.Sets/src/mage/cards/a/ArrowStorm.java index 50f2ae73a5..efb4e5ae1d 100644 --- a/Mage.Sets/src/mage/cards/a/ArrowStorm.java +++ b/Mage.Sets/src/mage/cards/a/ArrowStorm.java @@ -47,7 +47,7 @@ public class ArrowStorm extends CardImpl { public ArrowStorm(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{R}{R}"); - // Arrow Storm deals 4 damage to target creature or player. + // Arrow Storm deals 4 damage to any target. this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new DamageTargetEffect(4), new InvertCondition(RaidCondition.instance), diff --git a/Mage.Sets/src/mage/cards/a/AssaultBattery.java b/Mage.Sets/src/mage/cards/a/AssaultBattery.java index 06c2e5da4e..9a9805751e 100644 --- a/Mage.Sets/src/mage/cards/a/AssaultBattery.java +++ b/Mage.Sets/src/mage/cards/a/AssaultBattery.java @@ -44,9 +44,9 @@ public class AssaultBattery extends SplitCard { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{R}", "{3}{G}", SpellAbilityType.SPLIT); // Assault - // Assault deals 2 damage to target creature or player. + // Assault deals 2 damage to any target. Effect effect = new DamageTargetEffect(2); - effect.setText("Assault deals 2 damage to target creature or player"); + effect.setText("Assault deals 2 damage to any target"); getLeftHalfCard().getSpellAbility().addEffect(effect); getLeftHalfCard().getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/a/AtarkaEfreet.java b/Mage.Sets/src/mage/cards/a/AtarkaEfreet.java index f1372af8bb..bbd54f6f15 100644 --- a/Mage.Sets/src/mage/cards/a/AtarkaEfreet.java +++ b/Mage.Sets/src/mage/cards/a/AtarkaEfreet.java @@ -57,9 +57,9 @@ public class AtarkaEfreet extends CardImpl { // Megamorph {2}{R} this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{R}"), true)); - // When Atarka Efreet is turned face up, it deals 1 damage to target creature or player. + // When Atarka Efreet is turned face up, it deals 1 damage to any target. Effect effect = new DamageTargetEffect(1, "it"); - effect.setText("it deals 1 damage to target creature or player"); + effect.setText("it deals 1 damage to any target"); Ability ability = new TurnedFaceUpSourceTriggeredAbility(effect, false, false); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AuroraEidolon.java b/Mage.Sets/src/mage/cards/a/AuroraEidolon.java index 76ab727210..d97af29631 100644 --- a/Mage.Sets/src/mage/cards/a/AuroraEidolon.java +++ b/Mage.Sets/src/mage/cards/a/AuroraEidolon.java @@ -64,7 +64,7 @@ public class AuroraEidolon extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // {W}, Sacrifice Aurora Eidolon: Prevent the next 3 damage that would be dealt to target creature or player this turn. + // {W}, Sacrifice Aurora Eidolon: Prevent the next 3 damage that would be dealt to any target this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 3), new ManaCostsImpl("{W}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/a/AvenRedeemer.java b/Mage.Sets/src/mage/cards/a/AvenRedeemer.java index 3b8d93a6f8..a21f18c4bb 100644 --- a/Mage.Sets/src/mage/cards/a/AvenRedeemer.java +++ b/Mage.Sets/src/mage/cards/a/AvenRedeemer.java @@ -58,7 +58,7 @@ public class AvenRedeemer extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // {tap}: Prevent the next 2 damage that would be dealt to target creature or player this turn. + // {tap}: Prevent the next 2 damage that would be dealt to any target this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BallistaCharger.java b/Mage.Sets/src/mage/cards/b/BallistaCharger.java index 7280429579..afa1fbecc3 100644 --- a/Mage.Sets/src/mage/cards/b/BallistaCharger.java +++ b/Mage.Sets/src/mage/cards/b/BallistaCharger.java @@ -52,7 +52,7 @@ public class BallistaCharger extends CardImpl { this.power = new MageInt(6); this.toughness = new MageInt(6); - // Whenever Ballista Charger attacks, it deals 1 damage to target creature or player. + // Whenever Ballista Charger attacks, it deals 1 damage to any target. Ability ability = new AttacksTriggeredAbility(new DamageTargetEffect(1, "it"), false); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BalmOfRestoration.java b/Mage.Sets/src/mage/cards/b/BalmOfRestoration.java index 1c1cf7e0ce..efc6acf597 100644 --- a/Mage.Sets/src/mage/cards/b/BalmOfRestoration.java +++ b/Mage.Sets/src/mage/cards/b/BalmOfRestoration.java @@ -57,7 +57,7 @@ public class BalmOfRestoration extends CardImpl { ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - // or prevent the next 2 damage that would be dealt to target creature or player this turn. + // or prevent the next 2 damage that would be dealt to any target this turn. Mode mode = new Mode(); mode.getEffects().add(new PreventDamageToTargetEffect(Duration.EndOfTurn, 2)); mode.getTargets().add(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/b/Banefire.java b/Mage.Sets/src/mage/cards/b/Banefire.java index c42f534134..ea5010d5a3 100644 --- a/Mage.Sets/src/mage/cards/b/Banefire.java +++ b/Mage.Sets/src/mage/cards/b/Banefire.java @@ -59,7 +59,7 @@ public class Banefire extends CardImpl { public Banefire(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{X}{R}"); - // Banefire deals X damage to target creature or player. + // Banefire deals X damage to any target. this.getSpellAbility().addEffect(new BaneFireEffect()); this.getSpellAbility().addTarget(new TargetAnyTarget()); // If X is 5 or more, Banefire can't be countered by spells or abilities and the damage can't be prevented. @@ -101,7 +101,7 @@ class BaneFireEffect extends OneShotEffect { public BaneFireEffect() { super(Outcome.Damage); - staticText = "{this} deals X damage to target creature or player"; + staticText = "{this} deals X damage to any target"; } public BaneFireEffect(final BaneFireEffect effect) { diff --git a/Mage.Sets/src/mage/cards/b/Banshee.java b/Mage.Sets/src/mage/cards/b/Banshee.java index c8d6771178..74e344b9a7 100644 --- a/Mage.Sets/src/mage/cards/b/Banshee.java +++ b/Mage.Sets/src/mage/cards/b/Banshee.java @@ -57,8 +57,8 @@ public class Banshee extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(1); - // {X}, {T}: Banshee deals half X damage, rounded down, to target creature or player, and half X damage, rounded up, to you. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new HalfValue(new ManacostVariableValue(), false)).setText("Banshee deals half X damage, rounded down, to target creature or player,"), new ManaCostsImpl("{X}")); + // {X}, {T}: Banshee deals half X damage, rounded down, to any target, and half X damage, rounded up, to you. + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new HalfValue(new ManacostVariableValue(), false)).setText("Banshee deals half X damage, rounded down, to any target,"), new ManaCostsImpl("{X}")); ability.addCost(new TapSourceCost()); ability.addEffect(new DamageControllerEffect(new HalfValue(new ManacostVariableValue(), true)).setText(" and half X damage, rounded up, to you")); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/b/BarbarianRing.java b/Mage.Sets/src/mage/cards/b/BarbarianRing.java index ba62c18011..9ff322633f 100644 --- a/Mage.Sets/src/mage/cards/b/BarbarianRing.java +++ b/Mage.Sets/src/mage/cards/b/BarbarianRing.java @@ -58,7 +58,7 @@ public class BarbarianRing extends CardImpl { redManaAbility.addEffect(new DamageControllerEffect(1)); this.addAbility(redManaAbility); - // Threshold - {R}, {T}, Sacrifice Barbarian Ring: Barbarian Ring deals 2 damage to target creature or player. Activate this ability only if seven or more cards are in your graveyard. + // Threshold - {R}, {T}, Sacrifice Barbarian Ring: Barbarian Ring deals 2 damage to any target. Activate this ability only if seven or more cards are in your graveyard. Ability thresholdAbility = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{R}"), diff --git a/Mage.Sets/src/mage/cards/b/BarbedField.java b/Mage.Sets/src/mage/cards/b/BarbedField.java index 8d0e2b00ef..4ecff46c74 100644 --- a/Mage.Sets/src/mage/cards/b/BarbedField.java +++ b/Mage.Sets/src/mage/cards/b/BarbedField.java @@ -60,11 +60,11 @@ public class BarbedField extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // Enchanted land has "{tap}: This land deals 1 damage to target creature or player." + // Enchanted land has "{tap}: This land deals 1 damage to any target." ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); - effect.setText("Enchanted land has \"{T}: This land deals 1 damage to target creature or player.\""); + effect.setText("Enchanted land has \"{T}: This land deals 1 damage to any target.\""); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } diff --git a/Mage.Sets/src/mage/cards/b/BarrageOfExpendables.java b/Mage.Sets/src/mage/cards/b/BarrageOfExpendables.java index c1fe6cd228..41f05f1cd6 100644 --- a/Mage.Sets/src/mage/cards/b/BarrageOfExpendables.java +++ b/Mage.Sets/src/mage/cards/b/BarrageOfExpendables.java @@ -50,7 +50,7 @@ public class BarrageOfExpendables extends CardImpl { public BarrageOfExpendables(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{R}"); - // {R}, Sacrifice a creature: Barrage of Expendables deals 1 damage to target creature or player. + // {R}, Sacrifice a creature: Barrage of Expendables deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{R}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/b/BarrageTyrant.java b/Mage.Sets/src/mage/cards/b/BarrageTyrant.java index 4b03bfd0cf..bb351b52f5 100644 --- a/Mage.Sets/src/mage/cards/b/BarrageTyrant.java +++ b/Mage.Sets/src/mage/cards/b/BarrageTyrant.java @@ -70,9 +70,9 @@ public class BarrageTyrant extends CardImpl { // Devoid this.addAbility(new DevoidAbility(this.color)); - // {2}{R}, Sacrifice another colorless creature: Barrage Tyrant deals damage equal to the sacrificed creature's power to target creature or player. + // {2}{R}, Sacrifice another colorless creature: Barrage Tyrant deals damage equal to the sacrificed creature's power to any target. Effect effect = new DamageTargetEffect(new SacrificeCostCreaturesPower()); - effect.setText("{this} deals damage equal to the sacrificed creature's power to target creature or player"); + effect.setText("{this} deals damage equal to the sacrificed creature's power to any target"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{2}{R}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(filter))); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/b/BarrentonMedic.java b/Mage.Sets/src/mage/cards/b/BarrentonMedic.java index cb7e7b9643..33a439557c 100644 --- a/Mage.Sets/src/mage/cards/b/BarrentonMedic.java +++ b/Mage.Sets/src/mage/cards/b/BarrentonMedic.java @@ -58,7 +58,7 @@ public class BarrentonMedic extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(4); - // {tap}: Prevent the next 1 damage that would be dealt to target creature or player this turn. + // {tap}: Prevent the next 1 damage that would be dealt to any target this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BeeSting.java b/Mage.Sets/src/mage/cards/b/BeeSting.java index 4dd9a4525b..b9bb37fd65 100644 --- a/Mage.Sets/src/mage/cards/b/BeeSting.java +++ b/Mage.Sets/src/mage/cards/b/BeeSting.java @@ -43,7 +43,7 @@ public class BeeSting extends CardImpl { public BeeSting(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{G}"); - // Bee Sting deals 2 damage to target creature or player. + // Bee Sting deals 2 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/b/BenevolentAncestor.java b/Mage.Sets/src/mage/cards/b/BenevolentAncestor.java index d6b067fc9c..6294f27535 100644 --- a/Mage.Sets/src/mage/cards/b/BenevolentAncestor.java +++ b/Mage.Sets/src/mage/cards/b/BenevolentAncestor.java @@ -55,7 +55,7 @@ public class BenevolentAncestor extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(4); this.addAbility(DefenderAbility.getInstance()); - // {tap}: Prevent the next 1 damage that would be dealt to target creature or player this turn. + // {tap}: Prevent the next 1 damage that would be dealt to any target this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BlastOfGenius.java b/Mage.Sets/src/mage/cards/b/BlastOfGenius.java index 47c859861e..3be7b1f6ff 100644 --- a/Mage.Sets/src/mage/cards/b/BlastOfGenius.java +++ b/Mage.Sets/src/mage/cards/b/BlastOfGenius.java @@ -50,7 +50,7 @@ public class BlastOfGenius extends CardImpl { public BlastOfGenius(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{4}{U}{R}"); - // Choose target creature or player. Draw three cards and discard a card. Blast of Genius deals damage equal to the converted mana cost of the discard card to that creature or player. + // Choose any target. Draw three cards and discard a card. Blast of Genius deals damage equal to the converted mana cost of the discard card to that creature or player. this.getSpellAbility().addEffect(new BlastOfGeniusEffect()); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/b/BlastingStation.java b/Mage.Sets/src/mage/cards/b/BlastingStation.java index 771f23d614..d99ff45889 100644 --- a/Mage.Sets/src/mage/cards/b/BlastingStation.java +++ b/Mage.Sets/src/mage/cards/b/BlastingStation.java @@ -53,7 +53,7 @@ public class BlastingStation extends CardImpl { public BlastingStation(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); - // {tap}, Sacrifice a creature: Blasting Station deals 1 damage to target creature or player. + // {tap}, Sacrifice a creature: Blasting Station deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/b/Blaze.java b/Mage.Sets/src/mage/cards/b/Blaze.java index e6068f99ab..a4430e9ea5 100644 --- a/Mage.Sets/src/mage/cards/b/Blaze.java +++ b/Mage.Sets/src/mage/cards/b/Blaze.java @@ -45,7 +45,7 @@ public class Blaze extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{X}{R}"); - // Blaze deals X damage to target creature or player. + // Blaze deals X damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/b/BlazingHellhound.java b/Mage.Sets/src/mage/cards/b/BlazingHellhound.java index 86395a779d..bd0ded2db5 100644 --- a/Mage.Sets/src/mage/cards/b/BlazingHellhound.java +++ b/Mage.Sets/src/mage/cards/b/BlazingHellhound.java @@ -55,7 +55,7 @@ public class BlazingHellhound extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(3); - // {1}, Sacrifice another creature: Blazing Hellhound deals 1 damage to target creature or player. + // {1}, Sacrifice another creature: Blazing Hellhound deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}")); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE))); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/b/BlazingTorch.java b/Mage.Sets/src/mage/cards/b/BlazingTorch.java index 43e39321d5..7377c4d82a 100644 --- a/Mage.Sets/src/mage/cards/b/BlazingTorch.java +++ b/Mage.Sets/src/mage/cards/b/BlazingTorch.java @@ -73,7 +73,7 @@ public class BlazingTorch extends CardImpl { new CantBeBlockedByCreaturesAttachedEffect(Duration.WhileOnBattlefield, filter, AttachmentType.EQUIPMENT))); - // Equipped creature has "{tap}, Sacrifice Blazing Torch: Blazing Torch deals 2 damage to target creature or player.") + // Equipped creature has "{tap}, Sacrifice Blazing Torch: Blazing Torch deals 2 damage to any target.") Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BlazingTorchDamageEffect(), new TapSourceCost()); ability.addCost(new BlazingTorchCost()); ability.addTarget(new TargetAnyTarget()); @@ -135,7 +135,7 @@ class BlazingTorchDamageEffect extends OneShotEffect { public BlazingTorchDamageEffect() { super(Outcome.Damage); - this.staticText = "Blazing Torch deals 2 damage to target creature or player"; + this.staticText = "Blazing Torch deals 2 damage to any target"; } public BlazingTorchDamageEffect(final BlazingTorchDamageEffect effect) { diff --git a/Mage.Sets/src/mage/cards/b/BlightedGorge.java b/Mage.Sets/src/mage/cards/b/BlightedGorge.java index b0e9f20d59..d749a3ec26 100644 --- a/Mage.Sets/src/mage/cards/b/BlightedGorge.java +++ b/Mage.Sets/src/mage/cards/b/BlightedGorge.java @@ -53,7 +53,7 @@ public class BlightedGorge extends CardImpl { // {T}: Add {C}. this.addAbility(new ColorlessManaAbility()); - // {4}{R}, {T}, Sacrifice Blighted Gorge: Blighted Gorge deals 2 damage to target creature or player. + // {4}{R}, {T}, Sacrifice Blighted Gorge: Blighted Gorge deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{4}{R}")); diff --git a/Mage.Sets/src/mage/cards/b/BloodhallPriest.java b/Mage.Sets/src/mage/cards/b/BloodhallPriest.java index b229ab8c91..3139813d16 100644 --- a/Mage.Sets/src/mage/cards/b/BloodhallPriest.java +++ b/Mage.Sets/src/mage/cards/b/BloodhallPriest.java @@ -54,13 +54,13 @@ public class BloodhallPriest extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); - // Whenever Bloodhall Priest enters the battlefield or attacks, if you have no cards in hand, Bloodhall Priest deals 2 damage to target creature or player. + // Whenever Bloodhall Priest enters the battlefield or attacks, if you have no cards in hand, Bloodhall Priest deals 2 damage to any target. TriggeredAbility triggeredAbility = new EntersBattlefieldOrAttacksSourceTriggeredAbility(new DamageTargetEffect(2)); triggeredAbility.addTarget(new TargetAnyTarget()); this.addAbility(new ConditionalTriggeredAbility( triggeredAbility, HellbentCondition.instance, - "Whenever {this} enters the battlefield or attacks, if you have no cards in hand, {this} deals 2 damage to target creature or player" + "Whenever {this} enters the battlefield or attacks, if you have no cards in hand, {this} deals 2 damage to any target" )); // Madness {1}{B}{R} diff --git a/Mage.Sets/src/mage/cards/b/BloodshotCyclops.java b/Mage.Sets/src/mage/cards/b/BloodshotCyclops.java index ef2748e3ae..46b51b5f1f 100644 --- a/Mage.Sets/src/mage/cards/b/BloodshotCyclops.java +++ b/Mage.Sets/src/mage/cards/b/BloodshotCyclops.java @@ -57,7 +57,7 @@ public class BloodshotCyclops extends CardImpl { this.toughness = new MageInt(4); // {T}, Sacrifice a creature: Bloodshot Cyclops deals damage equal to the sacrificed - // creature's power to target creature or player. + // creature's power to any target. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new SacrificeCostCreaturesPower()), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/b/BomberCorps.java b/Mage.Sets/src/mage/cards/b/BomberCorps.java index d6e034e4b0..ae22396a38 100644 --- a/Mage.Sets/src/mage/cards/b/BomberCorps.java +++ b/Mage.Sets/src/mage/cards/b/BomberCorps.java @@ -51,7 +51,7 @@ public class BomberCorps extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - // Battalion - Whenever Bomber Corps and at least two other creatures attack, Bomber Corps deals 1 damage to target creature or player. + // Battalion - Whenever Bomber Corps and at least two other creatures attack, Bomber Corps deals 1 damage to any target. Ability ability = new BattalionAbility(new DamageTargetEffect(1)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BonethornValesk.java b/Mage.Sets/src/mage/cards/b/BonethornValesk.java index eb29403c2a..ec3bf003a9 100644 --- a/Mage.Sets/src/mage/cards/b/BonethornValesk.java +++ b/Mage.Sets/src/mage/cards/b/BonethornValesk.java @@ -52,7 +52,7 @@ public class BonethornValesk extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(2); - // Whenever a permanent is turned face up, Bonethorn Valesk deals 1 damage to target creature or player. + // Whenever a permanent is turned face up, Bonethorn Valesk deals 1 damage to any target. Ability ability = new TurnedFaceUpAllTriggeredAbility(new DamageTargetEffect(1), new FilterPermanent("a permanent")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BorborygmosEnraged.java b/Mage.Sets/src/mage/cards/b/BorborygmosEnraged.java index 38bc6e6261..3e0d90897f 100644 --- a/Mage.Sets/src/mage/cards/b/BorborygmosEnraged.java +++ b/Mage.Sets/src/mage/cards/b/BorborygmosEnraged.java @@ -67,7 +67,7 @@ public class BorborygmosEnraged extends CardImpl { //Whenever Borborygmous Enraged deals combat damage to a player, reveal the top three cards of your library. Put all land cards revealed this way into your hand and the rest into your graveyard. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new RevealLibraryPutIntoHandEffect(3, new FilterLandCard(), Zone.GRAVEYARD), false, false)); - //Discard a land card: Borborygmos Enraged deals 3 damage to target creature or player + //Discard a land card: Borborygmos Enraged deals 3 damage to any target Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new DiscardTargetCost(new TargetCardInHand(new FilterLandCard()))); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BorosReckoner.java b/Mage.Sets/src/mage/cards/b/BorosReckoner.java index 56ebfa2b52..01e9bb8aeb 100644 --- a/Mage.Sets/src/mage/cards/b/BorosReckoner.java +++ b/Mage.Sets/src/mage/cards/b/BorosReckoner.java @@ -57,7 +57,7 @@ public class BorosReckoner extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - // Whenever Boros Reckoner is dealt damage, it deals that much damage to target creature or player. + // Whenever Boros Reckoner is dealt damage, it deals that much damage to any target. Ability ability = new DealtDamageToSourceTriggeredAbility(Zone.BATTLEFIELD, new BorosReckonerDealDamageEffect(), false, false, true); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); @@ -81,7 +81,7 @@ class BorosReckonerDealDamageEffect extends OneShotEffect { public BorosReckonerDealDamageEffect() { super(Outcome.Damage); - this.staticText = "it deals that much damage to target creature or player"; + this.staticText = "it deals that much damage to any target"; } public BorosReckonerDealDamageEffect(final BorosReckonerDealDamageEffect effect) { diff --git a/Mage.Sets/src/mage/cards/b/BoshIronGolem.java b/Mage.Sets/src/mage/cards/b/BoshIronGolem.java index 44ae2af7ad..484ed6270c 100644 --- a/Mage.Sets/src/mage/cards/b/BoshIronGolem.java +++ b/Mage.Sets/src/mage/cards/b/BoshIronGolem.java @@ -64,9 +64,9 @@ public class BoshIronGolem extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); - // {3}{R}, Sacrifice an artifact: Bosh, Iron Golem deals damage equal to the sacrificed artifact's converted mana cost to target creature or player. + // {3}{R}, Sacrifice an artifact: Bosh, Iron Golem deals damage equal to the sacrificed artifact's converted mana cost to any target. Effect effect = new DamageTargetEffect(new SacrificeCostConvertedMana("artifact")); - effect.setText("{this} deals damage equal to the sacrificed artifact's converted mana cost to target creature or player"); + effect.setText("{this} deals damage equal to the sacrificed artifact's converted mana cost to any target"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{3}{R}")); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(new FilterControlledArtifactPermanent("an artifact")))); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/b/BrimstoneVolley.java b/Mage.Sets/src/mage/cards/b/BrimstoneVolley.java index 7fc4db957b..4bd38fdb02 100644 --- a/Mage.Sets/src/mage/cards/b/BrimstoneVolley.java +++ b/Mage.Sets/src/mage/cards/b/BrimstoneVolley.java @@ -49,7 +49,7 @@ public class BrimstoneVolley extends CardImpl { public BrimstoneVolley(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{R}"); - // Brimstone Volley deals 3 damage to target creature or player. + // Brimstone Volley deals 3 damage to any target. // Morbid - Brimstone Volley deals 5 damage to that creature or player instead if a creature died this turn. this.getSpellAbility().addEffect(new BrimstoneVolleyEffect()); this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/b/BrothersOfFire.java b/Mage.Sets/src/mage/cards/b/BrothersOfFire.java index a50d64c641..4bc9fd6223 100644 --- a/Mage.Sets/src/mage/cards/b/BrothersOfFire.java +++ b/Mage.Sets/src/mage/cards/b/BrothersOfFire.java @@ -54,7 +54,7 @@ public class BrothersOfFire extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // {1}{R}{R}: Brothers of Fire deals 1 damage to target creature or player and 1 damage to you. + // {1}{R}{R}: Brothers of Fire deals 1 damage to any target and 1 damage to you. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}{R}{R}")); Effect effect = new DamageControllerEffect(1); effect.setText("and 1 damage to you"); diff --git a/Mage.Sets/src/mage/cards/b/BurnAtTheStake.java b/Mage.Sets/src/mage/cards/b/BurnAtTheStake.java index fe5834091b..4cf29edf4d 100644 --- a/Mage.Sets/src/mage/cards/b/BurnAtTheStake.java +++ b/Mage.Sets/src/mage/cards/b/BurnAtTheStake.java @@ -62,7 +62,7 @@ public class BurnAtTheStake extends CardImpl { // As an additional cost to cast Burn at the Stake, tap any number of untapped creatures you control. this.getSpellAbility().addCost(new TapVariableTargetCost(filter, true, "any number of")); - // Burn at the Stake deals damage to target creature or player equal to three times the number of creatures tapped this way. + // Burn at the Stake deals damage to any target equal to three times the number of creatures tapped this way. this.getSpellAbility().addEffect(new BurnAtTheStakeEffect()); this.getSpellAbility().addTarget(new TargetAnyTarget()); } @@ -81,7 +81,7 @@ class BurnAtTheStakeEffect extends OneShotEffect { public BurnAtTheStakeEffect() { super(Outcome.Damage); - this.staticText = "{this} deals damage to target creature or player equal to three times the number of creatures tapped this way"; + this.staticText = "{this} deals damage to any target equal to three times the number of creatures tapped this way"; } public BurnAtTheStakeEffect(final BurnAtTheStakeEffect effect) { diff --git a/Mage.Sets/src/mage/cards/b/BurnFromWithin.java b/Mage.Sets/src/mage/cards/b/BurnFromWithin.java index 8a37148b03..df486c26b6 100644 --- a/Mage.Sets/src/mage/cards/b/BurnFromWithin.java +++ b/Mage.Sets/src/mage/cards/b/BurnFromWithin.java @@ -55,7 +55,7 @@ public class BurnFromWithin extends CardImpl { public BurnFromWithin(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{X}{R}"); - // Burn from Within deals X damage to target creature or player. If a creature is dealt damage this way, it loses indestructible until end of turn. + // Burn from Within deals X damage to any target. If a creature is dealt damage this way, it loses indestructible until end of turn. // If that creature would die this turn, exile it instead. this.getSpellAbility().addEffect(new BurnFromWithinEffect()); this.getSpellAbility().addTarget(new TargetAnyTarget()); @@ -76,7 +76,7 @@ class BurnFromWithinEffect extends OneShotEffect { public BurnFromWithinEffect() { super(Outcome.Benefit); - this.staticText = "{this} deals X damage to target creature or player. If a creature is dealt damage this way, it loses indestructible until end of turn. If that creature would die this turn, exile it instead"; + this.staticText = "{this} deals X damage to any target. If a creature is dealt damage this way, it loses indestructible until end of turn. If that creature would die this turn, exile it instead"; } public BurnFromWithinEffect(final BurnFromWithinEffect effect) { diff --git a/Mage.Sets/src/mage/cards/b/BurnTrail.java b/Mage.Sets/src/mage/cards/b/BurnTrail.java index 91abe11910..619fc8a848 100644 --- a/Mage.Sets/src/mage/cards/b/BurnTrail.java +++ b/Mage.Sets/src/mage/cards/b/BurnTrail.java @@ -44,7 +44,7 @@ public class BurnTrail extends CardImpl { public BurnTrail(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{R}"); - // Burn Trail deals 3 damage to target creature or player. + // Burn Trail deals 3 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/b/BurningAnger.java b/Mage.Sets/src/mage/cards/b/BurningAnger.java index c5ff6ab3b2..90961c8297 100644 --- a/Mage.Sets/src/mage/cards/b/BurningAnger.java +++ b/Mage.Sets/src/mage/cards/b/BurningAnger.java @@ -63,13 +63,13 @@ public class BurningAnger extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // Enchanted creature has "{T}: This creature deals damage equal to its power to target creature or player." + // Enchanted creature has "{T}: This creature deals damage equal to its power to any target." Effect effect = new DamageTargetEffect(new SourcePermanentPowerCount()); - effect.setText("{this} deals damage equal to its power to target creature or player"); + effect.setText("{this} deals damage equal to its power to any target"); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); gainedAbility.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, - "Enchanted creature has \"{T}: This creature deals damage equal to its power to target creature or player.\""))); + "Enchanted creature has \"{T}: This creature deals damage equal to its power to any target.\""))); } public BurningAnger(final BurningAnger card) { diff --git a/Mage.Sets/src/mage/cards/b/BurningEyeZubera.java b/Mage.Sets/src/mage/cards/b/BurningEyeZubera.java index ccc1536d7c..121496fd2c 100644 --- a/Mage.Sets/src/mage/cards/b/BurningEyeZubera.java +++ b/Mage.Sets/src/mage/cards/b/BurningEyeZubera.java @@ -56,9 +56,9 @@ public class BurningEyeZubera extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - // When Burning-Eye Zubera dies, if 4 or more damage was dealt to it this turn, Burning-Eye Zubera deals 3 damage to target creature or player. + // When Burning-Eye Zubera dies, if 4 or more damage was dealt to it this turn, Burning-Eye Zubera deals 3 damage to any target. Ability ability = new ConditionalTriggeredAbility(new DiesTriggeredAbility(new DamageTargetEffect(3)),new SourceGotFourDamage(), - "When {this} dies, if 4 or more damage was dealt to it this turn, Burning-Eye Zubera deals 3 damage to target creature or player"); + "When {this} dies, if 4 or more damage was dealt to it this turn, Burning-Eye Zubera deals 3 damage to any target"); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BurningVengeance.java b/Mage.Sets/src/mage/cards/b/BurningVengeance.java index f750d2d19f..6b45a94c32 100644 --- a/Mage.Sets/src/mage/cards/b/BurningVengeance.java +++ b/Mage.Sets/src/mage/cards/b/BurningVengeance.java @@ -48,7 +48,7 @@ public class BurningVengeance extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}"); - // Whenever you cast a spell from your graveyard, Burning Vengeance deals 2 damage to target creature or player. + // Whenever you cast a spell from your graveyard, Burning Vengeance deals 2 damage to any target. this.addAbility(new BurningVengeanceOnCastAbility()); } @@ -64,7 +64,7 @@ public class BurningVengeance extends CardImpl { class BurningVengeanceOnCastAbility extends TriggeredAbilityImpl { - private static final String abilityText = "Whenever you cast a spell from your graveyard, Burning Vengeance deals 2 damage to target creature or player"; + private static final String abilityText = "Whenever you cast a spell from your graveyard, Burning Vengeance deals 2 damage to any target"; BurningVengeanceOnCastAbility() { super(Zone.BATTLEFIELD, new DamageTargetEffect(2), false); diff --git a/Mage.Sets/src/mage/cards/b/BurstLightning.java b/Mage.Sets/src/mage/cards/b/BurstLightning.java index 2aa9011258..1a3ca50cc2 100644 --- a/Mage.Sets/src/mage/cards/b/BurstLightning.java +++ b/Mage.Sets/src/mage/cards/b/BurstLightning.java @@ -49,7 +49,7 @@ public class BurstLightning extends CardImpl { // Kicker {4} (You may pay an additional {4} as you cast this spell.) this.addAbility(new KickerAbility("{4}")); - // Burst Lightning deals 2 damage to target creature or player. If Burst Lightning was kicked, it deals 4 damage to that creature or player instead. + // Burst Lightning deals 2 damage to any target. If Burst Lightning was kicked, it deals 4 damage to that creature or player instead. this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new DamageTargetEffect(4), new DamageTargetEffect(2), KickedCondition.instance, "{this} deals 2 damage to any target. If {this} was kicked, it deals 4 damage to that permanent or player instead")); diff --git a/Mage.Sets/src/mage/cards/c/CacklingFlames.java b/Mage.Sets/src/mage/cards/c/CacklingFlames.java index 32f326cc2a..10a3f9e4fe 100644 --- a/Mage.Sets/src/mage/cards/c/CacklingFlames.java +++ b/Mage.Sets/src/mage/cards/c/CacklingFlames.java @@ -46,7 +46,7 @@ public class CacklingFlames extends CardImpl { public CacklingFlames(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{R}"); - // Cackling Flames deals 3 damage to target creature or player. + // Cackling Flames deals 3 damage to any target. this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new DamageTargetEffect(3), new InvertCondition(HellbentCondition.instance), diff --git a/Mage.Sets/src/mage/cards/c/CandlesGlow.java b/Mage.Sets/src/mage/cards/c/CandlesGlow.java index b53ab95334..5dd1a212fe 100644 --- a/Mage.Sets/src/mage/cards/c/CandlesGlow.java +++ b/Mage.Sets/src/mage/cards/c/CandlesGlow.java @@ -53,7 +53,7 @@ public class CandlesGlow extends CardImpl { this.subtype.add(SubType.ARCANE); - // Prevent the next 3 damage that would be dealt to target creature or player this turn. You gain life equal to the damage prevented this way. + // Prevent the next 3 damage that would be dealt to any target this turn. You gain life equal to the damage prevented this way. this.getSpellAbility().addEffect(new CandlesGlowPreventDamageTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetAnyTarget()); // Splice onto Arcane {1}{W} @@ -76,7 +76,7 @@ class CandlesGlowPreventDamageTargetEffect extends PreventionEffectImpl { public CandlesGlowPreventDamageTargetEffect(Duration duration) { super(duration); - staticText = "Prevent the next 3 damage that would be dealt to target creature or player this turn. You gain life equal to the damage prevented this way"; + staticText = "Prevent the next 3 damage that would be dealt to any target this turn. You gain life equal to the damage prevented this way"; } public CandlesGlowPreventDamageTargetEffect(final CandlesGlowPreventDamageTargetEffect effect) { diff --git a/Mage.Sets/src/mage/cards/c/CapriciousSorcerer.java b/Mage.Sets/src/mage/cards/c/CapriciousSorcerer.java index 70417b5768..a482bab3da 100644 --- a/Mage.Sets/src/mage/cards/c/CapriciousSorcerer.java +++ b/Mage.Sets/src/mage/cards/c/CapriciousSorcerer.java @@ -54,7 +54,7 @@ public class CapriciousSorcerer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // {tap}: Capricious Sorcerer deals 1 damage to target creature or player. Activate this ability only during your turn, before attackers are declared. + // {tap}: Capricious Sorcerer deals 1 damage to any target. Activate this ability only during your turn, before attackers are declared. Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost(), MyTurnBeforeAttackersDeclaredCondition.instance); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/c/Carbonize.java b/Mage.Sets/src/mage/cards/c/Carbonize.java index 38510179b3..fc5381ca80 100644 --- a/Mage.Sets/src/mage/cards/c/Carbonize.java +++ b/Mage.Sets/src/mage/cards/c/Carbonize.java @@ -47,7 +47,7 @@ public class Carbonize extends CardImpl { public Carbonize(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{R}"); - // Carbonize deals 3 damage to target creature or player. That creature can't be regenerated this turn. If the creature would die this turn, exile it instead. + // Carbonize deals 3 damage to any target. That creature can't be regenerated this turn. If the creature would die this turn, exile it instead. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addEffect(new CantRegenerateTargetEffect(Duration.EndOfTurn, "That creature")); this.getSpellAbility().addEffect(new ExileTargetIfDiesEffect().setText("If the creature would die this turn, exile it instead")); diff --git a/Mage.Sets/src/mage/cards/c/Caregiver.java b/Mage.Sets/src/mage/cards/c/Caregiver.java index cc64786179..b974fd7b4e 100644 --- a/Mage.Sets/src/mage/cards/c/Caregiver.java +++ b/Mage.Sets/src/mage/cards/c/Caregiver.java @@ -59,7 +59,7 @@ public class Caregiver extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // {W}, Sacrifice a creature: Prevent the next 1 damage that would be dealt to target creature or player this turn. + // {W}, Sacrifice a creature: Prevent the next 1 damage that would be dealt to any target this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/c/CauterySliver.java b/Mage.Sets/src/mage/cards/c/CauterySliver.java index 8f7b0733ec..9827edb286 100644 --- a/Mage.Sets/src/mage/cards/c/CauterySliver.java +++ b/Mage.Sets/src/mage/cards/c/CauterySliver.java @@ -62,13 +62,13 @@ public class CauterySliver extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // All Slivers have "{1}, Sacrifice this permanent: This permanent deals 1 damage to target creature or player." + // All Slivers have "{1}, Sacrifice this permanent: This permanent deals 1 damage to any target." Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("1")); ability1.addCost(new SacrificeSourceCost()); ability1.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ability1, Duration.WhileOnBattlefield, filter, - "All Slivers have \"{1}, Sacrifice this permanent: This permanent deals 1 damage to target creature or player.\""))); + "All Slivers have \"{1}, Sacrifice this permanent: This permanent deals 1 damage to any target.\""))); // All Slivers have "{1}, Sacrifice this permanent: Prevent the next 1 damage that would be dealt to target Sliver creature or player this turn." Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new ManaCostsImpl("1")); ability2.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/c/ChainLightning.java b/Mage.Sets/src/mage/cards/c/ChainLightning.java index c4577e54cf..0be470e6a0 100644 --- a/Mage.Sets/src/mage/cards/c/ChainLightning.java +++ b/Mage.Sets/src/mage/cards/c/ChainLightning.java @@ -51,7 +51,7 @@ public class ChainLightning extends CardImpl { public ChainLightning(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{R}"); - // Chain Lightning deals 3 damage to target creature or player. Then that player or that creature's controller may pay {R}{R}. If the player does, he or she may copy this spell and may choose a new target for that copy. + // Chain Lightning deals 3 damage to any target. Then that player or that creature's controller may pay {R}{R}. If the player does, he or she may copy this spell and may choose a new target for that copy. this.getSpellAbility().addEffect(new ChainLightningEffect()); this.getSpellAbility().addTarget(new TargetAnyTarget()); } @@ -70,7 +70,7 @@ class ChainLightningEffect extends OneShotEffect { ChainLightningEffect() { super(Outcome.Damage); - this.staticText = "Chain Lightning deals 3 damage to target creature or player. Then that player or that creature's controller may pay {R}{R}. If the player does, he or she may copy this spell and may choose a new target for that copy."; + this.staticText = "Chain Lightning deals 3 damage to any target. Then that player or that creature's controller may pay {R}{R}. If the player does, he or she may copy this spell and may choose a new target for that copy."; } ChainLightningEffect(final ChainLightningEffect effect) { diff --git a/Mage.Sets/src/mage/cards/c/ChainOfPlasma.java b/Mage.Sets/src/mage/cards/c/ChainOfPlasma.java index 6fd85961e0..984664125e 100644 --- a/Mage.Sets/src/mage/cards/c/ChainOfPlasma.java +++ b/Mage.Sets/src/mage/cards/c/ChainOfPlasma.java @@ -51,7 +51,7 @@ public class ChainOfPlasma extends CardImpl { public ChainOfPlasma(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{R}"); - // Chain of Plasma deals 3 damage to target creature or player. Then that player or that creature's controller may discard a card. If the player does, he or she may copy this spell and may choose a new target for that copy. + // Chain of Plasma deals 3 damage to any target. Then that player or that creature's controller may discard a card. If the player does, he or she may copy this spell and may choose a new target for that copy. this.getSpellAbility().addEffect(new ChainOfPlasmaEffect()); this.getSpellAbility().addTarget(new TargetAnyTarget()); } @@ -70,7 +70,7 @@ class ChainOfPlasmaEffect extends OneShotEffect { ChainOfPlasmaEffect() { super(Outcome.Damage); - this.staticText = "{this} deals 3 damage to target creature or player. Then that player or that creature's controller may discard a card. If the player does, he or she may copy this spell and may choose a new target for that copy."; + this.staticText = "{this} deals 3 damage to any target. Then that player or that creature's controller may discard a card. If the player does, he or she may copy this spell and may choose a new target for that copy."; } ChainOfPlasmaEffect(final ChainOfPlasmaEffect effect) { diff --git a/Mage.Sets/src/mage/cards/c/Chainflinger.java b/Mage.Sets/src/mage/cards/c/Chainflinger.java index ff625435c1..6c53686a34 100644 --- a/Mage.Sets/src/mage/cards/c/Chainflinger.java +++ b/Mage.Sets/src/mage/cards/c/Chainflinger.java @@ -57,12 +57,12 @@ public class Chainflinger extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // {1}{R}, {tap}: Chainflinger deals 1 damage to target creature or player. + // {1}{R}, {tap}: Chainflinger deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1),new ManaCostsImpl("{1}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); - // Threshold - {2}{R}, {tap}: Chainflinger deals 2 damage to target creature or player. Activate this ability only if seven or more cards are in your graveyard. + // Threshold - {2}{R}, {tap}: Chainflinger deals 2 damage to any target. Activate this ability only if seven or more cards are in your graveyard. Ability thresholdAbility = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{2}{R}"), diff --git a/Mage.Sets/src/mage/cards/c/ChandraAblaze.java b/Mage.Sets/src/mage/cards/c/ChandraAblaze.java index 77df2b2ad7..912937767a 100644 --- a/Mage.Sets/src/mage/cards/c/ChandraAblaze.java +++ b/Mage.Sets/src/mage/cards/c/ChandraAblaze.java @@ -68,7 +68,7 @@ public class ChandraAblaze extends CardImpl { this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(5)); - // +1: Discard a card. If a red card is discarded this way, Chandra Ablaze deals 4 damage to target creature or player. + // +1: Discard a card. If a red card is discarded this way, Chandra Ablaze deals 4 damage to any target. LoyaltyAbility ability = new LoyaltyAbility(new ChandraAblazeEffect1(), 1); ability.addEffect(new ChandraAblazeEffect2()); ability.addTarget(new TargetAnyTarget()); @@ -132,7 +132,7 @@ class ChandraAblazeEffect2 extends OneShotEffect { public ChandraAblazeEffect2() { super(Outcome.Damage); - this.staticText = "If a red card is discarded this way, {this} deals 4 damage to target creature or player"; + this.staticText = "If a red card is discarded this way, {this} deals 4 damage to any target"; } public ChandraAblazeEffect2(final ChandraAblazeEffect2 effect) { diff --git a/Mage.Sets/src/mage/cards/c/ChandraTheFirebrand.java b/Mage.Sets/src/mage/cards/c/ChandraTheFirebrand.java index 61e60e4be9..4648830aca 100644 --- a/Mage.Sets/src/mage/cards/c/ChandraTheFirebrand.java +++ b/Mage.Sets/src/mage/cards/c/ChandraTheFirebrand.java @@ -61,7 +61,7 @@ public class ChandraTheFirebrand extends CardImpl { this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(3)); - // +1: Chandra, the Firebrand deals 1 damage to target creature or player. + // +1: Chandra, the Firebrand deals 1 damage to any target. LoyaltyAbility ability1 = new LoyaltyAbility(new DamageTargetEffect(1), 1); ability1.addTarget(new TargetAnyTarget()); this.addAbility(ability1); diff --git a/Mage.Sets/src/mage/cards/c/ChandraTorchOfDefiance.java b/Mage.Sets/src/mage/cards/c/ChandraTorchOfDefiance.java index 2280704991..182452c4f3 100644 --- a/Mage.Sets/src/mage/cards/c/ChandraTorchOfDefiance.java +++ b/Mage.Sets/src/mage/cards/c/ChandraTorchOfDefiance.java @@ -78,7 +78,7 @@ public class ChandraTorchOfDefiance extends CardImpl { ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); - // -7: You get an emblem with "Whenever you cast a spell, this emblem deals 5 damage to target creature or player." + // -7: You get an emblem with "Whenever you cast a spell, this emblem deals 5 damage to any target." this.addAbility(new LoyaltyAbility(new GetEmblemEffect(new ChandraTorchOfDefianceEmblem()), -7)); } diff --git a/Mage.Sets/src/mage/cards/c/Char.java b/Mage.Sets/src/mage/cards/c/Char.java index 8e860d2487..b9defa2b2e 100644 --- a/Mage.Sets/src/mage/cards/c/Char.java +++ b/Mage.Sets/src/mage/cards/c/Char.java @@ -46,7 +46,7 @@ public class Char extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{R}"); - // Char deals 4 damage to target creature or player and 2 damage to you. + // Char deals 4 damage to any target and 2 damage to you. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); this.getSpellAbility().addTarget(new TargetAnyTarget()); Effect effect = new DamageControllerEffect(2); diff --git a/Mage.Sets/src/mage/cards/c/CinderElemental.java b/Mage.Sets/src/mage/cards/c/CinderElemental.java index 86fc7e0a39..e7836fce76 100644 --- a/Mage.Sets/src/mage/cards/c/CinderElemental.java +++ b/Mage.Sets/src/mage/cards/c/CinderElemental.java @@ -56,7 +56,7 @@ public class CinderElemental extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // {X}{R}, {tap}, Sacrifice Cinder Elemental: Cinder Elemental deals X damage to target creature or player. + // {X}{R}, {tap}, Sacrifice Cinder Elemental: Cinder Elemental deals X damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new ManacostVariableValue()), new ManaCostsImpl("{X}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/c/CinderStorm.java b/Mage.Sets/src/mage/cards/c/CinderStorm.java index 1c38b92e48..0926274e63 100644 --- a/Mage.Sets/src/mage/cards/c/CinderStorm.java +++ b/Mage.Sets/src/mage/cards/c/CinderStorm.java @@ -43,7 +43,7 @@ public class CinderStorm extends CardImpl { public CinderStorm(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{6}{R}"); - // Cinder Storm deals 7 damage to target creature or player. + // Cinder Storm deals 7 damage to any target. this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DamageTargetEffect(7)); } diff --git a/Mage.Sets/src/mage/cards/c/ClockworkHydra.java b/Mage.Sets/src/mage/cards/c/ClockworkHydra.java index ec2759845f..aea57305f8 100644 --- a/Mage.Sets/src/mage/cards/c/ClockworkHydra.java +++ b/Mage.Sets/src/mage/cards/c/ClockworkHydra.java @@ -66,7 +66,7 @@ public class ClockworkHydra extends CardImpl { // Clockwork Hydra enters the battlefield with four +1/+1 counters on it. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(4)), "with four +1/+1 counters on it")); - // Whenever Clockwork Hydra attacks or blocks, remove a +1/+1 counter from it. If you do, Clockwork Hydra deals 1 damage to target creature or player. + // Whenever Clockwork Hydra attacks or blocks, remove a +1/+1 counter from it. If you do, Clockwork Hydra deals 1 damage to any target. this.addAbility(new AttacksOrBlocksTriggeredAbility(new ClockworkHydraEffect(), false)); // {tap}: Put a +1/+1 counter on Clockwork Hydra. @@ -88,7 +88,7 @@ class ClockworkHydraEffect extends OneShotEffect { public ClockworkHydraEffect() { super(Outcome.Damage); - this.staticText = "remove a +1/+1 counter from it. If you do, {this} deals 1 damage to target creature or player"; + this.staticText = "remove a +1/+1 counter from it. If you do, {this} deals 1 damage to any target"; } public ClockworkHydraEffect(final ClockworkHydraEffect effect) { diff --git a/Mage.Sets/src/mage/cards/c/CloseQuarters.java b/Mage.Sets/src/mage/cards/c/CloseQuarters.java index f0b02bfede..717f352b81 100644 --- a/Mage.Sets/src/mage/cards/c/CloseQuarters.java +++ b/Mage.Sets/src/mage/cards/c/CloseQuarters.java @@ -54,7 +54,7 @@ public class CloseQuarters extends CardImpl { public CloseQuarters(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}{R}"); - // Whenever a creature you control becomes blocked, Close Quarters deals 1 damage to target creature or player. + // Whenever a creature you control becomes blocked, Close Quarters deals 1 damage to any target. Ability ability = new BecomesBlockedAllTriggeredAbility(new DamageTargetEffect(1), false, filter, false); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CollateralDamage.java b/Mage.Sets/src/mage/cards/c/CollateralDamage.java index dc05802b2b..0bc5e08af7 100644 --- a/Mage.Sets/src/mage/cards/c/CollateralDamage.java +++ b/Mage.Sets/src/mage/cards/c/CollateralDamage.java @@ -49,7 +49,7 @@ public class CollateralDamage extends CardImpl { // As an additional cost to cast Collateral Damge, sacrifice a creature. this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); - // Collateral Damage deals 3 damage to target creature or player. + // Collateral Damage deals 3 damage to any target. this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DamageTargetEffect(3)); } diff --git a/Mage.Sets/src/mage/cards/c/CombatMedic.java b/Mage.Sets/src/mage/cards/c/CombatMedic.java index c12988e4b0..d9c185ba13 100644 --- a/Mage.Sets/src/mage/cards/c/CombatMedic.java +++ b/Mage.Sets/src/mage/cards/c/CombatMedic.java @@ -55,7 +55,7 @@ public class CombatMedic extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(2); - // {1}{W}: Prevent the next 1 damage that would be dealt to target creature or player this turn. + // {1}{W}: Prevent the next 1 damage that would be dealt to any target this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new ManaCostsImpl("{1}{W}")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CometStorm.java b/Mage.Sets/src/mage/cards/c/CometStorm.java index 8cb6cdfdd6..63cd202799 100644 --- a/Mage.Sets/src/mage/cards/c/CometStorm.java +++ b/Mage.Sets/src/mage/cards/c/CometStorm.java @@ -49,12 +49,12 @@ import mage.target.common.TargetAnyTarget; public class CometStorm extends CardImpl { public CometStorm(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{X}{R}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{X}{R}{R}"); // Multikicker {1} this.addAbility(new MultikickerAbility("{1}")); - // Choose target creature or player, then choose another target creature or player for each time Comet Storm was kicked. Comet Storm deals X damage to each of them. + // Choose any target, then choose another any target for each time Comet Storm was kicked. Comet Storm deals X damage to each of them. this.getSpellAbility().addEffect(new CometStormEffect()); this.getSpellAbility().addTarget(new TargetAnyTarget(1)); } @@ -82,7 +82,7 @@ class CometStormEffect extends OneShotEffect { public CometStormEffect() { super(Outcome.Damage); - staticText = "Choose target creature or player, then choose another target creature or player for each time Comet Storm was kicked. Comet Storm deals X damage to each of them"; + staticText = "Choose any target, then choose another target for each time Comet Storm was kicked. Comet Storm deals X damage to each of them"; } public CometStormEffect(final CometStormEffect effect) { diff --git a/Mage.Sets/src/mage/cards/c/ConeOfFlame.java b/Mage.Sets/src/mage/cards/c/ConeOfFlame.java index 05b00b6a93..d1b63281a3 100644 --- a/Mage.Sets/src/mage/cards/c/ConeOfFlame.java +++ b/Mage.Sets/src/mage/cards/c/ConeOfFlame.java @@ -51,7 +51,7 @@ public class ConeOfFlame extends CardImpl { public ConeOfFlame(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{R}{R}"); - // Cone of Flame deals 1 damage to target creature or player, 2 damage to another target creature or player, and 3 damage to a third target creature or player. + // Cone of Flame deals 1 damage to any target, 2 damage to another any target, and 3 damage to a third any target. FilterCreaturePlayerOrPlaneswalker filter1 = new FilterCreaturePlayerOrPlaneswalker("creature, player or planeswalker to deal 1 damage"); TargetAnyTarget target1 = new TargetAnyTarget(1, 1, filter1); target1.setTargetTag(1); diff --git a/Mage.Sets/src/mage/cards/c/ConsumeSpirit.java b/Mage.Sets/src/mage/cards/c/ConsumeSpirit.java index bea57c5832..e6635cb146 100644 --- a/Mage.Sets/src/mage/cards/c/ConsumeSpirit.java +++ b/Mage.Sets/src/mage/cards/c/ConsumeSpirit.java @@ -60,7 +60,7 @@ public class ConsumeSpirit extends CardImpl { // Spend only black mana on X. - // Consume Spirit deals X damage to target creature or player and you gain X life. + // Consume Spirit deals X damage to any target and you gain X life. this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new ConsumeSpiritEffect()); VariableCost variableCost = this.getSpellAbility().getManaCostsToPay().getVariableCosts().get(0); @@ -83,7 +83,7 @@ class ConsumeSpiritEffect extends OneShotEffect { public ConsumeSpiritEffect() { super(Outcome.Damage); - staticText = "Consume Spirit deals X damage to target creature or player and you gain X life. Spend only black mana on X"; + staticText = "Consume Spirit deals X damage to any target and you gain X life. Spend only black mana on X"; } public ConsumeSpiritEffect(final ConsumeSpiritEffect effect) { diff --git a/Mage.Sets/src/mage/cards/c/Corrupt.java b/Mage.Sets/src/mage/cards/c/Corrupt.java index 2b4d2cea50..09817116f9 100644 --- a/Mage.Sets/src/mage/cards/c/Corrupt.java +++ b/Mage.Sets/src/mage/cards/c/Corrupt.java @@ -54,7 +54,7 @@ public class Corrupt extends CardImpl { public Corrupt(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{5}{B}"); - // Corrupt deals damage to target creature or player equal to the number of Swamps you control. You gain life equal to the damage dealt this way. + // Corrupt deals damage to any target equal to the number of Swamps you control. You gain life equal to the damage dealt this way. this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new CorruptEffect()); } @@ -81,7 +81,7 @@ class CorruptEffect extends OneShotEffect { public CorruptEffect() { super(Outcome.Damage); - staticText = "{this} deals damage to target creature or player equal to the number of Swamps you control. You gain life equal to the damage dealt this way"; + staticText = "{this} deals damage to any target equal to the number of Swamps you control. You gain life equal to the damage dealt this way"; } public CorruptEffect(final CorruptEffect effect) { diff --git a/Mage.Sets/src/mage/cards/c/CovenantOfBlood.java b/Mage.Sets/src/mage/cards/c/CovenantOfBlood.java index 2e81ca374d..32fd28ac90 100644 --- a/Mage.Sets/src/mage/cards/c/CovenantOfBlood.java +++ b/Mage.Sets/src/mage/cards/c/CovenantOfBlood.java @@ -50,9 +50,9 @@ public class CovenantOfBlood extends CardImpl { // Convoke this.addAbility(new ConvokeAbility()); - // Covenant of Blood deals 4 damage to target creature or player + // Covenant of Blood deals 4 damage to any target Effect effect = new DamageTargetEffect(4); - effect.setText("{this} deals 4 damage to target creature or player"); + effect.setText("{this} deals 4 damage to any target"); this.getSpellAbility().addEffect(effect); // and you gain 4 life. effect = new GainLifeEffect(4); diff --git a/Mage.Sets/src/mage/cards/c/Crackleburr.java b/Mage.Sets/src/mage/cards/c/Crackleburr.java index 06332829bf..0a7dac031b 100644 --- a/Mage.Sets/src/mage/cards/c/Crackleburr.java +++ b/Mage.Sets/src/mage/cards/c/Crackleburr.java @@ -77,7 +77,7 @@ public class Crackleburr extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // {UR}{UR}, {tap}, Tap two untapped red creatures you control: Crackleburr deals 3 damage to target creature or player. + // {UR}{UR}, {tap}, Tap two untapped red creatures you control: Crackleburr deals 3 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new ManaCostsImpl("{U/R}{U/R}")); ability.addCost(new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, true))); diff --git a/Mage.Sets/src/mage/cards/c/CracklingTriton.java b/Mage.Sets/src/mage/cards/c/CracklingTriton.java index 9be954dcf0..c1a5c3f04c 100644 --- a/Mage.Sets/src/mage/cards/c/CracklingTriton.java +++ b/Mage.Sets/src/mage/cards/c/CracklingTriton.java @@ -55,7 +55,7 @@ public class CracklingTriton extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(3); - // {2}{R}, Sacrifice Crackling Triton: Crackling Triton deals 2 damage to target creature or player. + // {2}{R}, Sacrifice Crackling Triton: Crackling Triton deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{2}{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/c/CratersClaws.java b/Mage.Sets/src/mage/cards/c/CratersClaws.java index 929904346f..e844238119 100644 --- a/Mage.Sets/src/mage/cards/c/CratersClaws.java +++ b/Mage.Sets/src/mage/cards/c/CratersClaws.java @@ -47,7 +47,7 @@ public class CratersClaws extends CardImpl { public CratersClaws(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{X}{R}"); - // Crater's Claws deals X damage to target creature or player. + // Crater's Claws deals X damage to any target. // Ferocious - Crater's Claws deals X plus 2 damage to that creature or player instead if you control a creature with power 4 or greater. this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new DamageTargetEffect(new IntPlusDynamicValue(2, new ManacostVariableValue())), diff --git a/Mage.Sets/src/mage/cards/c/CuombajjWitches.java b/Mage.Sets/src/mage/cards/c/CuombajjWitches.java index 9f0dafcbfd..0012e9e255 100644 --- a/Mage.Sets/src/mage/cards/c/CuombajjWitches.java +++ b/Mage.Sets/src/mage/cards/c/CuombajjWitches.java @@ -63,9 +63,9 @@ public class CuombajjWitches extends CardImpl { this.toughness = new MageInt(3); //TODO: Make ability properly copiable - // {T}: Cuombajj Witches deals 1 damage to target creature or player and 1 damage to target creature or player of an opponent's choice. + // {T}: Cuombajj Witches deals 1 damage to any target and 1 damage to any target of an opponent's choice. Effect effect = new DamageTargetEffect(1); - effect.setText("{this} deals 1 damage to target creature or player and 1 damage to target creature or player of an opponent's choice"); + effect.setText("{this} deals 1 damage to any target and 1 damage to any target of an opponent's choice"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/c/CursedScroll.java b/Mage.Sets/src/mage/cards/c/CursedScroll.java index 900ab80a92..cc57140ee9 100644 --- a/Mage.Sets/src/mage/cards/c/CursedScroll.java +++ b/Mage.Sets/src/mage/cards/c/CursedScroll.java @@ -54,7 +54,7 @@ public class CursedScroll extends CardImpl { public CursedScroll(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); - // {3}, {T}: Name a card. Reveal a card at random from your hand. If it's the named card, Cursed Scroll deals 2 damage to target creature or player. + // {3}, {T}: Name a card. Reveal a card at random from your hand. If it's the named card, Cursed Scroll deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new NameACardEffect(NameACardEffect.TypeOfName.ALL), new ManaCostsImpl("{3}")); ability.addEffect(new CursedScrollEffect()); ability.addCost(new TapSourceCost()); @@ -76,7 +76,7 @@ class CursedScrollEffect extends OneShotEffect { public CursedScrollEffect() { super(Outcome.Neutral); - staticText = "Reveal a card at random from your hand. If it's the named card, {this} deals 2 damage to target creature or player"; + staticText = "Reveal a card at random from your hand. If it's the named card, {this} deals 2 damage to any target"; } public CursedScrollEffect(final CursedScrollEffect effect) { diff --git a/Mage.Sets/src/mage/cards/d/DAvenantHealer.java b/Mage.Sets/src/mage/cards/d/DAvenantHealer.java index 4c1a5a9846..5c67de59df 100644 --- a/Mage.Sets/src/mage/cards/d/DAvenantHealer.java +++ b/Mage.Sets/src/mage/cards/d/DAvenantHealer.java @@ -61,7 +61,7 @@ public class DAvenantHealer extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature()); this.addAbility(ability); - // {T}: Prevent the next 1 damage that would be dealt to target creature or player this turn. + // {T}: Prevent the next 1 damage that would be dealt to any target this turn. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DanceWithDevils.java b/Mage.Sets/src/mage/cards/d/DanceWithDevils.java index 4516331d3e..0d80fb5a6e 100644 --- a/Mage.Sets/src/mage/cards/d/DanceWithDevils.java +++ b/Mage.Sets/src/mage/cards/d/DanceWithDevils.java @@ -42,11 +42,11 @@ import mage.game.permanent.token.DevilToken; public class DanceWithDevils extends CardImpl { public DanceWithDevils(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{R}"); - // Create two 1/1 red Devil creature tokens. They have "When this creature dies, it deals 1 damage to target creature or player." + // Create two 1/1 red Devil creature tokens. They have "When this creature dies, it deals 1 damage to any target." Effect effect = new CreateTokenEffect(new DevilToken(), 2); - effect.setText("Create two 1/1 red Devil creature tokens. They have \"When this creature dies, it deals 1 damage to target creature or player.\""); + effect.setText("Create two 1/1 red Devil creature tokens. They have \"When this creature dies, it deals 1 damage to any target.\""); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/cards/d/DarigaazsCharm.java b/Mage.Sets/src/mage/cards/d/DarigaazsCharm.java index 5644f6f8b0..eddd66b9d7 100644 --- a/Mage.Sets/src/mage/cards/d/DarigaazsCharm.java +++ b/Mage.Sets/src/mage/cards/d/DarigaazsCharm.java @@ -57,7 +57,7 @@ public class DarigaazsCharm extends CardImpl { this.getSpellAbility().addEffect(effect); this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard())); - // or Darigaaz's Charm deals 3 damage to target creature or player; + // or Darigaaz's Charm deals 3 damage to any target; Mode mode = new Mode(); mode.getEffects().add(new DamageTargetEffect(3)); mode.getTargets().add(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/d/DarkNourishment.java b/Mage.Sets/src/mage/cards/d/DarkNourishment.java index 2f12097c42..b613ea90f1 100644 --- a/Mage.Sets/src/mage/cards/d/DarkNourishment.java +++ b/Mage.Sets/src/mage/cards/d/DarkNourishment.java @@ -44,7 +44,7 @@ public class DarkNourishment extends CardImpl { public DarkNourishment(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{4}{B}"); - // Dark Nourishment deals 3 damage to target creature or player. You gain 3 life. + // Dark Nourishment deals 3 damage to any target. You gain 3 life. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new GainLifeEffect(3)); diff --git a/Mage.Sets/src/mage/cards/d/DaruHealer.java b/Mage.Sets/src/mage/cards/d/DaruHealer.java index fa4716355c..4bb99ec76e 100644 --- a/Mage.Sets/src/mage/cards/d/DaruHealer.java +++ b/Mage.Sets/src/mage/cards/d/DaruHealer.java @@ -57,7 +57,7 @@ public class DaruHealer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - // {tap}: Prevent the next 1 damage that would be dealt to target creature or player this turn. + // {tap}: Prevent the next 1 damage that would be dealt to any target this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/Dawnfluke.java b/Mage.Sets/src/mage/cards/d/Dawnfluke.java index 218a059385..667cfee3d6 100644 --- a/Mage.Sets/src/mage/cards/d/Dawnfluke.java +++ b/Mage.Sets/src/mage/cards/d/Dawnfluke.java @@ -57,7 +57,7 @@ public class Dawnfluke extends CardImpl { // Flash this.addAbility(FlashAbility.getInstance()); - // When Dawnfluke enters the battlefield, prevent the next 3 damage that would be dealt to target creature or player this turn. + // When Dawnfluke enters the battlefield, prevent the next 3 damage that would be dealt to any target this turn. Ability ability = new EntersBattlefieldTriggeredAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 3)); Target target = new TargetAnyTarget(); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/d/Deadapult.java b/Mage.Sets/src/mage/cards/d/Deadapult.java index a55c27049e..d3b9d1096f 100644 --- a/Mage.Sets/src/mage/cards/d/Deadapult.java +++ b/Mage.Sets/src/mage/cards/d/Deadapult.java @@ -59,7 +59,7 @@ public class Deadapult extends CardImpl { public Deadapult(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}"); - // {R}, Sacrifice a Zombie: Deadapult deals 2 damage to target creature or player. + // {R}, Sacrifice a Zombie: Deadapult deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{R}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(filter))); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/d/DeathSpark.java b/Mage.Sets/src/mage/cards/d/DeathSpark.java index e90c12cc64..3a2e3edd1d 100644 --- a/Mage.Sets/src/mage/cards/d/DeathSpark.java +++ b/Mage.Sets/src/mage/cards/d/DeathSpark.java @@ -56,7 +56,7 @@ public class DeathSpark extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{R}"); - // Death Spark deals 1 damage to target creature or player. + // Death Spark deals 1 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/d/DeathbringerThoctar.java b/Mage.Sets/src/mage/cards/d/DeathbringerThoctar.java index 4a86ea5744..d745b657ab 100644 --- a/Mage.Sets/src/mage/cards/d/DeathbringerThoctar.java +++ b/Mage.Sets/src/mage/cards/d/DeathbringerThoctar.java @@ -62,7 +62,7 @@ public class DeathbringerThoctar extends CardImpl { // Whenever another creature dies, you may put a +1/+1 counter on Deathbringer Thoctar. this.addAbility(new DiesCreatureTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), true, true)); - // Remove a +1/+1 counter from Deathbringer Thoctar: Deathbringer Thoctar deals 1 damage to target creature or player. + // Remove a +1/+1 counter from Deathbringer Thoctar: Deathbringer Thoctar deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DefenderEnVec.java b/Mage.Sets/src/mage/cards/d/DefenderEnVec.java index e0f56ea5cc..738debce1a 100644 --- a/Mage.Sets/src/mage/cards/d/DefenderEnVec.java +++ b/Mage.Sets/src/mage/cards/d/DefenderEnVec.java @@ -59,7 +59,7 @@ public class DefenderEnVec extends CardImpl { // Fading 4 this.addAbility(new FadingAbility(4, this)); - // Remove a fade counter from Defender en-Vec: Prevent the next 2 damage that would be dealt to target creature or player this turn. + // Remove a fade counter from Defender en-Vec: Prevent the next 2 damage that would be dealt to any target this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new RemoveCountersSourceCost(CounterType.FADE.createInstance())); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/d/Demonfire.java b/Mage.Sets/src/mage/cards/d/Demonfire.java index 8a87fc90c1..186976479e 100644 --- a/Mage.Sets/src/mage/cards/d/Demonfire.java +++ b/Mage.Sets/src/mage/cards/d/Demonfire.java @@ -55,11 +55,11 @@ public class Demonfire extends CardImpl { public Demonfire(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{X}{R}"); - // Demonfire deals X damage to target creature or player. + // Demonfire deals X damage to any target. this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new DamageTargetEffect(new ManacostVariableValue()), new InvertCondition(HellbentCondition.instance), - "{this} deals X damage to target creature or player")); + "{this} deals X damage to any target")); // If a creature dealt damage this way would die this turn, exile it instead. this.getSpellAbility().addEffect(new DealtDamageToCreatureBySourceDies(this, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/cards/d/DemonicPact.java b/Mage.Sets/src/mage/cards/d/DemonicPact.java index adfc4d8c4a..ae54517d98 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicPact.java +++ b/Mage.Sets/src/mage/cards/d/DemonicPact.java @@ -54,7 +54,7 @@ public class DemonicPact extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{B}{B}"); // At the beginning of your upkeep, choose one that hasn't been chosen - // - Demonic Pact deals 4 damage to target creature or player and you gain 4 life; + // - Demonic Pact deals 4 damage to any target and you gain 4 life; Ability ability = new BeginningOfUpkeepTriggeredAbility(new DamageTargetEffect(4), TargetController.YOU, false); ability.getModes().setEachModeOnlyOnce(true); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/d/DevilsPlay.java b/Mage.Sets/src/mage/cards/d/DevilsPlay.java index 3a736d7cf3..3b617d7d70 100644 --- a/Mage.Sets/src/mage/cards/d/DevilsPlay.java +++ b/Mage.Sets/src/mage/cards/d/DevilsPlay.java @@ -48,7 +48,7 @@ public class DevilsPlay extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{X}{R}"); - // Devil's Play deals X damage to target creature or player. + // Devil's Play deals X damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); this.getSpellAbility().addTarget(new TargetAnyTarget()); // Flashback {X}{R}{R}{R} diff --git a/Mage.Sets/src/mage/cards/d/DevilsPlayground.java b/Mage.Sets/src/mage/cards/d/DevilsPlayground.java index aba8268be2..b82a54d42e 100644 --- a/Mage.Sets/src/mage/cards/d/DevilsPlayground.java +++ b/Mage.Sets/src/mage/cards/d/DevilsPlayground.java @@ -42,11 +42,11 @@ import mage.game.permanent.token.DevilToken; public class DevilsPlayground extends CardImpl { public DevilsPlayground(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{R}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{4}{R}{R}"); - // Create four 1/1 red Devil creature tokens. They have "When this creature dies, it deals 1 damage to target creature or player." + // Create four 1/1 red Devil creature tokens. They have "When this creature dies, it deals 1 damage to any target." Effect effect = new CreateTokenEffect(new DevilToken(), 4); - effect.setText("Create four 1/1 red Devil creature tokens. They have \"When this creature dies, it deals 1 damage to target creature or player.\""); + effect.setText("Create four 1/1 red Devil creature tokens. They have \"When this creature dies, it deals 1 damage to any target.\""); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/cards/d/Disintegrate.java b/Mage.Sets/src/mage/cards/d/Disintegrate.java index b81c2f0346..ea60cfb58a 100644 --- a/Mage.Sets/src/mage/cards/d/Disintegrate.java +++ b/Mage.Sets/src/mage/cards/d/Disintegrate.java @@ -48,7 +48,7 @@ public class Disintegrate extends CardImpl { public Disintegrate(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{X}{R}"); - // Disintegrate deals X damage to target creature or player. That creature can't be regenerated this turn. If the creature would die this turn, exile it instead. + // Disintegrate deals X damage to any target. That creature can't be regenerated this turn. If the creature would die this turn, exile it instead. this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); this.getSpellAbility().addEffect(new CantRegenerateTargetEffect(Duration.EndOfTurn, "That creature")); Effect effect = new ExileTargetIfDiesEffect(); diff --git a/Mage.Sets/src/mage/cards/d/DivineDeflection.java b/Mage.Sets/src/mage/cards/d/DivineDeflection.java index e27aab1fa4..0dc61ecaab 100644 --- a/Mage.Sets/src/mage/cards/d/DivineDeflection.java +++ b/Mage.Sets/src/mage/cards/d/DivineDeflection.java @@ -50,7 +50,7 @@ public class DivineDeflection extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{X}{W}"); - // Prevent the next X damage that would be dealt to you and/or permanents you control this turn. If damage is prevented this way, Divine Deflection deals that much damage to target creature or player. + // Prevent the next X damage that would be dealt to you and/or permanents you control this turn. If damage is prevented this way, Divine Deflection deals that much damage to any target. this.getSpellAbility().addEffect(new DivineDeflectionPreventDamageTargetEffect(Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetAnyTarget()); } @@ -69,7 +69,7 @@ class DivineDeflectionPreventDamageTargetEffect extends PreventionEffectImpl { public DivineDeflectionPreventDamageTargetEffect(Duration duration) { super(duration, Integer.MIN_VALUE, false, true); - staticText = "Prevent the next X damage that would be dealt to you and/or permanents you control this turn. If damage is prevented this way, {this} deals that much damage to target creature or player"; + staticText = "Prevent the next X damage that would be dealt to you and/or permanents you control this turn. If damage is prevented this way, {this} deals that much damage to any target"; } public DivineDeflectionPreventDamageTargetEffect(final DivineDeflectionPreventDamageTargetEffect effect) { diff --git a/Mage.Sets/src/mage/cards/d/Dogpile.java b/Mage.Sets/src/mage/cards/d/Dogpile.java index aa4235e5a1..2cc5b4f14b 100644 --- a/Mage.Sets/src/mage/cards/d/Dogpile.java +++ b/Mage.Sets/src/mage/cards/d/Dogpile.java @@ -53,9 +53,9 @@ public class Dogpile extends CardImpl { public Dogpile(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{R}"); - // Dogpile deals damage to target creature or player equal to the number of attacking creatures you control. + // Dogpile deals damage to any target equal to the number of attacking creatures you control. this.getSpellAbility().addEffect(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)). - setText("{this} deals damage to target creature or player equal to the number of attacking creatures you control")); + setText("{this} deals damage to any target equal to the number of attacking creatures you control")); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/d/DoomCannon.java b/Mage.Sets/src/mage/cards/d/DoomCannon.java index 23d4969a25..249b2e6f0d 100644 --- a/Mage.Sets/src/mage/cards/d/DoomCannon.java +++ b/Mage.Sets/src/mage/cards/d/DoomCannon.java @@ -60,7 +60,7 @@ public class DoomCannon extends CardImpl { // As Doom Cannon enters the battlefield, choose a creature type. this.addAbility(new AsEntersBattlefieldAbility(new ChooseCreatureTypeEffect(Outcome.Sacrifice))); - // {3}, {T}, Sacrifice a creature of the chosen type: Doom Cannon deals 3 damage to target creature or player. + // {3}, {T}, Sacrifice a creature of the chosen type: Doom Cannon deals 3 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(new DoomCannonFilter()))); diff --git a/Mage.Sets/src/mage/cards/d/DragonTempest.java b/Mage.Sets/src/mage/cards/d/DragonTempest.java index d637ce8ca3..98ae8fb94f 100644 --- a/Mage.Sets/src/mage/cards/d/DragonTempest.java +++ b/Mage.Sets/src/mage/cards/d/DragonTempest.java @@ -67,7 +67,7 @@ public class DragonTempest extends CardImpl { effect.setText("it gains haste until the end of turn"); this.addAbility(new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, effect, filterFlying, false, SetTargetPointer.PERMANENT, "")); - // Whenever a Dragon enters the battlefield under your control, it deals X damage to target creature or player, where X is the number of Dragons you control. + // Whenever a Dragon enters the battlefield under your control, it deals X damage to any target, where X is the number of Dragons you control. Ability ability = new EntersBattlefieldControlledTriggeredAbility( Zone.BATTLEFIELD, new DragonTempestDamageEffect(), @@ -101,7 +101,7 @@ class DragonTempestDamageEffect extends OneShotEffect { public DragonTempestDamageEffect() { super(Outcome.Damage); - staticText = "it deals X damage to target creature or player, where X is the number of Dragons you control"; + staticText = "it deals X damage to any target, where X is the number of Dragons you control"; } public DragonTempestDamageEffect(final DragonTempestDamageEffect effect) { diff --git a/Mage.Sets/src/mage/cards/d/DrainLife.java b/Mage.Sets/src/mage/cards/d/DrainLife.java index 02b122a614..435096709d 100644 --- a/Mage.Sets/src/mage/cards/d/DrainLife.java +++ b/Mage.Sets/src/mage/cards/d/DrainLife.java @@ -59,7 +59,7 @@ public class DrainLife extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{X}{1}{B}"); // Spend only black mana on X. - // Drain Life deals X damage to target creature or player. You gain life equal to the damage dealt, but not more life than the player's life total before Drain Life dealt damage or the creature's toughness. + // Drain Life deals X damage to any target. You gain life equal to the damage dealt, but not more life than the player's life total before Drain Life dealt damage or the creature's toughness. this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DrainLifeEffect()); VariableCost variableCost = this.getSpellAbility().getManaCostsToPay().getVariableCosts().get(0); @@ -82,7 +82,7 @@ class DrainLifeEffect extends OneShotEffect { public DrainLifeEffect() { super(Outcome.Damage); - staticText = "Spend only black mana on X.
{this} deals X damage to target creature or player. You gain life equal to the damage dealt, but not more life than the player's life total before Drain Life dealt damage or the creature's toughness"; + staticText = "Spend only black mana on X.
{this} deals X damage to any target. You gain life equal to the damage dealt, but not more life than the player's life total before Drain Life dealt damage or the creature's toughness"; } public DrainLifeEffect(final DrainLifeEffect effect) { diff --git a/Mage.Sets/src/mage/cards/d/DynavoltTower.java b/Mage.Sets/src/mage/cards/d/DynavoltTower.java index 95b1537c63..7c11fee443 100644 --- a/Mage.Sets/src/mage/cards/d/DynavoltTower.java +++ b/Mage.Sets/src/mage/cards/d/DynavoltTower.java @@ -54,7 +54,7 @@ public class DynavoltTower extends CardImpl { // Whenever you cast an instant or sorcery spell, you get {E}{E}. this.addAbility(new SpellCastControllerTriggeredAbility(new GetEnergyCountersControllerEffect(2), new FilterInstantOrSorcerySpell(), false)); - // {T}, Pay {E}{E}{E}{E}{E}: Dynavolt Tower deals 3 damage to target creature or player. + // {T}, Pay {E}{E}{E}{E}{E}: Dynavolt Tower deals 3 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new TapSourceCost()); ability.addCost(new PayEnergyCost(5)); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/e/ElaborateFirecannon.java b/Mage.Sets/src/mage/cards/e/ElaborateFirecannon.java index 52c9f79835..b07176c9ad 100644 --- a/Mage.Sets/src/mage/cards/e/ElaborateFirecannon.java +++ b/Mage.Sets/src/mage/cards/e/ElaborateFirecannon.java @@ -58,7 +58,7 @@ public class ElaborateFirecannon extends CardImpl { // Elaborate Firecannon doesn't untap during your untap step. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); - // {4}, {T}: Elaborate Firecannon deals 2 damage to target creature or player. + // {4}, {T}: Elaborate Firecannon deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/e/Electropotence.java b/Mage.Sets/src/mage/cards/e/Electropotence.java index 49e150eb86..7078dfeb12 100644 --- a/Mage.Sets/src/mage/cards/e/Electropotence.java +++ b/Mage.Sets/src/mage/cards/e/Electropotence.java @@ -55,7 +55,7 @@ public class Electropotence extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}"); - // Whenever a creature enters the battlefield under your control, you may pay {2}{R}. If you do, that creature deals damage equal to its power to target creature or player. + // Whenever a creature enters the battlefield under your control, you may pay {2}{R}. If you do, that creature deals damage equal to its power to any target. Ability ability = new ElectropotenceTriggeredAbility(); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); @@ -99,7 +99,7 @@ class ElectropotenceTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever a creature enters the battlefield under your control, you may pay {2}{R}. If you do, that creature deals damage equal to its power to target creature or player."; + return "Whenever a creature enters the battlefield under your control, you may pay {2}{R}. If you do, that creature deals damage equal to its power to any target."; } @Override @@ -130,7 +130,7 @@ class ElectropotenceEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (creature != null && controller != null) { if (controller.chooseUse(Outcome.Damage, "Pay {2}{R} to do the damage?", source, game)) { - // if (controller.chooseUse(Outcome.Damage, "Pay {2}{R}? If you do, " + creature.getName() + " deals damage equal to its power to target creature or player.", game)) { + // if (controller.chooseUse(Outcome.Damage, "Pay {2}{R}? If you do, " + creature.getName() + " deals damage equal to its power to any target.", game)) { ManaCosts manaCosts = new ManaCostsImpl("{2}{R}"); if (manaCosts.pay(source, game, source.getSourceId(), controller.getId(), false, null)) { int amount = creature.getPower().getValue(); diff --git a/Mage.Sets/src/mage/cards/e/EmberShot.java b/Mage.Sets/src/mage/cards/e/EmberShot.java index 85f3479da2..4aab96914c 100644 --- a/Mage.Sets/src/mage/cards/e/EmberShot.java +++ b/Mage.Sets/src/mage/cards/e/EmberShot.java @@ -44,7 +44,7 @@ public class EmberShot extends CardImpl { public EmberShot(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{6}{R}"); - // Ember Shot deals 3 damage to target creature or player. + // Ember Shot deals 3 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetAnyTarget()); // Draw a card. diff --git a/Mage.Sets/src/mage/cards/e/EmbermageGoblin.java b/Mage.Sets/src/mage/cards/e/EmbermageGoblin.java index 9ff97bf1a2..d6ce7f5a87 100644 --- a/Mage.Sets/src/mage/cards/e/EmbermageGoblin.java +++ b/Mage.Sets/src/mage/cards/e/EmbermageGoblin.java @@ -69,7 +69,7 @@ public class EmbermageGoblin extends CardImpl { TargetCardInLibrary target = new TargetCardInLibrary(0, 1, filter); this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(target, true, true), true)); - // {tap}: Embermage Goblin deals 1 damage to target creature or player. + // {tap}: Embermage Goblin deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/Embersmith.java b/Mage.Sets/src/mage/cards/e/Embersmith.java index 391078105b..2e4deb3dcf 100644 --- a/Mage.Sets/src/mage/cards/e/Embersmith.java +++ b/Mage.Sets/src/mage/cards/e/Embersmith.java @@ -76,7 +76,7 @@ public class Embersmith extends CardImpl { class EmbersmithEffect extends OneShotEffect { EmbersmithEffect() { super(Outcome.Damage); - staticText = "you may pay {1}. If you do, {this} deals 1 damage to target creature or player"; + staticText = "you may pay {1}. If you do, {this} deals 1 damage to any target"; } EmbersmithEffect(final EmbersmithEffect effect) { diff --git a/Mage.Sets/src/mage/cards/e/Endbringer.java b/Mage.Sets/src/mage/cards/e/Endbringer.java index f9495cdefd..be8e45e53e 100644 --- a/Mage.Sets/src/mage/cards/e/Endbringer.java +++ b/Mage.Sets/src/mage/cards/e/Endbringer.java @@ -62,7 +62,7 @@ public class Endbringer extends CardImpl { // Untap Endbringer during each other player's untap step. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new UntapSourceDuringEachOtherPlayersUntapStepEffect())); - // {T}: Endbringer deals 1 damage to target creature or player. + // {T}: Endbringer deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/ErraticExplosion.java b/Mage.Sets/src/mage/cards/e/ErraticExplosion.java index 1df61d38bb..97189b3d0f 100644 --- a/Mage.Sets/src/mage/cards/e/ErraticExplosion.java +++ b/Mage.Sets/src/mage/cards/e/ErraticExplosion.java @@ -51,7 +51,7 @@ public class ErraticExplosion extends CardImpl { public ErraticExplosion(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{R}"); - // Choose target creature or player. Reveal cards from the top of your library until you reveal a nonland card. Erratic Explosion deals damage equal to that card's converted mana cost to that creature or player. Put the revealed cards on the bottom of your library in any order. + // Choose any target. Reveal cards from the top of your library until you reveal a nonland card. Erratic Explosion deals damage equal to that card's converted mana cost to that creature or player. Put the revealed cards on the bottom of your library in any order. this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new ErraticExplosionEffect()); } diff --git a/Mage.Sets/src/mage/cards/e/EruptingDreadwolf.java b/Mage.Sets/src/mage/cards/e/EruptingDreadwolf.java index 133345ad12..bea742bf9c 100644 --- a/Mage.Sets/src/mage/cards/e/EruptingDreadwolf.java +++ b/Mage.Sets/src/mage/cards/e/EruptingDreadwolf.java @@ -55,7 +55,7 @@ public class EruptingDreadwolf extends CardImpl { // this card is the second face of double-faced card this.nightCard = true; - // Whenever Erupting Dreadwolf attacks, it deals 2 damage to target creature or player. + // Whenever Erupting Dreadwolf attacks, it deals 2 damage to any target. Ability ability = new AttacksTriggeredAbility(new DamageTargetEffect(2, "it"), false); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/ExplosiveApparatus.java b/Mage.Sets/src/mage/cards/e/ExplosiveApparatus.java index bbb1d1c2d8..8bad2078b9 100644 --- a/Mage.Sets/src/mage/cards/e/ExplosiveApparatus.java +++ b/Mage.Sets/src/mage/cards/e/ExplosiveApparatus.java @@ -49,7 +49,7 @@ public class ExplosiveApparatus extends CardImpl { public ExplosiveApparatus(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); - // {3}, {T}, Sacrifice Explosive Apparatus: Explosive Apparatus deals 2 damage to target creature or player. + // {3}, {T}, Sacrifice Explosive Apparatus: Explosive Apparatus deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/e/ExplosiveImpact.java b/Mage.Sets/src/mage/cards/e/ExplosiveImpact.java index 91b768abaf..68615f8202 100644 --- a/Mage.Sets/src/mage/cards/e/ExplosiveImpact.java +++ b/Mage.Sets/src/mage/cards/e/ExplosiveImpact.java @@ -45,7 +45,7 @@ public class ExplosiveImpact extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{5}{R}"); - // Explosive Impact deals 5 damage to target creature or player. + // Explosive Impact deals 5 damage to any target. this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DamageTargetEffect(5)); } diff --git a/Mage.Sets/src/mage/cards/e/ExplosiveRevelation.java b/Mage.Sets/src/mage/cards/e/ExplosiveRevelation.java index 911d6a9480..4d9796da4a 100644 --- a/Mage.Sets/src/mage/cards/e/ExplosiveRevelation.java +++ b/Mage.Sets/src/mage/cards/e/ExplosiveRevelation.java @@ -53,7 +53,7 @@ public class ExplosiveRevelation extends CardImpl { public ExplosiveRevelation(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{R}{R}"); - // Choose target creature or player. Reveal cards from the top of your library until you reveal a nonland card. Explosive Revelation deals damage equal to that card's converted mana cost to that creature or player. Put the nonland card into your hand and the rest on the bottom of your library in any order. + // Choose any target. Reveal cards from the top of your library until you reveal a nonland card. Explosive Revelation deals damage equal to that card's converted mana cost to that creature or player. Put the nonland card into your hand and the rest on the bottom of your library in any order. this.getSpellAbility().addEffect(new ExplosiveRevelationEffect()); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/e/ExquisiteFirecraft.java b/Mage.Sets/src/mage/cards/e/ExquisiteFirecraft.java index a35868b7e5..49bd943d4f 100644 --- a/Mage.Sets/src/mage/cards/e/ExquisiteFirecraft.java +++ b/Mage.Sets/src/mage/cards/e/ExquisiteFirecraft.java @@ -50,7 +50,7 @@ public class ExquisiteFirecraft extends CardImpl { public ExquisiteFirecraft(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{R}{R}"); - // Exquisite Firecraft deals 4 damage to target creature or player. + // Exquisite Firecraft deals 4 damage to any target. this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DamageTargetEffect(4)); diff --git a/Mage.Sets/src/mage/cards/e/ExtraArms.java b/Mage.Sets/src/mage/cards/e/ExtraArms.java index ded0761e92..60431b8cf7 100644 --- a/Mage.Sets/src/mage/cards/e/ExtraArms.java +++ b/Mage.Sets/src/mage/cards/e/ExtraArms.java @@ -60,7 +60,7 @@ public class ExtraArms extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // Whenever enchanted creature attacks, it deals 2 damage to target creature or player. + // Whenever enchanted creature attacks, it deals 2 damage to any target. ability = new AttacksAttachedTriggeredAbility(new DamageTargetEffect(2, "it"), AttachmentType.AURA, false); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FallenFerromancer.java b/Mage.Sets/src/mage/cards/f/FallenFerromancer.java index 4341447c85..4d4637ded5 100644 --- a/Mage.Sets/src/mage/cards/f/FallenFerromancer.java +++ b/Mage.Sets/src/mage/cards/f/FallenFerromancer.java @@ -58,7 +58,7 @@ public class FallenFerromancer extends CardImpl { // Infect (This creature deals damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.) this.addAbility(InfectAbility.getInstance()); - // {1}{R}, {T}: Fallen Ferromancer deals 1 damage to target creature or player. + // {1}{R}, {T}: Fallen Ferromancer deals 1 damage to any target. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addCost(new ManaCostsImpl("{1}{R}")); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/f/FanaticalFirebrand.java b/Mage.Sets/src/mage/cards/f/FanaticalFirebrand.java index 6df2f50058..ce17cbd4f1 100644 --- a/Mage.Sets/src/mage/cards/f/FanaticalFirebrand.java +++ b/Mage.Sets/src/mage/cards/f/FanaticalFirebrand.java @@ -62,7 +62,7 @@ public class FanaticalFirebrand extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); - // {T}, Sacrifice Fanatical Firebrand: It deals 1 damage to target creature or player. + // {T}, Sacrifice Fanatical Firebrand: It deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "It"), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/f/FanningTheFlames.java b/Mage.Sets/src/mage/cards/f/FanningTheFlames.java index 8896344f75..6a88351046 100644 --- a/Mage.Sets/src/mage/cards/f/FanningTheFlames.java +++ b/Mage.Sets/src/mage/cards/f/FanningTheFlames.java @@ -48,7 +48,7 @@ public class FanningTheFlames extends CardImpl { // Buyback {3} this.addAbility(new BuybackAbility("{3}")); - // Fanning the Flames deals X damage to target creature or player. + // Fanning the Flames deals X damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/f/FatefulShowdown.java b/Mage.Sets/src/mage/cards/f/FatefulShowdown.java index 9ca4c00a2c..733cb73732 100644 --- a/Mage.Sets/src/mage/cards/f/FatefulShowdown.java +++ b/Mage.Sets/src/mage/cards/f/FatefulShowdown.java @@ -46,9 +46,9 @@ public class FatefulShowdown extends CardImpl { public FatefulShowdown(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{R}{R}"); - // Fateful Showdown deals damage to target creature or player equal to the number of cards in your hand. Discard all the cards in your hand, then draw that many cards. + // Fateful Showdown deals damage to any target equal to the number of cards in your hand. Discard all the cards in your hand, then draw that many cards. Effect effect = new DamageTargetEffect(new CardsInControllerHandCount()); - effect.setText("{this} deals damage to target creature or player equal to the number of cards in your hand"); + effect.setText("{this} deals damage to any target equal to the number of cards in your hand"); this.getSpellAbility().addEffect(effect); this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DiscardHandDrawSameNumberSourceEffect()); diff --git a/Mage.Sets/src/mage/cards/f/FemerefHealer.java b/Mage.Sets/src/mage/cards/f/FemerefHealer.java index 51f770ea00..85baae097c 100644 --- a/Mage.Sets/src/mage/cards/f/FemerefHealer.java +++ b/Mage.Sets/src/mage/cards/f/FemerefHealer.java @@ -54,7 +54,7 @@ public class FemerefHealer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // {tap}: Prevent the next 1 damage that would be dealt to target creature or player this turn. + // {tap}: Prevent the next 1 damage that would be dealt to any target this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FieryBombardment.java b/Mage.Sets/src/mage/cards/f/FieryBombardment.java index 184e907f03..092ebc1c07 100644 --- a/Mage.Sets/src/mage/cards/f/FieryBombardment.java +++ b/Mage.Sets/src/mage/cards/f/FieryBombardment.java @@ -58,7 +58,7 @@ public class FieryBombardment extends CardImpl { public FieryBombardment(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}"); - // Chroma - {2}, Sacrifice a creature: Fiery Bombardment deals damage to target creature or player equal to the number of red mana symbols in the sacrificed creature's mana cost. + // Chroma - {2}, Sacrifice a creature: Fiery Bombardment deals damage to any target equal to the number of red mana symbols in the sacrificed creature's mana cost. Effect effect = new FieryBombardmentEffect(); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{2}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); @@ -82,7 +82,7 @@ class FieryBombardmentEffect extends OneShotEffect { public FieryBombardmentEffect() { super(Outcome.Benefit); - staticText = "{this} deals damage to target creature or player equal to the number of red mana symbols in the sacrificed creature's mana cost."; + staticText = "{this} deals damage to any target equal to the number of red mana symbols in the sacrificed creature's mana cost."; } public FieryBombardmentEffect(final FieryBombardmentEffect effect) { diff --git a/Mage.Sets/src/mage/cards/f/FieryTemper.java b/Mage.Sets/src/mage/cards/f/FieryTemper.java index c76aab80e0..3df798b1d3 100644 --- a/Mage.Sets/src/mage/cards/f/FieryTemper.java +++ b/Mage.Sets/src/mage/cards/f/FieryTemper.java @@ -46,7 +46,7 @@ public class FieryTemper extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{R}{R}"); - // Fiery Temper deals 3 damage to target creature or player. + // Fiery Temper deals 3 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/f/FireAmbush.java b/Mage.Sets/src/mage/cards/f/FireAmbush.java index 642e74bb9a..e0e9a4ca33 100644 --- a/Mage.Sets/src/mage/cards/f/FireAmbush.java +++ b/Mage.Sets/src/mage/cards/f/FireAmbush.java @@ -44,7 +44,7 @@ public class FireAmbush extends CardImpl { public FireAmbush(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{R}"); - // Fire Ambush deals 3 damage to target creature or player. + // Fire Ambush deals 3 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/f/FireBowman.java b/Mage.Sets/src/mage/cards/f/FireBowman.java index 841bd3b314..e7d17a5235 100644 --- a/Mage.Sets/src/mage/cards/f/FireBowman.java +++ b/Mage.Sets/src/mage/cards/f/FireBowman.java @@ -55,7 +55,7 @@ public class FireBowman extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // Sacrifice Fire Bowman: Fire Bowman deals 1 damage to target creature or player. Activate this ability only during your turn, before attackers are declared. + // Sacrifice Fire Bowman: Fire Bowman deals 1 damage to any target. Activate this ability only during your turn, before attackers are declared. Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeSourceCost(), MyTurnBeforeAttackersDeclaredCondition.instance); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/f/FireWhip.java b/Mage.Sets/src/mage/cards/f/FireWhip.java index a9d70b66b4..9609f461b4 100644 --- a/Mage.Sets/src/mage/cards/f/FireWhip.java +++ b/Mage.Sets/src/mage/cards/f/FireWhip.java @@ -62,11 +62,11 @@ public class FireWhip extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // Enchanted creature has "{t}: This creature deals 1 damage to target creature or player." + // Enchanted creature has "{t}: This creature deals 1 damage to any target." Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability1.addTarget(new TargetAnyTarget()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability1, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{t}: This creature deals 1 damage to target creature or player.\""))); - // Sacrifice Fire Whip: Fire Whip deals 1 damage to target creature or player. + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability1, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{t}: This creature deals 1 damage to any target.\""))); + // Sacrifice Fire Whip: Fire Whip deals 1 damage to any target. Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeSourceCost()); ability2.addTarget(new TargetAnyTarget()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/f/Fireblast.java b/Mage.Sets/src/mage/cards/f/Fireblast.java index 5e8ee7c390..f5bf8aab78 100644 --- a/Mage.Sets/src/mage/cards/f/Fireblast.java +++ b/Mage.Sets/src/mage/cards/f/Fireblast.java @@ -59,7 +59,7 @@ public class Fireblast extends CardImpl { // You may sacrifice two Mountains rather than pay Fireblast's mana cost. this.addAbility(new AlternativeCostSourceAbility(new SacrificeTargetCost(new TargetControlledPermanent(2, 2, filter, true)))); - // Fireblast deals 4 damage to target creature or player. + // Fireblast deals 4 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/f/Firebolt.java b/Mage.Sets/src/mage/cards/f/Firebolt.java index e2e51261bb..627cdce7ff 100644 --- a/Mage.Sets/src/mage/cards/f/Firebolt.java +++ b/Mage.Sets/src/mage/cards/f/Firebolt.java @@ -47,7 +47,7 @@ public class Firebolt extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{R}"); - // Firebolt deals 2 damage to target creature or player. + // Firebolt deals 2 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellAbility().addTarget(new TargetAnyTarget()); // Flashback {4}{R} diff --git a/Mage.Sets/src/mage/cards/f/FireforgersPuzzleknot.java b/Mage.Sets/src/mage/cards/f/FireforgersPuzzleknot.java index aaebd43423..4d31686943 100644 --- a/Mage.Sets/src/mage/cards/f/FireforgersPuzzleknot.java +++ b/Mage.Sets/src/mage/cards/f/FireforgersPuzzleknot.java @@ -50,13 +50,13 @@ public class FireforgersPuzzleknot extends CardImpl { public FireforgersPuzzleknot(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); - // When Fireforger's Puzzleknot enters the battlefield, it deals 1 damage to target creature or player. + // When Fireforger's Puzzleknot enters the battlefield, it deals 1 damage to any target. Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(1, "it")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); - // {2}{R}, Sacrifice Fireforger's Puzzleknot: It deals 1 damage to target creature or player. + // {2}{R}, Sacrifice Fireforger's Puzzleknot: It deals 1 damage to any target. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "It"), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/f/FiremaneAvenger.java b/Mage.Sets/src/mage/cards/f/FiremaneAvenger.java index d6a3f9b5e7..b1a3656df2 100644 --- a/Mage.Sets/src/mage/cards/f/FiremaneAvenger.java +++ b/Mage.Sets/src/mage/cards/f/FiremaneAvenger.java @@ -57,7 +57,7 @@ public class FiremaneAvenger extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // Battalion - Whenever Firemane Avenger and at least two other creatures attack, Firemane Avenger deals 3 damage to target creature or player and you gain 3 life. + // Battalion - Whenever Firemane Avenger and at least two other creatures attack, Firemane Avenger deals 3 damage to any target and you gain 3 life. Ability ability = new BattalionAbility(new DamageTargetEffect(3)); ability.addTarget(new TargetAnyTarget()); ability.addEffect(new GainLifeEffect(3)); diff --git a/Mage.Sets/src/mage/cards/f/FiresOfUndeath.java b/Mage.Sets/src/mage/cards/f/FiresOfUndeath.java index 056c890dd7..44dbffae4f 100644 --- a/Mage.Sets/src/mage/cards/f/FiresOfUndeath.java +++ b/Mage.Sets/src/mage/cards/f/FiresOfUndeath.java @@ -47,7 +47,7 @@ public class FiresOfUndeath extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{R}"); - // Fires of Undeath deals 2 damage to target creature or player. + // Fires of Undeath deals 2 damage to any target. this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DamageTargetEffect(2)); // Flashback {5}{B} diff --git a/Mage.Sets/src/mage/cards/f/FiresongAndSunspeaker.java b/Mage.Sets/src/mage/cards/f/FiresongAndSunspeaker.java index 59a6d02b1d..cbf485bda0 100644 --- a/Mage.Sets/src/mage/cards/f/FiresongAndSunspeaker.java +++ b/Mage.Sets/src/mage/cards/f/FiresongAndSunspeaker.java @@ -75,7 +75,7 @@ public class FiresongAndSunspeaker extends CardImpl { Effect effect = new GainAbilitySpellsEffect(LifelinkAbility.getInstance(), filter); effect.setText("Instant and sorcery spells you control have lifelink"); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); - // Whenever a white instant or sorcery spell causes you to gain life, Firesong and Sunspeaker deals 3 damage to target creature or player. + // Whenever a white instant or sorcery spell causes you to gain life, Firesong and Sunspeaker deals 3 damage to any target. this.addAbility(new FiresongAndSunspeakerTriggeredAbility()); } @@ -125,6 +125,6 @@ class FiresongAndSunspeakerTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever a white instant or sorcery spell causes you to gain life, Firesong and Sunspeaker deals 3 damage to target creature or player."; + return "Whenever a white instant or sorcery spell causes you to gain life, Firesong and Sunspeaker deals 3 damage to any target."; } } diff --git a/Mage.Sets/src/mage/cards/f/FiveAlarmFire.java b/Mage.Sets/src/mage/cards/f/FiveAlarmFire.java index 1e88d20dae..a33cc51eef 100644 --- a/Mage.Sets/src/mage/cards/f/FiveAlarmFire.java +++ b/Mage.Sets/src/mage/cards/f/FiveAlarmFire.java @@ -63,7 +63,7 @@ public class FiveAlarmFire extends CardImpl { //Whenever a creature you control deals combat damage, put a blaze counter on Five-Alarm Fire. this.addAbility(new FiveAlarmFireTriggeredAbility()); - //Remove five blaze counters from Five-Alarm Fire: Five-Alarm Fire deals 5 damage to target creature or player. + //Remove five blaze counters from Five-Alarm Fire: Five-Alarm Fire deals 5 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(5), new RemoveCountersSourceCost(CounterType.BLAZE.createInstance(5))); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FlameBurst.java b/Mage.Sets/src/mage/cards/f/FlameBurst.java index 7eff6ff254..96510484b8 100644 --- a/Mage.Sets/src/mage/cards/f/FlameBurst.java +++ b/Mage.Sets/src/mage/cards/f/FlameBurst.java @@ -61,9 +61,9 @@ public class FlameBurst extends CardImpl { public FlameBurst(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{R}"); - // Flame Burst deals X damage to target creature or player, where X is 2 plus the number of cards named Flame Burst in all graveyards. + // Flame Burst deals X damage to any target, where X is 2 plus the number of cards named Flame Burst in all graveyards. Effect effect = new DamageTargetEffect(new FlameBurstCount(filter)); - effect.setText("{this} deals X damage to target creature or player, where X is 2 plus the number of cards named Flame Burst in all graveyards."); + effect.setText("{this} deals X damage to any target, where X is 2 plus the number of cards named Flame Burst in all graveyards."); this.getSpellAbility().addEffect(effect); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/f/FlameFusillade.java b/Mage.Sets/src/mage/cards/f/FlameFusillade.java index 2339bb6023..f570b7ca76 100644 --- a/Mage.Sets/src/mage/cards/f/FlameFusillade.java +++ b/Mage.Sets/src/mage/cards/f/FlameFusillade.java @@ -50,7 +50,7 @@ public class FlameFusillade extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{R}"); - // Until end of turn, permanents you control gain "{tap}: This permanent deals 1 damage to target creature or player." + // Until end of turn, permanents you control gain "{tap}: This permanent deals 1 damage to any target." Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); gainedAbility.addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new GainAbilityControlledEffect(gainedAbility, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/cards/f/FlameJab.java b/Mage.Sets/src/mage/cards/f/FlameJab.java index 4930e76f72..e683be723c 100644 --- a/Mage.Sets/src/mage/cards/f/FlameJab.java +++ b/Mage.Sets/src/mage/cards/f/FlameJab.java @@ -44,7 +44,7 @@ public class FlameJab extends CardImpl { public FlameJab(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{R}"); - // Flame Jab deals 1 damage to target creature or player. + // Flame Jab deals 1 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); this.getSpellAbility().addTarget(new TargetAnyTarget()); // Retrace diff --git a/Mage.Sets/src/mage/cards/f/FlameJavelin.java b/Mage.Sets/src/mage/cards/f/FlameJavelin.java index 7eddd4e356..1f02395b51 100644 --- a/Mage.Sets/src/mage/cards/f/FlameJavelin.java +++ b/Mage.Sets/src/mage/cards/f/FlameJavelin.java @@ -44,7 +44,7 @@ public class FlameJavelin extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2/R}{2/R}{2/R}"); - // Flame Javelin deals 4 damage to target creature or player. + // Flame Javelin deals 4 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/f/FlameLash.java b/Mage.Sets/src/mage/cards/f/FlameLash.java index 0bda58c7f2..d7c93d3dfc 100644 --- a/Mage.Sets/src/mage/cards/f/FlameLash.java +++ b/Mage.Sets/src/mage/cards/f/FlameLash.java @@ -43,7 +43,7 @@ public class FlameLash extends CardImpl { public FlameLash(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{R}"); - // Flame Lash deals 4 damage to target creature or player. + // Flame Lash deals 4 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/f/FlameblastDragon.java b/Mage.Sets/src/mage/cards/f/FlameblastDragon.java index bb18982c8e..1157f1a8ec 100644 --- a/Mage.Sets/src/mage/cards/f/FlameblastDragon.java +++ b/Mage.Sets/src/mage/cards/f/FlameblastDragon.java @@ -60,7 +60,7 @@ public class FlameblastDragon extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // Whenever Flameblast Dragon attacks, you may pay {X}{R}. If you do, Flameblast Dragon deals X damage to target creature or player. + // Whenever Flameblast Dragon attacks, you may pay {X}{R}. If you do, Flameblast Dragon deals X damage to any target. Ability ability = new AttacksTriggeredAbility(new FlameblastDragonEffect(), false); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); @@ -80,7 +80,7 @@ class FlameblastDragonEffect extends OneShotEffect { FlameblastDragonEffect() { super(Outcome.Benefit); - staticText = "you may pay {X}{R}. If you do, {this} deals X damage to target creature or player"; + staticText = "you may pay {X}{R}. If you do, {this} deals X damage to any target"; } FlameblastDragonEffect(final FlameblastDragonEffect effect) { @@ -92,7 +92,7 @@ class FlameblastDragonEffect extends OneShotEffect { Player player = game.getPlayer(source.getControllerId()); ManaCosts cost = new ManaCostsImpl("{X}{R}"); if (player != null) { - if (player.chooseUse(Outcome.Damage, "Pay " + cost.getText() + "? If you do, Flameblast Dragon deals X damage to target creature or player", source, game)) { + if (player.chooseUse(Outcome.Damage, "Pay " + cost.getText() + "? If you do, Flameblast Dragon deals X damage to any target", source, game)) { int costX = player.announceXMana(0, Integer.MAX_VALUE, "Announce the value for {X}", game, source); cost.add(new GenericManaCost(costX)); if (cost.pay(source, game, source.getSourceId(), source.getControllerId(), false, null)) { diff --git a/Mage.Sets/src/mage/cards/f/Flamewright.java b/Mage.Sets/src/mage/cards/f/Flamewright.java index 734506a965..6f2b6693d0 100644 --- a/Mage.Sets/src/mage/cards/f/Flamewright.java +++ b/Mage.Sets/src/mage/cards/f/Flamewright.java @@ -74,7 +74,7 @@ public class Flamewright extends CardImpl { ability.addCost(new TapSourceCost()); this.addAbility(ability); - // {tap}, Sacrifice a creature with defender: Flamewright deals 1 damage to target creature or player. + // {tap}, Sacrifice a creature with defender: Flamewright deals 1 damage to any target. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/f/Flare.java b/Mage.Sets/src/mage/cards/f/Flare.java index 6238c723cf..9cf37fcdd7 100644 --- a/Mage.Sets/src/mage/cards/f/Flare.java +++ b/Mage.Sets/src/mage/cards/f/Flare.java @@ -46,7 +46,7 @@ public class Flare extends CardImpl { public Flare(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{R}"); - // Flare deals 1 damage to target creature or player. + // Flare deals 1 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/f/FlayerOfTheHatebound.java b/Mage.Sets/src/mage/cards/f/FlayerOfTheHatebound.java index b3b6ca7e56..75ec723f8e 100644 --- a/Mage.Sets/src/mage/cards/f/FlayerOfTheHatebound.java +++ b/Mage.Sets/src/mage/cards/f/FlayerOfTheHatebound.java @@ -63,7 +63,7 @@ public class FlayerOfTheHatebound extends CardImpl { this.addAbility(new UndyingAbility()); - // Whenever Flayer of the Hatebound or another creature enters the battlefield from your graveyard, that creature deals damage equal to its power to target creature or player. + // Whenever Flayer of the Hatebound or another creature enters the battlefield from your graveyard, that creature deals damage equal to its power to any target. Ability ability = new FlayerTriggeredAbility(); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); @@ -109,7 +109,7 @@ class FlayerTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever Flayer of the Hatebound or another creature enters the battlefield from your graveyard, that creature deals damage equal to its power to target creature or player."; + return "Whenever Flayer of the Hatebound or another creature enters the battlefield from your graveyard, that creature deals damage equal to its power to any target."; } @Override @@ -122,7 +122,7 @@ class FlayerEffect extends OneShotEffect { public FlayerEffect() { super(Outcome.Damage); - staticText = "that creature deals damage equal to its power to target creature or player"; + staticText = "that creature deals damage equal to its power to any target"; } public FlayerEffect(final FlayerEffect effect) { diff --git a/Mage.Sets/src/mage/cards/f/FledglingMawcor.java b/Mage.Sets/src/mage/cards/f/FledglingMawcor.java index 46205b62c0..98761a4503 100644 --- a/Mage.Sets/src/mage/cards/f/FledglingMawcor.java +++ b/Mage.Sets/src/mage/cards/f/FledglingMawcor.java @@ -58,7 +58,7 @@ public class FledglingMawcor extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // {tap}: Fledgling Mawcor deals 1 damage to target creature or player. + // {tap}: Fledgling Mawcor deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FleshBlood.java b/Mage.Sets/src/mage/cards/f/FleshBlood.java index 7162dcf7e8..6fcc518946 100644 --- a/Mage.Sets/src/mage/cards/f/FleshBlood.java +++ b/Mage.Sets/src/mage/cards/f/FleshBlood.java @@ -61,7 +61,7 @@ public class FleshBlood extends SplitCard { getLeftHalfCard().getSpellAbility().addEffect(new FleshEffect()); // Blood - // Target creature you control deals damage equal to its power to target creature or player. + // Target creature you control deals damage equal to its power to any target. getRightHalfCard().getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); getRightHalfCard().getSpellAbility().addTarget(new TargetAnyTarget()); getRightHalfCard().getSpellAbility().addEffect(new BloodEffect()); @@ -117,7 +117,7 @@ class BloodEffect extends OneShotEffect { public BloodEffect() { super(Outcome.Damage); - staticText = "Target creature you control deals damage equal to its power to target creature or player"; + staticText = "Target creature you control deals damage equal to its power to any target"; } public BloodEffect(final BloodEffect effect) { diff --git a/Mage.Sets/src/mage/cards/f/Fling.java b/Mage.Sets/src/mage/cards/f/Fling.java index 35f2cd5254..f428d5b989 100644 --- a/Mage.Sets/src/mage/cards/f/Fling.java +++ b/Mage.Sets/src/mage/cards/f/Fling.java @@ -49,7 +49,7 @@ public class Fling extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{R}"); Effect effect = new DamageTargetEffect(new SacrificeCostCreaturesPower()); - effect.setText("{this} deals damage equal to the sacrificed creature's power to target creature or player"); + effect.setText("{this} deals damage equal to the sacrificed creature's power to any target"); this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/f/FloweringField.java b/Mage.Sets/src/mage/cards/f/FloweringField.java index 0d5ddfbc3f..e909164cae 100644 --- a/Mage.Sets/src/mage/cards/f/FloweringField.java +++ b/Mage.Sets/src/mage/cards/f/FloweringField.java @@ -60,11 +60,11 @@ public class FloweringField extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // Enchanted land has "{T}: Prevent the next 1 damage that would be dealt to target creature or player this turn." + // Enchanted land has "{T}: Prevent the next 1 damage that would be dealt to any target this turn." ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); - effect.setText("Enchanted land has \"{T}: Prevent the next 1 damage that would be dealt to target creature or player this turn.\""); + effect.setText("Enchanted land has \"{T}: Prevent the next 1 damage that would be dealt to any target this turn.\""); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } diff --git a/Mage.Sets/src/mage/cards/f/ForceDrain.java b/Mage.Sets/src/mage/cards/f/ForceDrain.java index 970d7c9adc..c4cf51ada8 100644 --- a/Mage.Sets/src/mage/cards/f/ForceDrain.java +++ b/Mage.Sets/src/mage/cards/f/ForceDrain.java @@ -49,7 +49,7 @@ public class ForceDrain extends CardImpl { public ForceDrain(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{B}"); - // ForceDrain deals 2 damage to target creature or player. If player was dealt damage this way, you gain 2 life. + // ForceDrain deals 2 damage to any target. If player was dealt damage this way, you gain 2 life. this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new ForceDrainEffect()); @@ -71,7 +71,7 @@ class ForceDrainEffect extends OneShotEffect { public ForceDrainEffect() { super(Outcome.Damage); - this.staticText = "ForceDrain deals 2 damage to target creature or player. If player was dealt damage this way, you gain 2 life"; + this.staticText = "ForceDrain deals 2 damage to any target. If player was dealt damage this way, you gain 2 life"; } public ForceDrainEffect(final ForceDrainEffect effect) { diff --git a/Mage.Sets/src/mage/cards/f/ForceHealing.java b/Mage.Sets/src/mage/cards/f/ForceHealing.java index ba2344977f..34aac29fbd 100644 --- a/Mage.Sets/src/mage/cards/f/ForceHealing.java +++ b/Mage.Sets/src/mage/cards/f/ForceHealing.java @@ -45,7 +45,7 @@ public class ForceHealing extends CardImpl { public ForceHealing(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{W}"); - // Prevent the next 4 damage that would be dealt to target creature or player this turn. + // Prevent the next 4 damage that would be dealt to any target this turn. this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, 4)); this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/f/ForceLightning.java b/Mage.Sets/src/mage/cards/f/ForceLightning.java index 8e59a551ce..8efea5082c 100644 --- a/Mage.Sets/src/mage/cards/f/ForceLightning.java +++ b/Mage.Sets/src/mage/cards/f/ForceLightning.java @@ -49,7 +49,7 @@ public class ForceLightning extends CardImpl { public ForceLightning(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{X}{R}{R}"); - // Force Lightning deals X damage to target creature or player. + // Force Lightning deals X damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/f/ForceSpark.java b/Mage.Sets/src/mage/cards/f/ForceSpark.java index a27764df9e..0cdb67d810 100644 --- a/Mage.Sets/src/mage/cards/f/ForceSpark.java +++ b/Mage.Sets/src/mage/cards/f/ForceSpark.java @@ -44,7 +44,7 @@ public class ForceSpark extends CardImpl { public ForceSpark(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{R}"); - // Force Spark deals 1 damage to target creature or player. + // Force Spark deals 1 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/f/ForgebornOreads.java b/Mage.Sets/src/mage/cards/f/ForgebornOreads.java index 3454e9ff59..735f30ca9d 100644 --- a/Mage.Sets/src/mage/cards/f/ForgebornOreads.java +++ b/Mage.Sets/src/mage/cards/f/ForgebornOreads.java @@ -51,7 +51,7 @@ public class ForgebornOreads extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(2); - // Constellation - Whenever Forgeborn Oreads or another enchantment enters the battlefield under your control, Forgeborn Oreads deals 1 damage to target creature or player. + // Constellation - Whenever Forgeborn Oreads or another enchantment enters the battlefield under your control, Forgeborn Oreads deals 1 damage to any target. Ability ability = new ConstellationAbility(new DamageTargetEffect(1)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FormOfTheDragon.java b/Mage.Sets/src/mage/cards/f/FormOfTheDragon.java index 19a2c82b58..5fd32482ee 100644 --- a/Mage.Sets/src/mage/cards/f/FormOfTheDragon.java +++ b/Mage.Sets/src/mage/cards/f/FormOfTheDragon.java @@ -62,7 +62,7 @@ public class FormOfTheDragon extends CardImpl { public FormOfTheDragon(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{4}{R}{R}{R}"); - // At the beginning of your upkeep, Form of the Dragon deals 5 damage to target creature or player. + // At the beginning of your upkeep, Form of the Dragon deals 5 damage to any target. Ability ability = new BeginningOfUpkeepTriggeredAbility(new DamageTargetEffect(5), TargetController.YOU, false); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FoundryChampion.java b/Mage.Sets/src/mage/cards/f/FoundryChampion.java index f6a35d564a..7b524de3b4 100644 --- a/Mage.Sets/src/mage/cards/f/FoundryChampion.java +++ b/Mage.Sets/src/mage/cards/f/FoundryChampion.java @@ -61,7 +61,7 @@ public class FoundryChampion extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); - //When Foundry Champion enters the battlefield, it deals damage to target creature or player equal to the number of creatures you control. + //When Foundry Champion enters the battlefield, it deals damage to any target equal to the number of creatures you control. Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent()), "it")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/Frostwielder.java b/Mage.Sets/src/mage/cards/f/Frostwielder.java index f4fdcdc35d..69ef1f827b 100644 --- a/Mage.Sets/src/mage/cards/f/Frostwielder.java +++ b/Mage.Sets/src/mage/cards/f/Frostwielder.java @@ -58,7 +58,7 @@ public class Frostwielder extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - // {T}: Frostwielder deals 1 damage to target creature or player. + // {T}: Frostwielder deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FurystokeGiant.java b/Mage.Sets/src/mage/cards/f/FurystokeGiant.java index ea836d2f25..f196f4920d 100644 --- a/Mage.Sets/src/mage/cards/f/FurystokeGiant.java +++ b/Mage.Sets/src/mage/cards/f/FurystokeGiant.java @@ -58,11 +58,11 @@ public class FurystokeGiant extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - // When Furystoke Giant enters the battlefield, other creatures you control gain "{tap}: This creature deals 2 damage to target creature or player" until end of turn. + // When Furystoke Giant enters the battlefield, other creatures you control gain "{tap}: This creature deals 2 damage to any target" until end of turn. SimpleActivatedAbility FurystokeGiantAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); FurystokeGiantAbility.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAllEffect(FurystokeGiantAbility, Duration.EndOfTurn, new FilterControlledCreaturePermanent("other creatures"), true); - effect.setText("other creatures you control gain \"{T}: This creature deals 2 damage to target creature or player.\" until end of turn."); + effect.setText("other creatures you control gain \"{T}: This creature deals 2 damage to any target.\" until end of turn."); this.addAbility(new EntersBattlefieldTriggeredAbility(effect)); // Persist diff --git a/Mage.Sets/src/mage/cards/g/GalvanicArc.java b/Mage.Sets/src/mage/cards/g/GalvanicArc.java index 95e97d7639..d15d0e6558 100644 --- a/Mage.Sets/src/mage/cards/g/GalvanicArc.java +++ b/Mage.Sets/src/mage/cards/g/GalvanicArc.java @@ -64,7 +64,7 @@ public class GalvanicArc extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // When Galvanic Arc enters the battlefield, it deals 3 damage to target creature or player. + // When Galvanic Arc enters the battlefield, it deals 3 damage to any target. Ability triggeredAbility = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(3, "it")); triggeredAbility.addTarget(new TargetAnyTarget()); this.addAbility(triggeredAbility); diff --git a/Mage.Sets/src/mage/cards/g/GalvanicBlast.java b/Mage.Sets/src/mage/cards/g/GalvanicBlast.java index b392101c1c..ce192f0709 100644 --- a/Mage.Sets/src/mage/cards/g/GalvanicBlast.java +++ b/Mage.Sets/src/mage/cards/g/GalvanicBlast.java @@ -48,7 +48,7 @@ public class GalvanicBlast extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{R}"); this.color.setRed(true); - // Galvanic Blast deals 2 damage to target creature or player. + // Galvanic Blast deals 2 damage to any target. // Metalcraft - Galvanic Blast deals 4 damage to that creature or player instead if you control three or more artifacts. this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new DamageTargetEffect(4), new DamageTargetEffect(2), MetalcraftCondition.instance, effectText)); this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/g/Geistblast.java b/Mage.Sets/src/mage/cards/g/Geistblast.java index 89e20941a9..413e1509fe 100644 --- a/Mage.Sets/src/mage/cards/g/Geistblast.java +++ b/Mage.Sets/src/mage/cards/g/Geistblast.java @@ -64,7 +64,7 @@ public class Geistblast extends CardImpl { public Geistblast(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{R}"); - // Geistblast deals 2 damage to target creature or player. + // Geistblast deals 2 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/g/Geistflame.java b/Mage.Sets/src/mage/cards/g/Geistflame.java index c9c483f20b..47b4497182 100644 --- a/Mage.Sets/src/mage/cards/g/Geistflame.java +++ b/Mage.Sets/src/mage/cards/g/Geistflame.java @@ -46,7 +46,7 @@ public class Geistflame extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{R}"); - // Geistflame deals 1 damage to target creature or player. + // Geistflame deals 1 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/g/GhirapurAetherGrid.java b/Mage.Sets/src/mage/cards/g/GhirapurAetherGrid.java index b3424aa421..655b1792ae 100644 --- a/Mage.Sets/src/mage/cards/g/GhirapurAetherGrid.java +++ b/Mage.Sets/src/mage/cards/g/GhirapurAetherGrid.java @@ -58,7 +58,7 @@ public class GhirapurAetherGrid extends CardImpl { public GhirapurAetherGrid(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}"); - // Tap two untaped artifacts you control: Ghirapur Aether Grid deals 1 damage to target creature or player + // Tap two untaped artifacts you control: Ghirapur Aether Grid deals 1 damage to any target SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapTargetCost(new TargetControlledPermanent(2, 2, filter, true))); diff --git a/Mage.Sets/src/mage/cards/g/GhituFire.java b/Mage.Sets/src/mage/cards/g/GhituFire.java index 3d796ed8f6..f5c4ccc856 100644 --- a/Mage.Sets/src/mage/cards/g/GhituFire.java +++ b/Mage.Sets/src/mage/cards/g/GhituFire.java @@ -56,7 +56,7 @@ public class GhituFire extends CardImpl { ability.addTarget(new TargetAnyTarget()); ability.setRuleAtTheTop(true); this.addAbility(ability); - // Ghitu Fire deals X damage to target creature or player. + // Ghitu Fire deals X damage to any target. this.getSpellAbility().addEffect(effect); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/g/GhituFireEater.java b/Mage.Sets/src/mage/cards/g/GhituFireEater.java index 1ddffeff8d..fd93501d4a 100644 --- a/Mage.Sets/src/mage/cards/g/GhituFireEater.java +++ b/Mage.Sets/src/mage/cards/g/GhituFireEater.java @@ -56,7 +56,7 @@ public class GhituFireEater extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // {T}, Sacrifice Ghitu Fire-Eater: Ghitu Fire-Eater deals damage equal to its power to target creature or player. + // {T}, Sacrifice Ghitu Fire-Eater: Ghitu Fire-Eater deals damage equal to its power to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new SourcePermanentPowerCount()), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/g/GhituSlinger.java b/Mage.Sets/src/mage/cards/g/GhituSlinger.java index db47e3c735..05ecf226d7 100644 --- a/Mage.Sets/src/mage/cards/g/GhituSlinger.java +++ b/Mage.Sets/src/mage/cards/g/GhituSlinger.java @@ -55,7 +55,7 @@ public class GhituSlinger extends CardImpl { // Echo {2}{R} this.addAbility(new EchoAbility("{2}{R}")); - // When Ghitu Slinger enters the battlefield, it deals 2 damage to target creature or player. + // When Ghitu Slinger enters the battlefield, it deals 2 damage to any target. Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(2, "it"), false); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/Ghostfire.java b/Mage.Sets/src/mage/cards/g/Ghostfire.java index 1ad03fe7e2..5fdadfaec3 100644 --- a/Mage.Sets/src/mage/cards/g/Ghostfire.java +++ b/Mage.Sets/src/mage/cards/g/Ghostfire.java @@ -49,7 +49,7 @@ public class Ghostfire extends CardImpl { this.color = new ObjectColor(); this.getSpellAbility().addEffect(new InfoEffect("{this} is colorless")); - // Ghostfire deals 3 damage to target creature or player. + // Ghostfire deals 3 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/g/GlacialRay.java b/Mage.Sets/src/mage/cards/g/GlacialRay.java index 01f0bc85b9..998201142e 100644 --- a/Mage.Sets/src/mage/cards/g/GlacialRay.java +++ b/Mage.Sets/src/mage/cards/g/GlacialRay.java @@ -48,7 +48,7 @@ public class GlacialRay extends CardImpl { this.subtype.add(SubType.ARCANE); - // Glacial Ray deals 2 damage to target creature or player. + // Glacial Ray deals 2 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellAbility().addTarget(new TargetAnyTarget()); // Splice onto Arcane {1}{R} diff --git a/Mage.Sets/src/mage/cards/g/GoblinArsonist.java b/Mage.Sets/src/mage/cards/g/GoblinArsonist.java index 4c84048efd..d1a09a2124 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinArsonist.java +++ b/Mage.Sets/src/mage/cards/g/GoblinArsonist.java @@ -52,7 +52,7 @@ public class GoblinArsonist extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // When Goblin Arsonist dies, you may have it deal 1 damage to target creature or player. + // When Goblin Arsonist dies, you may have it deal 1 damage to any target. Ability ability = new DiesTriggeredAbility(new DamageTargetEffect(1), true); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GoblinBangchuckers.java b/Mage.Sets/src/mage/cards/g/GoblinBangchuckers.java index 5848a15459..48827879b1 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBangchuckers.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBangchuckers.java @@ -58,7 +58,7 @@ public class GoblinBangchuckers extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // {T}: Flip a coin. If you win the flip, Goblin Bangchuckers deals 2 damage to target creature or player. If you lose the flip, Goblin Bangchuckers deals 2 damage to itself. + // {T}: Flip a coin. If you win the flip, Goblin Bangchuckers deals 2 damage to any target. If you lose the flip, Goblin Bangchuckers deals 2 damage to itself. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GoblinBangchuckersEffect(), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); @@ -78,7 +78,7 @@ class GoblinBangchuckersEffect extends OneShotEffect { public GoblinBangchuckersEffect() { super(Outcome.Damage); - staticText = "Flip a coin. If you win the flip, {this} deals 2 damage to target creature or player. If you lose the flip, {this} deals 2 damage to itself"; + staticText = "Flip a coin. If you win the flip, {this} deals 2 damage to any target. If you lose the flip, {this} deals 2 damage to itself"; } public GoblinBangchuckersEffect(GoblinBangchuckersEffect effect) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinBoomKeg.java b/Mage.Sets/src/mage/cards/g/GoblinBoomKeg.java index 8ebcf88464..11cd0bf93b 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBoomKeg.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBoomKeg.java @@ -52,7 +52,7 @@ public class GoblinBoomKeg extends CardImpl { // At the beginning of your upkeep, sacrifice Goblin Boom Keg. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceEffect(), TargetController.YOU, false)); - // When Goblin Boom Keg is put into a graveyard from the battlefield, it deals 3 damage to target creature or player. + // When Goblin Boom Keg is put into a graveyard from the battlefield, it deals 3 damage to any target. Ability ability = new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new DamageTargetEffect(3, "it"), false); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GoblinCannon.java b/Mage.Sets/src/mage/cards/g/GoblinCannon.java index 6e542c4949..b87d7602ad 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinCannon.java +++ b/Mage.Sets/src/mage/cards/g/GoblinCannon.java @@ -48,7 +48,7 @@ public class GoblinCannon extends CardImpl { public GoblinCannon(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); - // {2}: Goblin Cannon deals 1 damage to target creature or player. Sacrifice Goblin Cannon. + // {2}: Goblin Cannon deals 1 damage to any target. Sacrifice Goblin Cannon. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{2}")); ability.addTarget(new TargetAnyTarget()); ability.addEffect(new SacrificeSourceEffect()); diff --git a/Mage.Sets/src/mage/cards/g/GoblinCharbelcher.java b/Mage.Sets/src/mage/cards/g/GoblinCharbelcher.java index b2d1cff789..3150d6d44f 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinCharbelcher.java +++ b/Mage.Sets/src/mage/cards/g/GoblinCharbelcher.java @@ -54,7 +54,7 @@ public class GoblinCharbelcher extends CardImpl { public GoblinCharbelcher(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); - // {3}, {tap}: Reveal cards from the top of your library until you reveal a land card. Goblin Charbelcher deals damage equal to the number of nonland cards revealed this way to target creature or player. If the revealed land card was a Mountain, Goblin Charbelcher deals double that damage instead. Put the revealed cards on the bottom of your library in any order. + // {3}, {tap}: Reveal cards from the top of your library until you reveal a land card. Goblin Charbelcher deals damage equal to the number of nonland cards revealed this way to any target. If the revealed land card was a Mountain, Goblin Charbelcher deals double that damage instead. Put the revealed cards on the bottom of your library in any order. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GoblinCharbelcherEffect(), new ManaCostsImpl("{3}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); @@ -75,7 +75,7 @@ class GoblinCharbelcherEffect extends OneShotEffect { public GoblinCharbelcherEffect() { super(Outcome.Damage); - this.staticText = "Reveal cards from the top of your library until you reveal a land card. {this} deals damage equal to the number of nonland cards revealed this way to target creature or player. If the revealed land card was a Mountain, {this} deals double that damage instead. Put the revealed cards on the bottom of your library in any order"; + this.staticText = "Reveal cards from the top of your library until you reveal a land card. {this} deals damage equal to the number of nonland cards revealed this way to any target. If the revealed land card was a Mountain, {this} deals double that damage instead. Put the revealed cards on the bottom of your library in any order"; } public GoblinCharbelcherEffect(final GoblinCharbelcherEffect effect) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinDynamo.java b/Mage.Sets/src/mage/cards/g/GoblinDynamo.java index f06ce5f1ee..60eb5c10cf 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinDynamo.java +++ b/Mage.Sets/src/mage/cards/g/GoblinDynamo.java @@ -55,12 +55,12 @@ public class GoblinDynamo extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); - // {T}: Goblin Dynamo deals 1 damage to target creature or player. + // {T}: Goblin Dynamo deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); - //{X}{R}, {T}, Sacrifice Goblin Dynamo: Goblin Dynamo deals X damage to target creature or player. + //{X}{R}, {T}, Sacrifice Goblin Dynamo: Goblin Dynamo deals X damage to any target. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,new DamageTargetEffect(new ManacostVariableValue()), new ManaCostsImpl("{X}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/g/GoblinFestival.java b/Mage.Sets/src/mage/cards/g/GoblinFestival.java index 1d3af437a7..55852a15ac 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinFestival.java +++ b/Mage.Sets/src/mage/cards/g/GoblinFestival.java @@ -56,7 +56,7 @@ public class GoblinFestival extends CardImpl { public GoblinFestival(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{R}"); - // {2}: Goblin Festival deals 1 damage to target creature or player. Flip a coin. If you lose the flip, choose one of your opponents. That player gains control of Goblin Festival. + // {2}: Goblin Festival deals 1 damage to any target. Flip a coin. If you lose the flip, choose one of your opponents. That player gains control of Goblin Festival. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{2}")); ability.addTarget(new TargetAnyTarget()); ability.addEffect(new GoblinFestivalChangeControlEffect()); diff --git a/Mage.Sets/src/mage/cards/g/GoblinFirestarter.java b/Mage.Sets/src/mage/cards/g/GoblinFirestarter.java index 6c60dd2354..1cf2307c13 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinFirestarter.java +++ b/Mage.Sets/src/mage/cards/g/GoblinFirestarter.java @@ -53,7 +53,7 @@ public class GoblinFirestarter extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // Sacrifice Goblin Firestarter: Goblin Firestarter deals 1 damage to target creature or player. Activate this ability only during your turn, before attackers are declared. + // Sacrifice Goblin Firestarter: Goblin Firestarter deals 1 damage to any target. Activate this ability only during your turn, before attackers are declared. Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeSourceCost(), MyTurnBeforeAttackersDeclaredCondition.instance); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/g/GoblinMedics.java b/Mage.Sets/src/mage/cards/g/GoblinMedics.java index 334c653f4f..3c5837afcf 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinMedics.java +++ b/Mage.Sets/src/mage/cards/g/GoblinMedics.java @@ -52,7 +52,7 @@ public class GoblinMedics extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // Whenever Goblin Medics becomes tapped, it deals 1 damage to target creature or player. + // Whenever Goblin Medics becomes tapped, it deals 1 damage to any target. Ability ability = new BecomesTappedSourceTriggeredAbility(new DamageTargetEffect(1, "it")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GoblinSharpshooter.java b/Mage.Sets/src/mage/cards/g/GoblinSharpshooter.java index 6c5aece78b..a3826b8754 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinSharpshooter.java +++ b/Mage.Sets/src/mage/cards/g/GoblinSharpshooter.java @@ -61,7 +61,7 @@ public class GoblinSharpshooter extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); // Whenever a creature dies, untap Goblin Sharpshooter. this.addAbility(new DiesCreatureTriggeredAbility(new UntapSourceEffect(), false)); - // {T}: Goblin Sharpshooter deals 1 damage to target creature or player. + // {T}: Goblin Sharpshooter deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GoblinTestPilot.java b/Mage.Sets/src/mage/cards/g/GoblinTestPilot.java index fe3b037d42..304e900366 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinTestPilot.java +++ b/Mage.Sets/src/mage/cards/g/GoblinTestPilot.java @@ -59,7 +59,7 @@ public class GoblinTestPilot extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // {tap}: Goblin Test Pilot deals 2 damage to target creature or player chosen at random. + // {tap}: Goblin Test Pilot deals 2 damage to any target chosen at random. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); Target target = new TargetAnyTarget(); target.setRandom(true); diff --git a/Mage.Sets/src/mage/cards/g/GrabTheReins.java b/Mage.Sets/src/mage/cards/g/GrabTheReins.java index f70ac33217..6bae8aa5c6 100644 --- a/Mage.Sets/src/mage/cards/g/GrabTheReins.java +++ b/Mage.Sets/src/mage/cards/g/GrabTheReins.java @@ -71,7 +71,7 @@ public class GrabTheReins extends CardImpl { TargetCreaturePermanent target = new TargetCreaturePermanent(); target.setTargetName("a creature to take control of"); this.getSpellAbility().addTarget(target); - // or sacrifice a creature, then Grab the Reins deals damage equal to that creature's power to target creature or player. + // or sacrifice a creature, then Grab the Reins deals damage equal to that creature's power to any target. Mode mode = new Mode(); mode.getEffects().add(new GrabTheReinsEffect()); TargetAnyTarget target2 = new TargetAnyTarget(); @@ -97,7 +97,7 @@ class GrabTheReinsEffect extends OneShotEffect { public GrabTheReinsEffect() { super(Outcome.Damage); - staticText = "sacrifice a creature. {this} deals damage equal to the sacrificed creature's power to target creature or player"; + staticText = "sacrifice a creature. {this} deals damage equal to the sacrificed creature's power to any target"; } public GrabTheReinsEffect(final GrabTheReinsEffect effect) { diff --git a/Mage.Sets/src/mage/cards/g/GrangerGuildmage.java b/Mage.Sets/src/mage/cards/g/GrangerGuildmage.java index 6e81acad5e..cb958893bb 100644 --- a/Mage.Sets/src/mage/cards/g/GrangerGuildmage.java +++ b/Mage.Sets/src/mage/cards/g/GrangerGuildmage.java @@ -59,7 +59,7 @@ public class GrangerGuildmage extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // {R}, {tap}: Granger Guildmage deals 1 damage to target creature or player and 1 damage to you. + // {R}, {tap}: Granger Guildmage deals 1 damage to any target and 1 damage to you. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{R}")); ability.addCost(new TapSourceCost()); ability.addEffect(new DamageControllerEffect(1)); diff --git a/Mage.Sets/src/mage/cards/g/GraniteShard.java b/Mage.Sets/src/mage/cards/g/GraniteShard.java index a9d1d55bed..e304e2eb0f 100644 --- a/Mage.Sets/src/mage/cards/g/GraniteShard.java +++ b/Mage.Sets/src/mage/cards/g/GraniteShard.java @@ -48,7 +48,7 @@ public class GraniteShard extends CardImpl { public GraniteShard(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); - // {3}, {tap} or {R}, {tap}: Granite Shard deals 1 damage to target creature or player. + // {3}, {tap} or {R}, {tap}: Granite Shard deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{3}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/g/Grapeshot.java b/Mage.Sets/src/mage/cards/g/Grapeshot.java index f56e14ff61..ab3104e432 100644 --- a/Mage.Sets/src/mage/cards/g/Grapeshot.java +++ b/Mage.Sets/src/mage/cards/g/Grapeshot.java @@ -45,7 +45,7 @@ public class Grapeshot extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{R}"); - // Grapeshot deals 1 damage to target creature or player. + // Grapeshot deals 1 damage to any target. this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DamageTargetEffect(1)); // Storm diff --git a/Mage.Sets/src/mage/cards/g/GuardianAngel.java b/Mage.Sets/src/mage/cards/g/GuardianAngel.java index f3a2f0fcd9..23156c9878 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianAngel.java +++ b/Mage.Sets/src/mage/cards/g/GuardianAngel.java @@ -59,7 +59,7 @@ public class GuardianAngel extends CardImpl { public GuardianAngel(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{X}{W}"); - // Prevent the next X damage that would be dealt to target creature or player this turn. Until end of turn, you may pay {1} any time you could cast an instant. If you do, prevent the next 1 damage that would be dealt to that creature or player this turn. + // Prevent the next X damage that would be dealt to any target this turn. Until end of turn, you may pay {1} any time you could cast an instant. If you do, prevent the next 1 damage that would be dealt to that creature or player this turn. this.getSpellAbility().addEffect(new GuardianAngelEffect()); this.getSpellAbility().addTarget(new TargetAnyTarget()); } @@ -110,7 +110,7 @@ class GuardianAngelEffect extends OneShotEffect { game.addEffect(effect, source); SpecialAction specialAction = new GuardianAngelAction(); specialAction.getEffects().get(0).setTargetPointer(getTargetPointer()); - specialAction.getEffects().get(0).setText("Prevent the next 1 damage that would be dealt to target creature or player this turn (" + targetName + ")."); + specialAction.getEffects().get(0).setText("Prevent the next 1 damage that would be dealt to any target this turn (" + targetName + ")."); new CreateSpecialActionEffect(specialAction).apply(game, source); // Create a hidden delayed triggered ability to remove the special action at end of turn. new CreateDelayedTriggeredAbilityEffect(new GuardianAngelDelayedTriggeredAbility(specialAction.getId()), false).apply(game, source); diff --git a/Mage.Sets/src/mage/cards/g/GuerrillaTactics.java b/Mage.Sets/src/mage/cards/g/GuerrillaTactics.java index dd4146381e..7d539dc0b8 100644 --- a/Mage.Sets/src/mage/cards/g/GuerrillaTactics.java +++ b/Mage.Sets/src/mage/cards/g/GuerrillaTactics.java @@ -45,11 +45,11 @@ public class GuerrillaTactics extends CardImpl { public GuerrillaTactics(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{R}"); - // Guerrilla Tactics deals 2 damage to target creature or player. + // Guerrilla Tactics deals 2 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellAbility().addTarget(new TargetAnyTarget()); - // When a spell or ability an opponent controls causes you to discard Guerrilla Tactics, Guerrilla Tactics deals 4 damage to target creature or player. + // When a spell or ability an opponent controls causes you to discard Guerrilla Tactics, Guerrilla Tactics deals 4 damage to any target. Ability ability = new DiscardedByOpponentTriggerAbility(new DamageTargetEffect(4)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HallowedHealer.java b/Mage.Sets/src/mage/cards/h/HallowedHealer.java index 91a64c27d3..d863fff218 100644 --- a/Mage.Sets/src/mage/cards/h/HallowedHealer.java +++ b/Mage.Sets/src/mage/cards/h/HallowedHealer.java @@ -59,11 +59,11 @@ public class HallowedHealer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // {tap}: Prevent the next 2 damage that would be dealt to target creature or player this turn. + // {tap}: Prevent the next 2 damage that would be dealt to any target this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn,2), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); - // Threshold - {tap}: Prevent the next 4 damage that would be dealt to target creature or player this turn. Activate this ability only if seven or more cards are in your graveyard. + // Threshold - {tap}: Prevent the next 4 damage that would be dealt to any target this turn. Activate this ability only if seven or more cards are in your graveyard. Ability thresholdAbility = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 4), new TapSourceCost(), diff --git a/Mage.Sets/src/mage/cards/h/HammerOfBogardan.java b/Mage.Sets/src/mage/cards/h/HammerOfBogardan.java index 601d722a81..f51762f250 100644 --- a/Mage.Sets/src/mage/cards/h/HammerOfBogardan.java +++ b/Mage.Sets/src/mage/cards/h/HammerOfBogardan.java @@ -51,7 +51,7 @@ public class HammerOfBogardan extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{R}{R}"); - // Hammer of Bogardan deals 3 damage to target creature or player. + // Hammer of Bogardan deals 3 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/h/Hankyu.java b/Mage.Sets/src/mage/cards/h/Hankyu.java index 2536382f13..d68b955af2 100644 --- a/Mage.Sets/src/mage/cards/h/Hankyu.java +++ b/Mage.Sets/src/mage/cards/h/Hankyu.java @@ -67,7 +67,7 @@ public class Hankyu extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability1, AttachmentType.EQUIPMENT))); /* "{T}, Remove all aim counters from Hankyu: This creature deals - * damage to target creature or player equal to the number of + * damage to any target equal to the number of * aim counters removed this way." */ SimpleActivatedAbility ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HankyuDealsDamageEffect(), new TapSourceCost()); ability2.addCost(new HankyuCountersSourceCost(this.getId())); @@ -125,7 +125,7 @@ class HankyuDealsDamageEffect extends OneShotEffect { public HankyuDealsDamageEffect() { super(Outcome.Damage); - staticText = "This creature deals damage to target creature or player equal to the number of aim counters removed this way"; + staticText = "This creature deals damage to any target equal to the number of aim counters removed this way"; } public HankyuDealsDamageEffect(final HankyuDealsDamageEffect effect) { diff --git a/Mage.Sets/src/mage/cards/h/HarmsWay.java b/Mage.Sets/src/mage/cards/h/HarmsWay.java index c03a1aae85..cd2214e697 100644 --- a/Mage.Sets/src/mage/cards/h/HarmsWay.java +++ b/Mage.Sets/src/mage/cards/h/HarmsWay.java @@ -52,7 +52,7 @@ public class HarmsWay extends CardImpl { public HarmsWay(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{W}"); - // The next 2 damage that a source of your choice would deal to you and/or permanents you control this turn is dealt to target creature or player instead. + // The next 2 damage that a source of your choice would deal to you and/or permanents you control this turn is dealt to any target instead. this.getSpellAbility().addEffect(new HarmsWayPreventDamageTargetEffect()); this.getSpellAbility().addTarget(new TargetAnyTarget()); } @@ -73,7 +73,7 @@ class HarmsWayPreventDamageTargetEffect extends RedirectionEffect { public HarmsWayPreventDamageTargetEffect() { super(Duration.EndOfTurn, 2, true); - staticText = "The next 2 damage that a source of your choice would deal to you and/or permanents you control this turn is dealt to target creature or player instead"; + staticText = "The next 2 damage that a source of your choice would deal to you and/or permanents you control this turn is dealt to any target instead"; this.damageSource = new TargetSource(); } diff --git a/Mage.Sets/src/mage/cards/h/HarshSustenance.java b/Mage.Sets/src/mage/cards/h/HarshSustenance.java index 030600bc00..d3637d9e15 100644 --- a/Mage.Sets/src/mage/cards/h/HarshSustenance.java +++ b/Mage.Sets/src/mage/cards/h/HarshSustenance.java @@ -48,10 +48,10 @@ public class HarshSustenance extends CardImpl { public HarshSustenance(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{W}{B}"); - // Harsh Sustenance deals X damage to target creature or player and you gain X life, where X is the number of creatures you control. + // Harsh Sustenance deals X damage to any target and you gain X life, where X is the number of creatures you control. DynamicValue xValue = new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent()); Effect effect = new DamageTargetEffect(xValue); - effect.setText("{this} deals X damage to target creature or player"); + effect.setText("{this} deals X damage to any target"); getSpellAbility().addEffect(effect); getSpellAbility().addTarget(new TargetAnyTarget()); effect = new GainLifeEffect(xValue); diff --git a/Mage.Sets/src/mage/cards/h/HatchetBully.java b/Mage.Sets/src/mage/cards/h/HatchetBully.java index ac12bea9c7..155ff22eaf 100644 --- a/Mage.Sets/src/mage/cards/h/HatchetBully.java +++ b/Mage.Sets/src/mage/cards/h/HatchetBully.java @@ -64,7 +64,7 @@ public class HatchetBully extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - // {2}{R}, {tap}, Put a -1/-1 counter on a creature you control: Hatchet Bully deals 2 damage to target creature or player. + // {2}{R}, {tap}, Put a -1/-1 counter on a creature you control: Hatchet Bully deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HatchetBullyEffect(), new ManaCostsImpl("{2}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new HatchetBullyCost()); @@ -121,7 +121,7 @@ class HatchetBullyEffect extends OneShotEffect { public HatchetBullyEffect() { super(Outcome.Damage); - staticText = "{this} deals 2 damage to target creature or player"; + staticText = "{this} deals 2 damage to any target"; } public HatchetBullyEffect(final HatchetBullyEffect effect) { diff --git a/Mage.Sets/src/mage/cards/h/Hateflayer.java b/Mage.Sets/src/mage/cards/h/Hateflayer.java index 1edba3201d..edfe0240a8 100644 --- a/Mage.Sets/src/mage/cards/h/Hateflayer.java +++ b/Mage.Sets/src/mage/cards/h/Hateflayer.java @@ -59,7 +59,7 @@ public class Hateflayer extends CardImpl { // Wither this.addAbility(WitherAbility.getInstance()); - // {2}{R}, {untap}: Hateflayer deals damage equal to its power to target creature or player. + // {2}{R}, {untap}: Hateflayer deals damage equal to its power to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new SourcePermanentPowerCount()), new ManaCostsImpl("{2}{R}")); ability.addCost(new UntapSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/h/Heal.java b/Mage.Sets/src/mage/cards/h/Heal.java index 872c2aaf03..a109589c36 100644 --- a/Mage.Sets/src/mage/cards/h/Heal.java +++ b/Mage.Sets/src/mage/cards/h/Heal.java @@ -47,7 +47,7 @@ public class Heal extends CardImpl { public Heal(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{W}"); - // Prevent the next 1 damage that would be dealt to target creature or player this turn. + // Prevent the next 1 damage that would be dealt to any target this turn. // Draw a card at the beginning of the next turn's upkeep. this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1)); this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new AtTheBeginOfNextUpkeepDelayedTriggeredAbility(new DrawCardSourceControllerEffect(1)), false)); diff --git a/Mage.Sets/src/mage/cards/h/HealersHeaddress.java b/Mage.Sets/src/mage/cards/h/HealersHeaddress.java index ce52d24006..71d4477210 100644 --- a/Mage.Sets/src/mage/cards/h/HealersHeaddress.java +++ b/Mage.Sets/src/mage/cards/h/HealersHeaddress.java @@ -61,14 +61,14 @@ public class HealersHeaddress extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); this.subtype.add(SubType.EQUIPMENT); - // Equipped creature gets +0/+2 and has "{tap}: Prevent the next 1 damage that would be dealt to target creature or player this turn." + // Equipped creature gets +0/+2 and has "{tap}: Prevent the next 1 damage that would be dealt to any target this turn." Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); gainAbility.addTarget(new TargetAnyTarget()); Effect effect = new BoostEquippedEffect(0, 2); effect.setText("Equipped creature gets +0/+2"); Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); effect = new GainAbilityAttachedEffect(gainAbility, AttachmentType.EQUIPMENT); - effect.setText("and has \"{T}: Prevent the next 1 damage that would be dealt to target creature or player this turn.\""); + effect.setText("and has \"{T}: Prevent the next 1 damage that would be dealt to any target this turn.\""); ability.addEffect(effect); this.addAbility(ability); // {W}{W}: Attach Healer's Headdress to target creature you control. diff --git a/Mage.Sets/src/mage/cards/h/HealingLeaves.java b/Mage.Sets/src/mage/cards/h/HealingLeaves.java index d9e427f6cd..9cd1cad9b0 100644 --- a/Mage.Sets/src/mage/cards/h/HealingLeaves.java +++ b/Mage.Sets/src/mage/cards/h/HealingLeaves.java @@ -47,7 +47,7 @@ public class HealingLeaves extends CardImpl { public HealingLeaves(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{G}"); - // Choose one - Target player gains 3 life; or prevent the next 3 damage that would be dealt to target creature or player this turn. + // Choose one - Target player gains 3 life; or prevent the next 3 damage that would be dealt to any target this turn. this.getSpellAbility().addEffect(new GainLifeTargetEffect(3)); this.getSpellAbility().addTarget(new TargetPlayer()); Mode mode = new Mode(); diff --git a/Mage.Sets/src/mage/cards/h/HealingSalve.java b/Mage.Sets/src/mage/cards/h/HealingSalve.java index 71472a7153..d4e58af296 100644 --- a/Mage.Sets/src/mage/cards/h/HealingSalve.java +++ b/Mage.Sets/src/mage/cards/h/HealingSalve.java @@ -48,7 +48,7 @@ public class HealingSalve extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{W}"); - // Choose one - Target player gains 3 life; or prevent the next 3 damage that would be dealt to target creature or player this turn. + // Choose one - Target player gains 3 life; or prevent the next 3 damage that would be dealt to any target this turn. this.getSpellAbility().addEffect(new GainLifeTargetEffect(3)); this.getSpellAbility().addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/h/HeartPiercerManticore.java b/Mage.Sets/src/mage/cards/h/HeartPiercerManticore.java index c577ad72cd..2a2967d9b6 100644 --- a/Mage.Sets/src/mage/cards/h/HeartPiercerManticore.java +++ b/Mage.Sets/src/mage/cards/h/HeartPiercerManticore.java @@ -70,7 +70,7 @@ public class HeartPiercerManticore extends CardImpl { // When Heart-Piercer Manticore enters the battlefield, you may sacrifice another creature. Ability firstAbility = new EntersBattlefieldTriggeredAbility(new HeartPiercerManticoreSacrificeEffect(), true); this.addAbility(firstAbility); - // When you do, Heart-Piercer Manticore deals damage equal to that creature's power to target creature or player. + // When you do, Heart-Piercer Manticore deals damage equal to that creature's power to any target. Ability secondAbility = new HeartPiercerManticoreSacrificeTriggeredAbility(firstAbility.getOriginalId()); secondAbility.addTarget(new TargetAnyTarget()); this.addAbility(secondAbility); @@ -128,7 +128,7 @@ class HeartPiercerManticoreSacrificeTriggeredAbility extends TriggeredAbilityImp private final UUID relatedTriggerdAbilityOriginalId; public HeartPiercerManticoreSacrificeTriggeredAbility(UUID relatedTriggerdAbilityOriginalId) { - super(Zone.BATTLEFIELD, new InfoEffect("{this} deals damage equal to that creature's power to target creature or player")); + super(Zone.BATTLEFIELD, new InfoEffect("{this} deals damage equal to that creature's power to any target")); this.relatedTriggerdAbilityOriginalId = relatedTriggerdAbilityOriginalId; } @@ -161,6 +161,6 @@ class HeartPiercerManticoreSacrificeTriggeredAbility extends TriggeredAbilityImp @Override public String getRule() { - return "When you do, {this} deals damage equal to that creature's power to target creature or player."; + return "When you do, {this} deals damage equal to that creature's power to any target."; } } diff --git a/Mage.Sets/src/mage/cards/h/HeavyArbalest.java b/Mage.Sets/src/mage/cards/h/HeavyArbalest.java index cb7295d40e..9bf2efc33f 100644 --- a/Mage.Sets/src/mage/cards/h/HeavyArbalest.java +++ b/Mage.Sets/src/mage/cards/h/HeavyArbalest.java @@ -65,7 +65,7 @@ public class HeavyArbalest extends CardImpl { // Equipped creature doesn't untap during its controller's untap step. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new HeavyArbalestEffect())); - // Equipped creature has "{T}: This creature deals 2 damage to target creature or player." + // Equipped creature has "{T}: This creature deals 2 damage to any target." SimpleActivatedAbility ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); ability2.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability2, AttachmentType.EQUIPMENT))); diff --git a/Mage.Sets/src/mage/cards/h/Hecatomb.java b/Mage.Sets/src/mage/cards/h/Hecatomb.java index 88cc56272d..5908cd56ce 100644 --- a/Mage.Sets/src/mage/cards/h/Hecatomb.java +++ b/Mage.Sets/src/mage/cards/h/Hecatomb.java @@ -68,7 +68,7 @@ public class Hecatomb extends CardImpl { // When Hecatomb enters the battlefield, sacrifice Hecatomb unless you sacrifice four creatures. this.addAbility(new EntersBattlefieldTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new SacrificeTargetCost(new TargetControlledCreaturePermanent(4))), false)); - // Tap an untapped Swamp you control: Hecatomb deals 1 damage to target creature or player. + // Tap an untapped Swamp you control: Hecatomb deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapTargetCost(new TargetControlledPermanent(1, 1, filter, true))); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/Heliophial.java b/Mage.Sets/src/mage/cards/h/Heliophial.java index bffa782f47..505b84bef5 100644 --- a/Mage.Sets/src/mage/cards/h/Heliophial.java +++ b/Mage.Sets/src/mage/cards/h/Heliophial.java @@ -54,9 +54,9 @@ public class Heliophial extends CardImpl { // Sunburst this.addAbility(new SunburstAbility(this)); - // {2}, Sacrifice Heliophial: Heliophial deals damage equal to the number of charge counters on it to target creature or player. + // {2}, Sacrifice Heliophial: Heliophial deals damage equal to the number of charge counters on it to any target. Effect effect = new DamageTargetEffect(new CountersSourceCount(CounterType.CHARGE)); - effect.setText("{this} deals damage equal to the number of charge counters on it to target creature or player"); + effect.setText("{this} deals damage equal to the number of charge counters on it to any target"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{2}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/h/HereticsPunishment.java b/Mage.Sets/src/mage/cards/h/HereticsPunishment.java index c0e2c4db42..1e2d70918d 100644 --- a/Mage.Sets/src/mage/cards/h/HereticsPunishment.java +++ b/Mage.Sets/src/mage/cards/h/HereticsPunishment.java @@ -53,7 +53,7 @@ public class HereticsPunishment extends CardImpl { public HereticsPunishment(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{R}"); - // {3}{R}: Choose target creature or player, then put the top three cards of your library into your graveyard. Heretic's Punishment deals damage to that creature or player equal to the highest converted mana cost among those cards. + // {3}{R}: Choose any target, then put the top three cards of your library into your graveyard. Heretic's Punishment deals damage to that creature or player equal to the highest converted mana cost among those cards. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HereticsPunishmentEffect(), new ManaCostsImpl("{3}{R}")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HermeticStudy.java b/Mage.Sets/src/mage/cards/h/HermeticStudy.java index 9a4469f2a2..1c91a11a71 100644 --- a/Mage.Sets/src/mage/cards/h/HermeticStudy.java +++ b/Mage.Sets/src/mage/cards/h/HermeticStudy.java @@ -63,11 +63,11 @@ public class HermeticStudy extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // Enchanted creature has "{tap}: This creature deals 1 damage to target creature or player." + // Enchanted creature has "{tap}: This creature deals 1 damage to any target." ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.AURA, Duration.WhileOnBattlefield, - "Enchanted creature has \"{T}: This creature deals 1 damage to target creature or player.\""))); + "Enchanted creature has \"{T}: This creature deals 1 damage to any target.\""))); } public HermeticStudy(final HermeticStudy card) { diff --git a/Mage.Sets/src/mage/cards/h/HoldAtBay.java b/Mage.Sets/src/mage/cards/h/HoldAtBay.java index c23b590092..0d54c09c0f 100644 --- a/Mage.Sets/src/mage/cards/h/HoldAtBay.java +++ b/Mage.Sets/src/mage/cards/h/HoldAtBay.java @@ -45,7 +45,7 @@ public class HoldAtBay extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{W}"); - // Prevent the next 7 damage that would be dealt to target creature or player this turn. + // Prevent the next 7 damage that would be dealt to any target this turn. this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, 7)); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/h/HondenOfInfiniteRage.java b/Mage.Sets/src/mage/cards/h/HondenOfInfiniteRage.java index 393d2ae04b..4c3e26f670 100644 --- a/Mage.Sets/src/mage/cards/h/HondenOfInfiniteRage.java +++ b/Mage.Sets/src/mage/cards/h/HondenOfInfiniteRage.java @@ -62,7 +62,7 @@ public class HondenOfInfiniteRage extends CardImpl { this.subtype.add(SubType.SHRINE); - // At the beginning of your upkeep, Honden of Infinite Rage deals damage to target creature or player equal to the number of Shrines you control. + // At the beginning of your upkeep, Honden of Infinite Rage deals damage to any target equal to the number of Shrines you control. Ability ability = new BeginningOfUpkeepTriggeredAbility(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)), TargetController.YOU, false); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HonorablePassage.java b/Mage.Sets/src/mage/cards/h/HonorablePassage.java index 8627bcd61b..8ccf1200cf 100644 --- a/Mage.Sets/src/mage/cards/h/HonorablePassage.java +++ b/Mage.Sets/src/mage/cards/h/HonorablePassage.java @@ -51,7 +51,7 @@ public class HonorablePassage extends CardImpl { public HonorablePassage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{W}"); - // The next time a source of your choice would deal damage to target creature or player this turn, prevent that damage. If damage from a red source is prevented this way, Honorable Passage deals that much damage to the source's controller. + // The next time a source of your choice would deal damage to any target this turn, prevent that damage. If damage from a red source is prevented this way, Honorable Passage deals that much damage to the source's controller. this.getSpellAbility().addEffect(new HonorablePassageEffect()); this.getSpellAbility().addTarget(new TargetAnyTarget()); } @@ -103,6 +103,6 @@ class HonorablePassageEffect extends PreventNextDamageFromChosenSourceToTargetEf @Override public String getText(Mode mode) { - return "The next time a source of your choice would deal damage to target creature or player this turn, prevent that damage. If damage from a red source is prevented this way, {this} deals that much damage to the source's controller"; + return "The next time a source of your choice would deal damage to any target this turn, prevent that damage. If damage from a red source is prevented this way, {this} deals that much damage to the source's controller"; } } diff --git a/Mage.Sets/src/mage/cards/h/HotSprings.java b/Mage.Sets/src/mage/cards/h/HotSprings.java index 6afec08267..28e446c46f 100644 --- a/Mage.Sets/src/mage/cards/h/HotSprings.java +++ b/Mage.Sets/src/mage/cards/h/HotSprings.java @@ -65,11 +65,11 @@ public class HotSprings extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // Enchanted land has "{tap}: Prevent the next 1 damage that would be dealt to target creature or player this turn." + // Enchanted land has "{tap}: Prevent the next 1 damage that would be dealt to any target this turn." ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); - effect.setText("Enchanted land has \"{T}: Prevent the next 1 damage that would be dealt to target creature or player this turn.\""); + effect.setText("Enchanted land has \"{T}: Prevent the next 1 damage that would be dealt to any target this turn.\""); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } diff --git a/Mage.Sets/src/mage/cards/h/HypervoltGrasp.java b/Mage.Sets/src/mage/cards/h/HypervoltGrasp.java index 67f00c149e..5406dba301 100644 --- a/Mage.Sets/src/mage/cards/h/HypervoltGrasp.java +++ b/Mage.Sets/src/mage/cards/h/HypervoltGrasp.java @@ -64,7 +64,7 @@ public class HypervoltGrasp extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // Enchanted creature has "Tap: This creature deals 1 damage to target creature or player." + // Enchanted creature has "Tap: This creature deals 1 damage to any target." Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); gainedAbility.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/h/Hypochondria.java b/Mage.Sets/src/mage/cards/h/Hypochondria.java index ef9e4ef407..599cd60419 100644 --- a/Mage.Sets/src/mage/cards/h/Hypochondria.java +++ b/Mage.Sets/src/mage/cards/h/Hypochondria.java @@ -50,12 +50,12 @@ public class Hypochondria extends CardImpl { public Hypochondria(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{W}"); - // {W}, Discard a card: Prevent the next 3 damage that would be dealt to target creature or player this turn. + // {W}, Discard a card: Prevent the next 3 damage that would be dealt to any target this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 3), new ManaCostsImpl("{W}")); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); - // {W}, Sacrifice Hypochondria: Prevent the next 3 damage that would be dealt to target creature or player this turn. + // {W}, Sacrifice Hypochondria: Prevent the next 3 damage that would be dealt to any target this turn. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 3), new ManaCostsImpl("{W}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/i/IcatianJavelineers.java b/Mage.Sets/src/mage/cards/i/IcatianJavelineers.java index a03cbc9700..be01459181 100644 --- a/Mage.Sets/src/mage/cards/i/IcatianJavelineers.java +++ b/Mage.Sets/src/mage/cards/i/IcatianJavelineers.java @@ -60,7 +60,7 @@ public class IcatianJavelineers extends CardImpl { // Icatian Javelineers enters the battlefield with a javelin counter on it. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.JAVELIN.createInstance()), "with a javelin counter on it")); - // {tap}, Remove a javelin counter from Icatian Javelineers: Icatian Javelineers deals 1 damage to target creature or player. + // {tap}, Remove a javelin counter from Icatian Javelineers: Icatian Javelineers deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.JAVELIN.createInstance())); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/i/ImminentDoom.java b/Mage.Sets/src/mage/cards/i/ImminentDoom.java index ff6d2bfdf6..a8b06b8abb 100644 --- a/Mage.Sets/src/mage/cards/i/ImminentDoom.java +++ b/Mage.Sets/src/mage/cards/i/ImminentDoom.java @@ -59,7 +59,7 @@ public class ImminentDoom extends CardImpl { // Imminent Doom enters the battlefield with a doom counter on it. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.DOOM.createInstance(1)))); - // Whenever you cast a spell with converted mana cost equal to the number of doom counters on Imminent Doom, Imminent Doom deals that much damage to target creature or player. Then put a doom counter on Imminent Doom. + // Whenever you cast a spell with converted mana cost equal to the number of doom counters on Imminent Doom, Imminent Doom deals that much damage to any target. Then put a doom counter on Imminent Doom. Ability ability = new ImminentDoomTriggeredAbility(); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); @@ -78,7 +78,7 @@ public class ImminentDoom extends CardImpl { class ImminentDoomTriggeredAbility extends TriggeredAbilityImpl { - private String rule = "Whenever you cast a spell with converted mana cost equal to the number of doom counters on {this}, {this} deals that much damage to target creature or player. Then put a doom counter on {this}."; + private String rule = "Whenever you cast a spell with converted mana cost equal to the number of doom counters on {this}, {this} deals that much damage to any target. Then put a doom counter on {this}."; public ImminentDoomTriggeredAbility() { super(Zone.BATTLEFIELD, new ImminentDoomEffect()); diff --git a/Mage.Sets/src/mage/cards/i/IncendiaryFlow.java b/Mage.Sets/src/mage/cards/i/IncendiaryFlow.java index e79197e2a1..68607d0c78 100644 --- a/Mage.Sets/src/mage/cards/i/IncendiaryFlow.java +++ b/Mage.Sets/src/mage/cards/i/IncendiaryFlow.java @@ -47,7 +47,7 @@ public class IncendiaryFlow extends CardImpl { public IncendiaryFlow(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{R}"); - // Incendiary Flow deals 3 damage to target creature or player. If a creature dealt damage this way would die this turn, exile it instead. + // Incendiary Flow deals 3 damage to any target. If a creature dealt damage this way would die this turn, exile it instead. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetAnyTarget()); Effect effect = new DealtDamageToCreatureBySourceDies(this, Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/cards/i/InfernoFist.java b/Mage.Sets/src/mage/cards/i/InfernoFist.java index cd2365d563..355260e01b 100644 --- a/Mage.Sets/src/mage/cards/i/InfernoFist.java +++ b/Mage.Sets/src/mage/cards/i/InfernoFist.java @@ -68,7 +68,7 @@ public class InfernoFist extends CardImpl { // Enchanted creature gets +2/+0. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 0))); - // {R}, Sacrifice Inferno Fist: Inferno Fist deals 2 damage to target creature or player. + // {R}, Sacrifice Inferno Fist: Inferno Fist deals 2 damage to any target. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/i/IonStorm.java b/Mage.Sets/src/mage/cards/i/IonStorm.java index 2910d42260..65a8eea927 100644 --- a/Mage.Sets/src/mage/cards/i/IonStorm.java +++ b/Mage.Sets/src/mage/cards/i/IonStorm.java @@ -52,7 +52,7 @@ public class IonStorm extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}"); - // {1}{R}, Remove a +1/+1 counter or a charge counter from a permanent you control: Ion Storm deals 2 damage to target creature or player. + // {1}{R}, Remove a +1/+1 counter or a charge counter from a permanent you control: Ion Storm deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{1}{R}")); ability.addCost(new OrCost(new RemoveCounterCost(new TargetControlledPermanent(), CounterType.P1P1), new RemoveCounterCost(new TargetControlledPermanent(), CounterType.CHARGE), " Remove a +1/+1 counter or a charge counter from a permanent you control")); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/i/IreOfKaminari.java b/Mage.Sets/src/mage/cards/i/IreOfKaminari.java index b36398a302..b6db46ee9d 100644 --- a/Mage.Sets/src/mage/cards/i/IreOfKaminari.java +++ b/Mage.Sets/src/mage/cards/i/IreOfKaminari.java @@ -55,7 +55,7 @@ public class IreOfKaminari extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{R}"); this.subtype.add(SubType.ARCANE); - // Ire of Kaminari deals damage to target creature or player equal to the number of Arcane cards in your graveyard. + // Ire of Kaminari deals damage to any target equal to the number of Arcane cards in your graveyard. this.getSpellAbility().addEffect(new DamageTargetEffect(new CardsInControllerGraveyardCount(filter))); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/i/IvoryCharm.java b/Mage.Sets/src/mage/cards/i/IvoryCharm.java index abc04c8d55..8ed515d712 100644 --- a/Mage.Sets/src/mage/cards/i/IvoryCharm.java +++ b/Mage.Sets/src/mage/cards/i/IvoryCharm.java @@ -55,7 +55,7 @@ public class IvoryCharm extends CardImpl { mode.getEffects().add(new TapTargetEffect()); mode.getTargets().add(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); - // or prevent the next 1 damage that would be dealt to target creature or player this turn. + // or prevent the next 1 damage that would be dealt to any target this turn. mode = new Mode(); mode.getEffects().add(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1)); mode.getTargets().add(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/j/JayaBallardTaskMage.java b/Mage.Sets/src/mage/cards/j/JayaBallardTaskMage.java index d2039a0860..202c8d05a6 100644 --- a/Mage.Sets/src/mage/cards/j/JayaBallardTaskMage.java +++ b/Mage.Sets/src/mage/cards/j/JayaBallardTaskMage.java @@ -79,7 +79,7 @@ public class JayaBallardTaskMage extends CardImpl { ability.addCost(new DiscardCardCost()); this.addAbility(ability); - // {1}{R}, {tap}, Discard a card: Jaya Ballard, Task Mage deals 3 damage to target creature or player. A creature dealt damage this way can't be regenerated this turn. + // {1}{R}, {tap}, Discard a card: Jaya Ballard, Task Mage deals 3 damage to any target. A creature dealt damage this way can't be regenerated this turn. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new ManaCostsImpl("{1}{R}")); ability.addTarget(new TargetAnyTarget()); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/j/JeskaWarriorAdept.java b/Mage.Sets/src/mage/cards/j/JeskaWarriorAdept.java index 2b09cf98e7..cb2a1e88eb 100644 --- a/Mage.Sets/src/mage/cards/j/JeskaWarriorAdept.java +++ b/Mage.Sets/src/mage/cards/j/JeskaWarriorAdept.java @@ -62,7 +62,7 @@ public class JeskaWarriorAdept extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // Haste this.addAbility(HasteAbility.getInstance()); - // {tap}: Jeska, Warrior Adept deals 1 damage to target creature or player. + // {tap}: Jeska, Warrior Adept deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JhessianBalmgiver.java b/Mage.Sets/src/mage/cards/j/JhessianBalmgiver.java index 08e398691f..d0b947100d 100644 --- a/Mage.Sets/src/mage/cards/j/JhessianBalmgiver.java +++ b/Mage.Sets/src/mage/cards/j/JhessianBalmgiver.java @@ -57,7 +57,7 @@ public class JhessianBalmgiver extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // {tap}: Prevent the next 1 damage that would be dealt to target creature or player this turn. + // {tap}: Prevent the next 1 damage that would be dealt to any target this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JundSojourners.java b/Mage.Sets/src/mage/cards/j/JundSojourners.java index 051e339e46..f309d88735 100644 --- a/Mage.Sets/src/mage/cards/j/JundSojourners.java +++ b/Mage.Sets/src/mage/cards/j/JundSojourners.java @@ -58,7 +58,7 @@ public class JundSojourners extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(2); - // When you cycle Jund Sojourners or it dies, you may have it deal 1 damage to target creature or player. + // When you cycle Jund Sojourners or it dies, you may have it deal 1 damage to any target. Ability ability1 = new CycleTriggeredAbility(new DamageTargetEffect(1)); Ability ability2 = new DiesTriggeredAbility(new DamageTargetEffect(1)); ability1.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/k/KaervekTheMerciless.java b/Mage.Sets/src/mage/cards/k/KaervekTheMerciless.java index 1b5323a95c..19bab1ed43 100644 --- a/Mage.Sets/src/mage/cards/k/KaervekTheMerciless.java +++ b/Mage.Sets/src/mage/cards/k/KaervekTheMerciless.java @@ -58,7 +58,7 @@ public class KaervekTheMerciless extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(4); - // Whenever an opponent casts a spell, Kaervek the Merciless deals damage to target creature or player equal to that spell's converted mana cost. + // Whenever an opponent casts a spell, Kaervek the Merciless deals damage to any target equal to that spell's converted mana cost. Ability ability = new SpellCastOpponentTriggeredAbility(Zone.BATTLEFIELD, new KaervekTheMercilessEffect(), StaticFilters.FILTER_SPELL, false, SetTargetPointer.SPELL); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); @@ -79,7 +79,7 @@ class KaervekTheMercilessEffect extends OneShotEffect { public KaervekTheMercilessEffect() { super(Outcome.Benefit); - this.staticText = "{this} deals damage to target creature or player equal to that spell's converted mana cost"; + this.staticText = "{this} deals damage to any target equal to that spell's converted mana cost"; } public KaervekTheMercilessEffect(final KaervekTheMercilessEffect effect) { diff --git a/Mage.Sets/src/mage/cards/k/KaerveksTorch.java b/Mage.Sets/src/mage/cards/k/KaerveksTorch.java index d7b850fe88..ee0b668972 100644 --- a/Mage.Sets/src/mage/cards/k/KaerveksTorch.java +++ b/Mage.Sets/src/mage/cards/k/KaerveksTorch.java @@ -59,7 +59,7 @@ public class KaerveksTorch extends CardImpl { // As long as Kaervek's Torch is on the stack, spells that target it cost {2} more to cast. this.addAbility(new SimpleStaticAbility(Zone.STACK, new KaerveksTorchCostIncreaseEffect())); - // Kaervek's Torch deals X damage to target creature or player. + // Kaervek's Torch deals X damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/k/KarplusanMinotaur.java b/Mage.Sets/src/mage/cards/k/KarplusanMinotaur.java index 0eda8fc85f..b6505bfce8 100644 --- a/Mage.Sets/src/mage/cards/k/KarplusanMinotaur.java +++ b/Mage.Sets/src/mage/cards/k/KarplusanMinotaur.java @@ -64,13 +64,13 @@ public class KarplusanMinotaur extends CardImpl { // Cumulative upkeep-Flip a coin. this.addAbility(new CumulativeUpkeepAbility(new KarplusanMinotaurCost())); - // Whenever you win a coin flip, Karplusan Minotaur deals 1 damage to target creature or player. + // Whenever you win a coin flip, Karplusan Minotaur deals 1 damage to any target. Ability abilityWin = new KarplusanMinotaurFlipWinTriggeredAbility(); abilityWin.addTarget(new TargetAnyTarget()); this.addAbility(abilityWin); //TODO: Make ability properly copiable - // Whenever you lose a coin flip, Karplusan Minotaur deals 1 damage to target creature or player of an opponent's choice. + // Whenever you lose a coin flip, Karplusan Minotaur deals 1 damage to any target of an opponent's choice. Ability abilityLose = new KarplusanMinotaurFlipLoseTriggeredAbility(); abilityLose.addTarget(new TargetAnyTarget()); this.addAbility(abilityLose); @@ -134,7 +134,7 @@ class KarplusanMinotaurFlipWinTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever you win a coin flip, {this} deals 1 damage to target creature or player"; + return "Whenever you win a coin flip, {this} deals 1 damage to any target"; } } @@ -165,7 +165,7 @@ class KarplusanMinotaurFlipLoseTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever you lose a coin flip, {this} deals 1 damage to target creature or player of an opponent's choice."; + return "Whenever you lose a coin flip, {this} deals 1 damage to any target of an opponent's choice."; } } diff --git a/Mage.Sets/src/mage/cards/k/KarplusanWolverine.java b/Mage.Sets/src/mage/cards/k/KarplusanWolverine.java index ef1a082c1f..84ab4bec9c 100644 --- a/Mage.Sets/src/mage/cards/k/KarplusanWolverine.java +++ b/Mage.Sets/src/mage/cards/k/KarplusanWolverine.java @@ -53,7 +53,7 @@ public class KarplusanWolverine extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // Whenever Karplusan Wolverine becomes blocked, you may have it deal 1 damage to target creature or player. + // Whenever Karplusan Wolverine becomes blocked, you may have it deal 1 damage to any target. Ability ability = new BecomesBlockedTriggeredAbility(new DamageTargetEffect(1), true); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KeldonMegaliths.java b/Mage.Sets/src/mage/cards/k/KeldonMegaliths.java index 5ac0b720e0..385350122a 100644 --- a/Mage.Sets/src/mage/cards/k/KeldonMegaliths.java +++ b/Mage.Sets/src/mage/cards/k/KeldonMegaliths.java @@ -54,9 +54,9 @@ public class KeldonMegaliths extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); // {tap}: Add {R}. this.addAbility(new RedManaAbility()); - // Hellbent - {1}{R}, {tap}: Keldon Megaliths deals 1 damage to target creature or player. Activate this ability only if you have no cards in hand. + // Hellbent - {1}{R}, {tap}: Keldon Megaliths deals 1 damage to any target. Activate this ability only if you have no cards in hand. Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{1}{R}"), HellbentCondition.instance, - "Hellbent — {1}{R}, {T}: {this} deals 1 damage to target creature or player. Activate this ability only if you have no cards in hand."); + "Hellbent — {1}{R}, {T}: {this} deals 1 damage to any target. Activate this ability only if you have no cards in hand."); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KeldonNecropolis.java b/Mage.Sets/src/mage/cards/k/KeldonNecropolis.java index 4e10dacc6e..79f655d558 100644 --- a/Mage.Sets/src/mage/cards/k/KeldonNecropolis.java +++ b/Mage.Sets/src/mage/cards/k/KeldonNecropolis.java @@ -56,7 +56,7 @@ public class KeldonNecropolis extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); - // {4}{R}, {T}, Sacrifice a creature: Keldon Necropolis deals 2 damage to target creature or player. + // {4}{R}, {T}, Sacrifice a creature: Keldon Necropolis deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl(new ManaCostsImpl("{4}{R}"))); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); diff --git a/Mage.Sets/src/mage/cards/k/KeranosGodOfStorms.java b/Mage.Sets/src/mage/cards/k/KeranosGodOfStorms.java index c148945a44..11e6606b7b 100644 --- a/Mage.Sets/src/mage/cards/k/KeranosGodOfStorms.java +++ b/Mage.Sets/src/mage/cards/k/KeranosGodOfStorms.java @@ -79,7 +79,7 @@ public class KeranosGodOfStorms extends CardImpl { // Reveal the first card you draw on each of your turns. // Whenever you reveal a land card this way, draw a card. - // Whenever you reveal a nonland card this way, Keranos deals 3 damage to target creature or player. + // Whenever you reveal a nonland card this way, Keranos deals 3 damage to any target. this.addAbility(new KeranosGodOfStormsTriggeredAbility(), new CardsAmountDrawnThisTurnWatcher()); @@ -147,6 +147,6 @@ class KeranosGodOfStormsTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { return "Reveal the first card you draw on each of your turns. Whenever you reveal a land card this way, draw a card. " + - "Whenever you reveal a nonland card this way, Keranos deals 3 damage to target creature or player."; + "Whenever you reveal a nonland card this way, Keranos deals 3 damage to any target."; } } diff --git a/Mage.Sets/src/mage/cards/k/KilnmouthDragon.java b/Mage.Sets/src/mage/cards/k/KilnmouthDragon.java index 37caf208a2..deb6557ad3 100644 --- a/Mage.Sets/src/mage/cards/k/KilnmouthDragon.java +++ b/Mage.Sets/src/mage/cards/k/KilnmouthDragon.java @@ -63,7 +63,7 @@ public class KilnmouthDragon extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // {tap}: Kilnmouth Dragon deals damage equal to the number of +1/+1 counters on it to target creature or player. + // {tap}: Kilnmouth Dragon deals damage equal to the number of +1/+1 counters on it to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new CountersSourceCount(CounterType.P1P1)), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/k/Kindle.java b/Mage.Sets/src/mage/cards/k/Kindle.java index 0bdaea69a0..d0bc2aa6f5 100644 --- a/Mage.Sets/src/mage/cards/k/Kindle.java +++ b/Mage.Sets/src/mage/cards/k/Kindle.java @@ -58,9 +58,9 @@ public class Kindle extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{R}"); - // Kindle deals X damage to target creature or player, where X is 2 plus the number of cards named Kindle in all graveyards. + // Kindle deals X damage to any target, where X is 2 plus the number of cards named Kindle in all graveyards. Effect effect = new DamageTargetEffect(new KindleCardsInAllGraveyardsCount(filter)); - effect.setText("{this} deals X damage to target creature or player, where X is 2 plus the number of cards named {source} in all graveyards"); + effect.setText("{this} deals X damage to any target, where X is 2 plus the number of cards named {source} in all graveyards"); this.getSpellAbility().addEffect(effect); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/k/KitsuneHealer.java b/Mage.Sets/src/mage/cards/k/KitsuneHealer.java index 8b0c58ae00..d72ebd3620 100644 --- a/Mage.Sets/src/mage/cards/k/KitsuneHealer.java +++ b/Mage.Sets/src/mage/cards/k/KitsuneHealer.java @@ -65,7 +65,7 @@ public class KitsuneHealer extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // {T}: Prevent the next 1 damage that would be dealt to target creature or player this turn. + // {T}: Prevent the next 1 damage that would be dealt to any target this turn. Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); firstAbility.addTarget(new TargetAnyTarget()); this.addAbility(firstAbility); diff --git a/Mage.Sets/src/mage/cards/k/KnollspineInvocation.java b/Mage.Sets/src/mage/cards/k/KnollspineInvocation.java index 2e7de759c2..b111b3c32b 100644 --- a/Mage.Sets/src/mage/cards/k/KnollspineInvocation.java +++ b/Mage.Sets/src/mage/cards/k/KnollspineInvocation.java @@ -57,7 +57,7 @@ public class KnollspineInvocation extends CardImpl { public KnollspineInvocation(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{R}{R}"); - // {X}, Discard a card with converted mana cost X: Knollspine Invocation deals X damage to target creature or player. + // {X}, Discard a card with converted mana cost X: Knollspine Invocation deals X damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new ManacostVariableValue(), true), new ManaCostsImpl<>("{X}")); ability.addCost(new DiscardTargetCost(new TargetCardInHand(filter))); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/k/KnowledgeAndPower.java b/Mage.Sets/src/mage/cards/k/KnowledgeAndPower.java index 832730019b..8fe3fd8fd3 100644 --- a/Mage.Sets/src/mage/cards/k/KnowledgeAndPower.java +++ b/Mage.Sets/src/mage/cards/k/KnowledgeAndPower.java @@ -51,7 +51,7 @@ public class KnowledgeAndPower extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{4}{R}"); - // Whenever you scry, you may pay 2. If you do. Knowledge and Power deals 2 damage to target creature or player. + // Whenever you scry, you may pay 2. If you do. Knowledge and Power deals 2 damage to any target. this.addAbility(new ScryTriggeredAbility() ); } diff --git a/Mage.Sets/src/mage/cards/k/KolaghansCommand.java b/Mage.Sets/src/mage/cards/k/KolaghansCommand.java index 6368a06bee..cad8697fbf 100644 --- a/Mage.Sets/src/mage/cards/k/KolaghansCommand.java +++ b/Mage.Sets/src/mage/cards/k/KolaghansCommand.java @@ -79,7 +79,7 @@ public class KolaghansCommand extends CardImpl { mode.getTargets().add(new TargetPermanent(filter)); this.getSpellAbility().getModes().addMode(mode); - // or Kolaghan's Command deals 2 damage to target creature or player. + // or Kolaghan's Command deals 2 damage to any target. mode = new Mode(); mode.getEffects().add(new DamageTargetEffect(2)); mode.getTargets().add(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/k/KothOfTheHammer.java b/Mage.Sets/src/mage/cards/k/KothOfTheHammer.java index 4bc59964b6..06a821a7fa 100644 --- a/Mage.Sets/src/mage/cards/k/KothOfTheHammer.java +++ b/Mage.Sets/src/mage/cards/k/KothOfTheHammer.java @@ -83,7 +83,7 @@ public class KothOfTheHammer extends CardImpl { // -2: Add {R} for each Mountain you control. this.addAbility(new LoyaltyAbility(new DynamicManaEffect(Mana.RedMana(1), new PermanentsOnBattlefieldCount(filterCount)), -2)); - // -5: You get an emblem with "Mountains you control have '{T}: This land deals 1 damage to target creature or player.' + // -5: You get an emblem with "Mountains you control have '{T}: This land deals 1 damage to any target.' this.addAbility(new LoyaltyAbility(new GetEmblemEffect(new KothOfTheHammerEmblem()), -5)); } diff --git a/Mage.Sets/src/mage/cards/k/KrisMage.java b/Mage.Sets/src/mage/cards/k/KrisMage.java index 1bd48267af..da30a393c5 100644 --- a/Mage.Sets/src/mage/cards/k/KrisMage.java +++ b/Mage.Sets/src/mage/cards/k/KrisMage.java @@ -55,7 +55,7 @@ public class KrisMage extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // {R}, {tap}, Discard a card: Kris Mage deals 1 damage to target creature or player. + // {R}, {tap}, Discard a card: Kris Mage deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); diff --git a/Mage.Sets/src/mage/cards/k/KrovikanHorror.java b/Mage.Sets/src/mage/cards/k/KrovikanHorror.java index 470bff26fe..ff2063899d 100644 --- a/Mage.Sets/src/mage/cards/k/KrovikanHorror.java +++ b/Mage.Sets/src/mage/cards/k/KrovikanHorror.java @@ -70,7 +70,7 @@ public class KrovikanHorror extends CardImpl { TargetController.ANY, KrovikanHorrorCondition.instance, true )); - // {1}, Sacrifice a creature: Krovikan Horror deals 1 damage to target creature or player. + // {1}, Sacrifice a creature: Krovikan Horror deals 1 damage to any target. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new GenericManaCost(1)); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/k/KrovikanPlague.java b/Mage.Sets/src/mage/cards/k/KrovikanPlague.java index 233583c1e9..fc86428223 100644 --- a/Mage.Sets/src/mage/cards/k/KrovikanPlague.java +++ b/Mage.Sets/src/mage/cards/k/KrovikanPlague.java @@ -90,7 +90,7 @@ public class KrovikanPlague extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateDelayedTriggeredAbilityEffect( new AtTheBeginOfNextUpkeepDelayedTriggeredAbility(new DrawCardSourceControllerEffect(1), Duration.OneUse)), false)); - // Tap enchanted creature: Tap enchanted creature: Krovikan Plague deals 1 damage to target creature or player. Put a -0/-1 counter on enchanted creature. Activate this ability only if enchanted creature is untapped. + // Tap enchanted creature: Tap enchanted creature: Krovikan Plague deals 1 damage to any target. Put a -0/-1 counter on enchanted creature. Activate this ability only if enchanted creature is untapped. Ability ability2 = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapAttachedCost(), new AttachedToMatchesFilterCondition(filter)); ability2.addEffect(new AddCountersAttachedEffect(new BoostCounter(0, -1),"enchanted creature")); diff --git a/Mage.Sets/src/mage/cards/k/KumanoMasterYamabushi.java b/Mage.Sets/src/mage/cards/k/KumanoMasterYamabushi.java index 7357c07025..e90a65f192 100644 --- a/Mage.Sets/src/mage/cards/k/KumanoMasterYamabushi.java +++ b/Mage.Sets/src/mage/cards/k/KumanoMasterYamabushi.java @@ -62,7 +62,7 @@ public class KumanoMasterYamabushi extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); - // {{1}{R}: Kumano, Master Yamabushi deals 1 damage to target creature or player. + // {{1}{R}: Kumano, Master Yamabushi deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}{R}") ); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LabyrinthChampion.java b/Mage.Sets/src/mage/cards/l/LabyrinthChampion.java index d3b19b0a0d..8927db4409 100644 --- a/Mage.Sets/src/mage/cards/l/LabyrinthChampion.java +++ b/Mage.Sets/src/mage/cards/l/LabyrinthChampion.java @@ -52,7 +52,7 @@ public class LabyrinthChampion extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // Heroic - Whenever you cast a spell that targets Labyrinth Champion, Labyrinth Champion deals 2 damage to target creature or player. + // Heroic - Whenever you cast a spell that targets Labyrinth Champion, Labyrinth Champion deals 2 damage to any target. Ability ability = new HeroicAbility(new DamageTargetEffect(2), false); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LastDitchEffort.java b/Mage.Sets/src/mage/cards/l/LastDitchEffort.java index 45a8c8f821..e5a9aaf187 100644 --- a/Mage.Sets/src/mage/cards/l/LastDitchEffort.java +++ b/Mage.Sets/src/mage/cards/l/LastDitchEffort.java @@ -51,7 +51,7 @@ public class LastDitchEffort extends CardImpl { public LastDitchEffort(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{R}"); - // Sacrifice any number of creatures. Last-Ditch Effort deals that much damage to target creature or player. + // Sacrifice any number of creatures. Last-Ditch Effort deals that much damage to any target. this.getSpellAbility().addEffect(new LastDitchEffortEffect()); this.getSpellAbility().addTarget(new TargetAnyTarget()); } @@ -70,7 +70,7 @@ class LastDitchEffortEffect extends OneShotEffect { LastDitchEffortEffect() { super(Outcome.Damage); - this.staticText = "Sacrifice any number of creatures. {this} deals that much damage to target creature or player"; + this.staticText = "Sacrifice any number of creatures. {this} deals that much damage to any target"; } LastDitchEffortEffect(final LastDitchEffortEffect effect) { diff --git a/Mage.Sets/src/mage/cards/l/LatullaKeldonOverseer.java b/Mage.Sets/src/mage/cards/l/LatullaKeldonOverseer.java index 793e8676c7..71fb2cc768 100644 --- a/Mage.Sets/src/mage/cards/l/LatullaKeldonOverseer.java +++ b/Mage.Sets/src/mage/cards/l/LatullaKeldonOverseer.java @@ -60,7 +60,7 @@ public class LatullaKeldonOverseer extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - // {X}{R}, {tap}, Discard two cards: Latulla, Keldon Overseer deals X damage to target creature or player. + // {X}{R}, {tap}, Discard two cards: Latulla, Keldon Overseer deals X damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new ManacostVariableValue()), new ManaCostsImpl("{X}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardTargetCost(new TargetCardInHand(2, 2, new FilterCard("two cards")))); diff --git a/Mage.Sets/src/mage/cards/l/LavaDart.java b/Mage.Sets/src/mage/cards/l/LavaDart.java index 4e6e5c7f73..c191d8abe4 100644 --- a/Mage.Sets/src/mage/cards/l/LavaDart.java +++ b/Mage.Sets/src/mage/cards/l/LavaDart.java @@ -56,7 +56,7 @@ public class LavaDart extends CardImpl { public LavaDart(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{R}"); - // Lava Dart deals 1 damage to target creature or player. + // Lava Dart deals 1 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/l/LightningCloud.java b/Mage.Sets/src/mage/cards/l/LightningCloud.java index 0e4112828b..a696e4b2cd 100644 --- a/Mage.Sets/src/mage/cards/l/LightningCloud.java +++ b/Mage.Sets/src/mage/cards/l/LightningCloud.java @@ -56,7 +56,7 @@ public class LightningCloud extends CardImpl { public LightningCloud(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{R}"); - // Whenever a player casts a red spell, you may pay {R}. If you do, Lightning Cloud deals 1 damage to target creature or player. + // Whenever a player casts a red spell, you may pay {R}. If you do, Lightning Cloud deals 1 damage to any target. Ability ability = new SpellCastAllTriggeredAbility(new DoIfCostPaid(new DamageTargetEffect(1), new ManaCostsImpl("{R}")), filter, false); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LightningCrafter.java b/Mage.Sets/src/mage/cards/l/LightningCrafter.java index 2a3d20731f..7b18190c2a 100644 --- a/Mage.Sets/src/mage/cards/l/LightningCrafter.java +++ b/Mage.Sets/src/mage/cards/l/LightningCrafter.java @@ -58,7 +58,7 @@ public class LightningCrafter extends CardImpl { // Champion a Goblin or Shaman this.addAbility(new ChampionAbility(this, EnumSet.of(SubType.GOBLIN, SubType.SHAMAN), false)); - // {T}: Lightning Crafter deals 3 damage to target creature or player. + // {T}: Lightning Crafter deals 3 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LightningDiadem.java b/Mage.Sets/src/mage/cards/l/LightningDiadem.java index 24b738196c..e87e16105d 100644 --- a/Mage.Sets/src/mage/cards/l/LightningDiadem.java +++ b/Mage.Sets/src/mage/cards/l/LightningDiadem.java @@ -64,7 +64,7 @@ public class LightningDiadem extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // When Lightning Diadem enters the battlefield, it deals 2 damage to target creature or player. + // When Lightning Diadem enters the battlefield, it deals 2 damage to any target. ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(2, "it")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LightningJavelin.java b/Mage.Sets/src/mage/cards/l/LightningJavelin.java index 23f0d5ca30..b48cc3257b 100644 --- a/Mage.Sets/src/mage/cards/l/LightningJavelin.java +++ b/Mage.Sets/src/mage/cards/l/LightningJavelin.java @@ -44,7 +44,7 @@ public class LightningJavelin extends CardImpl { public LightningJavelin(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{R}"); - // Lightning Javelin deals 3 damage to target creature or player. + // Lightning Javelin deals 3 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetAnyTarget()); // Scry 1. diff --git a/Mage.Sets/src/mage/cards/l/LightningProwess.java b/Mage.Sets/src/mage/cards/l/LightningProwess.java index 9ef3c3ba2a..a93cc2e7fd 100644 --- a/Mage.Sets/src/mage/cards/l/LightningProwess.java +++ b/Mage.Sets/src/mage/cards/l/LightningProwess.java @@ -61,7 +61,7 @@ public class LightningProwess extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // Enchanted creature has haste and "{tap}: This creature deals 1 damage to target creature or player." + // Enchanted creature has haste and "{tap}: This creature deals 1 damage to any target." this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA))); ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/l/LightningRift.java b/Mage.Sets/src/mage/cards/l/LightningRift.java index c356afbb19..5f65beabfc 100644 --- a/Mage.Sets/src/mage/cards/l/LightningRift.java +++ b/Mage.Sets/src/mage/cards/l/LightningRift.java @@ -48,7 +48,7 @@ public class LightningRift extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{R}"); - // Whenever a player cycles a card, you may pay {1}. If you do, Lightning Rift deals 2 damage to target creature or player. + // Whenever a player cycles a card, you may pay {1}. If you do, Lightning Rift deals 2 damage to any target. Ability ability = new CycleAllTriggeredAbility(new DoIfCostPaid(new DamageTargetEffect(2), new GenericManaCost(1)), false); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LightningStorm.java b/Mage.Sets/src/mage/cards/l/LightningStorm.java index b5b60867c4..f92a98d28c 100644 --- a/Mage.Sets/src/mage/cards/l/LightningStorm.java +++ b/Mage.Sets/src/mage/cards/l/LightningStorm.java @@ -59,9 +59,9 @@ public class LightningStorm extends CardImpl { public LightningStorm(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{R}{R}"); - // Lightning Storm deals X damage to target creature or player, where X is 3 plus the number of charge counters on it. + // Lightning Storm deals X damage to any target, where X is 3 plus the number of charge counters on it. Effect effect = new DamageTargetEffect(new LightningStormCountCondition(CounterType.CHARGE)); - effect.setText("{this} deals X damage to target creature or player, where X is 3 plus the number of charge counters on it"); + effect.setText("{this} deals X damage to any target, where X is 3 plus the number of charge counters on it"); this.getSpellAbility().addEffect(effect); this.getSpellAbility().addTarget(new TargetAnyTarget()); // Discard a land card: Put two charge counters on Lightning Storm. You may choose a new target for it. Any player may activate this ability but only if Lightning Storm is on the stack. diff --git a/Mage.Sets/src/mage/cards/l/LightningStrike.java b/Mage.Sets/src/mage/cards/l/LightningStrike.java index 6d4a0f2f1f..c95bfc8005 100644 --- a/Mage.Sets/src/mage/cards/l/LightningStrike.java +++ b/Mage.Sets/src/mage/cards/l/LightningStrike.java @@ -44,7 +44,7 @@ public class LightningStrike extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{R}"); - // Lightning Strike deals 3 damage to target creature or player. + // Lightning Strike deals 3 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/l/LightningSurge.java b/Mage.Sets/src/mage/cards/l/LightningSurge.java index 047d5f01d2..0c80ac11a0 100644 --- a/Mage.Sets/src/mage/cards/l/LightningSurge.java +++ b/Mage.Sets/src/mage/cards/l/LightningSurge.java @@ -49,7 +49,7 @@ public class LightningSurge extends CardImpl { public LightningSurge(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{R}{R}"); - // Lightning Surge deals 4 damage to target creature or player. + // Lightning Surge deals 4 damage to any target. // Threshold - If seven or more cards are in your graveyard, instead Lightning Surge deals 6 damage to that creature or player and the damage can't be prevented. Effect effect = new ConditionalOneShotEffect(new DamageTargetEffect(6, false), new DamageTargetEffect(4), diff --git a/Mage.Sets/src/mage/cards/l/LightningVolley.java b/Mage.Sets/src/mage/cards/l/LightningVolley.java index 428dc32dfd..4dc55953eb 100644 --- a/Mage.Sets/src/mage/cards/l/LightningVolley.java +++ b/Mage.Sets/src/mage/cards/l/LightningVolley.java @@ -52,11 +52,11 @@ public class LightningVolley extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{R}"); - // Until end of turn, creatures you control gain "{T}: This creature deals 1 damage to target creature or player." + // Until end of turn, creatures you control gain "{T}: This creature deals 1 damage to any target." Ability grantedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); grantedAbility.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityControlledEffect(grantedAbility, Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES); - effect.setText("Until end of turn, creatures you control gain \"{T}: This creature deals 1 damage to target creature or player.\""); + effect.setText("Until end of turn, creatures you control gain \"{T}: This creature deals 1 damage to any target.\""); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/cards/l/LivewireLash.java b/Mage.Sets/src/mage/cards/l/LivewireLash.java index 4bb3f79542..8b66b737fc 100644 --- a/Mage.Sets/src/mage/cards/l/LivewireLash.java +++ b/Mage.Sets/src/mage/cards/l/LivewireLash.java @@ -107,6 +107,6 @@ class LivewireLashAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever this creature becomes the target of a spell, this creature deals 2 damage to target creature or player."; + return "Whenever this creature becomes the target of a spell, this creature deals 2 damage to any target."; } } diff --git a/Mage.Sets/src/mage/cards/l/LoxodonAnchorite.java b/Mage.Sets/src/mage/cards/l/LoxodonAnchorite.java index a424b3419f..28d0309344 100644 --- a/Mage.Sets/src/mage/cards/l/LoxodonAnchorite.java +++ b/Mage.Sets/src/mage/cards/l/LoxodonAnchorite.java @@ -55,7 +55,7 @@ public class LoxodonAnchorite extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(3); - // {tap}: Prevent the next 2 damage that would be dealt to target creature or player this turn. + // {tap}: Prevent the next 2 damage that would be dealt to any target this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LyzoldaTheBloodWitch.java b/Mage.Sets/src/mage/cards/l/LyzoldaTheBloodWitch.java index 5140e68b33..21dbc76413 100644 --- a/Mage.Sets/src/mage/cards/l/LyzoldaTheBloodWitch.java +++ b/Mage.Sets/src/mage/cards/l/LyzoldaTheBloodWitch.java @@ -77,11 +77,11 @@ public class LyzoldaTheBloodWitch extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(1); - // {2}, Sacrifice a creature: Lyzolda, the Blood Witch deals 2 damage to target creature or player if the sacrificed creature was red. Draw a card if the sacrificed creature was black. + // {2}, Sacrifice a creature: Lyzolda, the Blood Witch deals 2 damage to any target if the sacrificed creature was red. Draw a card if the sacrificed creature was black. Effect effect = new ConditionalOneShotEffect( new DamageTargetEffect(2), new SacrificedWasCondition(redFilter), - "{source} deals 2 damage to target creature or player if the sacrificed creature was red"); + "{source} deals 2 damage to any target if the sacrificed creature was red"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{2}")); effect = new ConditionalOneShotEffect( new DrawCardSourceControllerEffect(1), diff --git a/Mage.Sets/src/mage/cards/m/MageIlVec.java b/Mage.Sets/src/mage/cards/m/MageIlVec.java index 1a34146c62..51896df1a0 100644 --- a/Mage.Sets/src/mage/cards/m/MageIlVec.java +++ b/Mage.Sets/src/mage/cards/m/MageIlVec.java @@ -54,7 +54,7 @@ public class MageIlVec extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // {tap}, Discard a card at random: Mage il-Vec deals 1 damage to target creature or player. + // {tap}, Discard a card at random: Mage il-Vec deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addCost(new DiscardCardCost(true)); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/m/MagmaBurst.java b/Mage.Sets/src/mage/cards/m/MagmaBurst.java index c2cf3844d6..e386eef851 100644 --- a/Mage.Sets/src/mage/cards/m/MagmaBurst.java +++ b/Mage.Sets/src/mage/cards/m/MagmaBurst.java @@ -45,28 +45,28 @@ import mage.target.common.TargetAnyTarget; /** * * @author LoneFox - + * */ public class MagmaBurst extends CardImpl { private final UUID originalId; public MagmaBurst(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{R}"); // Kicker-Sacrifice two lands. this.addAbility(new KickerAbility(new SacrificeTargetCost(new TargetControlledPermanent(2, 2, new FilterControlledLandPermanent("two lands"), true)))); - // Magma Burst deals 3 damage to target creature or player. If Magma Burst was kicked, it deals 3 damage to another target creature or player. + // Magma Burst deals 3 damage to any target. If Magma Burst was kicked, it deals 3 damage to another any target. Effect effect = new DamageTargetEffect(3); - effect.setText("{this} deals 3 damage to target creature or player. If {this} was kicked, it deals 3 damage to another target creature or player."); + effect.setText("{this} deals 3 damage to any target. If {this} was kicked, it deals 3 damage to another target."); this.getSpellAbility().addEffect(effect); originalId = this.getSpellAbility().getOriginalId(); } @Override public void adjustTargets(Ability ability, Game game) { - if(ability.getOriginalId().equals(originalId)) { - ability.addTarget(new TargetAnyTarget(KickedCondition.instance.apply(game, ability) ? 2 : 1)); + if (ability.getOriginalId().equals(originalId)) { + ability.addTarget(new TargetAnyTarget(KickedCondition.instance.apply(game, ability) ? 2 : 1)); } } diff --git a/Mage.Sets/src/mage/cards/m/MagmaJet.java b/Mage.Sets/src/mage/cards/m/MagmaJet.java index 06d977ecf5..90d6e5a1ea 100644 --- a/Mage.Sets/src/mage/cards/m/MagmaJet.java +++ b/Mage.Sets/src/mage/cards/m/MagmaJet.java @@ -45,7 +45,7 @@ public class MagmaJet extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{R}"); - // Magma Jet deals 2 damage to target creature or player. + // Magma Jet deals 2 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellAbility().addTarget(new TargetAnyTarget()); // Scry 2. diff --git a/Mage.Sets/src/mage/cards/m/MagmaMine.java b/Mage.Sets/src/mage/cards/m/MagmaMine.java index 33f016fa67..1704cd2fc7 100644 --- a/Mage.Sets/src/mage/cards/m/MagmaMine.java +++ b/Mage.Sets/src/mage/cards/m/MagmaMine.java @@ -57,7 +57,7 @@ public class MagmaMine extends CardImpl { new AddCountersSourceEffect(CounterType.PRESSURE.createInstance(), true), new GenericManaCost(4))); - // {tap}, Sacrifice Magma Mine: Magma Mine deals damage equal to the number of pressure counters on it to target creature or player. + // {tap}, Sacrifice Magma Mine: Magma Mine deals damage equal to the number of pressure counters on it to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new CountersSourceCount(CounterType.PRESSURE)), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/m/MagmaticForce.java b/Mage.Sets/src/mage/cards/m/MagmaticForce.java index 23f76c2f5a..bf05ff7fc7 100644 --- a/Mage.Sets/src/mage/cards/m/MagmaticForce.java +++ b/Mage.Sets/src/mage/cards/m/MagmaticForce.java @@ -53,7 +53,7 @@ public class MagmaticForce extends CardImpl { this.power = new MageInt(7); this.toughness = new MageInt(7); - // At the beginning of each upkeep, Magmatic Force deals 3 damage to target creature or player. + // At the beginning of each upkeep, Magmatic Force deals 3 damage to any target. Ability ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), TargetController.ANY, false); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheScroll.java b/Mage.Sets/src/mage/cards/m/MagusOfTheScroll.java index 3926b33533..346c2b418e 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheScroll.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheScroll.java @@ -63,7 +63,7 @@ public class MagusOfTheScroll extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // {3}, {tap}: Name a card. Reveal a card at random from your hand. If it's the named card, Magus of the Scroll deals 2 damage to target creature or player. + // {3}, {tap}: Name a card. Reveal a card at random from your hand. If it's the named card, Magus of the Scroll deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new NameACardEffect(NameACardEffect.TypeOfName.ALL), new ManaCostsImpl("{3}")); ability.addEffect(new MagusOfTheScrollEffect()); ability.addCost(new TapSourceCost()); @@ -85,7 +85,7 @@ class MagusOfTheScrollEffect extends OneShotEffect { public MagusOfTheScrollEffect() { super(Outcome.Neutral); - staticText = ", then reveal a card at random from your hand. If it's the named card, {this} deals 2 damage to target creature or player"; + staticText = ", then reveal a card at random from your hand. If it's the named card, {this} deals 2 damage to any target"; } public MagusOfTheScrollEffect(final MagusOfTheScrollEffect effect) { diff --git a/Mage.Sets/src/mage/cards/m/MakeMischief.java b/Mage.Sets/src/mage/cards/m/MakeMischief.java index aa38c7379d..05da556bde 100644 --- a/Mage.Sets/src/mage/cards/m/MakeMischief.java +++ b/Mage.Sets/src/mage/cards/m/MakeMischief.java @@ -45,8 +45,8 @@ public class MakeMischief extends CardImpl { public MakeMischief(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{R}"); - // Make Mischief deals 1 damage to target creature or player. Create a 1/1 red Devil creature token. - // It has "When this creature dies, it deals 1 damage to target creature or player." + // Make Mischief deals 1 damage to any target. Create a 1/1 red Devil creature token. + // It has "When this creature dies, it deals 1 damage to any target." this.getSpellAbility().addEffect(new DamageTargetEffect(1)); this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new CreateTokenEffect(new DevilToken())); diff --git a/Mage.Sets/src/mage/cards/m/MakeshiftMunitions.java b/Mage.Sets/src/mage/cards/m/MakeshiftMunitions.java index 2278c725b8..bd98c7f775 100644 --- a/Mage.Sets/src/mage/cards/m/MakeshiftMunitions.java +++ b/Mage.Sets/src/mage/cards/m/MakeshiftMunitions.java @@ -53,7 +53,7 @@ public class MakeshiftMunitions extends CardImpl { public MakeshiftMunitions(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}"); - // {1}, Sacrifice an artifact or creature: Makeshift Munitions deals 1 damage to target creature or player. + // {1}, Sacrifice an artifact or creature: Makeshift Munitions deals 1 damage to any target. Ability ability = new SimpleActivatedAbility( Zone.BATTLEFIELD, new DamageTargetEffect(1), diff --git a/Mage.Sets/src/mage/cards/m/MarathWillOfTheWild.java b/Mage.Sets/src/mage/cards/m/MarathWillOfTheWild.java index 0854d0baea..83919abce5 100644 --- a/Mage.Sets/src/mage/cards/m/MarathWillOfTheWild.java +++ b/Mage.Sets/src/mage/cards/m/MarathWillOfTheWild.java @@ -89,7 +89,7 @@ public class MarathWillOfTheWild extends CardImpl { ability.addCost(new MarathWillOfTheWildRemoveCountersCost()); ability.addTarget(new TargetCreaturePermanent()); - // or Marath deals X damage to target creature or player; + // or Marath deals X damage to any target; Mode mode = new Mode(); mode.getEffects().add(new DamageTargetEffect(new ManacostVariableValue())); mode.getTargets().add(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/m/MarduHeartPiercer.java b/Mage.Sets/src/mage/cards/m/MarduHeartPiercer.java index c01b7e18ef..bce976a76b 100644 --- a/Mage.Sets/src/mage/cards/m/MarduHeartPiercer.java +++ b/Mage.Sets/src/mage/cards/m/MarduHeartPiercer.java @@ -55,9 +55,9 @@ public class MarduHeartPiercer extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(3); - // Raid - When Mardu Heart-Piercer enters the battlefield, if you attacked with a creature this turn, Mardu Heart-Piercer deals 2 damage to target creature or player. + // Raid - When Mardu Heart-Piercer enters the battlefield, if you attacked with a creature this turn, Mardu Heart-Piercer deals 2 damage to any target. Ability ability = new ConditionalTriggeredAbility(new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(2)), RaidCondition.instance, - "Raid - When {this} enters the battlefield, if you attacked with a creature this turn, {this} deals 2 damage to target creature or player."); + "Raid - When {this} enters the battlefield, if you attacked with a creature this turn, {this} deals 2 damage to any target."); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability, new PlayerAttackedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/m/Martyrdom.java b/Mage.Sets/src/mage/cards/m/Martyrdom.java index 902b60d94c..fb0cf6c682 100644 --- a/Mage.Sets/src/mage/cards/m/Martyrdom.java +++ b/Mage.Sets/src/mage/cards/m/Martyrdom.java @@ -28,16 +28,12 @@ package mage.cards.m; import java.util.UUID; -import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.ContinuousEffectImpl; -import mage.abilities.effects.Effect; import mage.abilities.effects.Effects; import mage.abilities.effects.RedirectionEffect; -import mage.abilities.effects.common.RedirectDamageFromSourceToTargetEffect; -import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; @@ -52,7 +48,6 @@ import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; -import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetAnyTarget; @@ -63,9 +58,9 @@ import mage.target.common.TargetAnyTarget; public class Martyrdom extends CardImpl { public Martyrdom(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{W}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{W}{W}"); - // Until end of turn, target creature you control gains "{0}: The next 1 damage that would be dealt to target creature or player this turn is dealt to this creature instead." Only you may activate this ability. + // Until end of turn, target creature you control gains "{0}: The next 1 damage that would be dealt to any target this turn is dealt to this creature instead." Only you may activate this ability. this.getSpellAbility().addEffect(new MartyrdomGainAbilityTargetEffect()); this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); } @@ -84,9 +79,9 @@ class MartyrdomGainAbilityTargetEffect extends ContinuousEffectImpl { public MartyrdomGainAbilityTargetEffect() { super(Duration.EndOfTurn, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility); - this.staticText = "Until end of turn, target creature you control gains \"{0}: The next 1 damage that would be dealt to target creature or player this turn is dealt to this creature instead.\" Only you may activate this ability"; + this.staticText = "Until end of turn, target creature you control gains \"{0}: The next 1 damage that would be dealt to target creature, planeswalker, or player this turn is dealt to this creature instead.\" Only you may activate this ability"; } - + public MartyrdomGainAbilityTargetEffect(final MartyrdomGainAbilityTargetEffect effect) { super(effect); } @@ -110,10 +105,10 @@ class MartyrdomGainAbilityTargetEffect extends ContinuousEffectImpl { } class MartyrdomActivatedAbility extends ActivatedAbilityImpl { - + private static FilterCreaturePermanent filter = new FilterCreaturePermanent(); private UUID caster; - + public MartyrdomActivatedAbility(UUID caster) { super(Zone.BATTLEFIELD, new MartyrdomRedirectDamageTargetEffect(Duration.EndOfTurn, 1), new GenericManaCost(0)); this.addTarget(new TargetAnyTarget()); @@ -150,7 +145,7 @@ class MartyrdomActivatedAbility extends ActivatedAbilityImpl { @Override public String getRule() { - return "{0}: The next 1 damage that would be dealt to target creature or player this turn is dealt to {this} instead."; + return "{0}: The next 1 damage that would be dealt to target creature, planeswalker, or player this turn is dealt to {this} instead."; } } @@ -160,7 +155,7 @@ class MartyrdomRedirectDamageTargetEffect extends RedirectionEffect { public MartyrdomRedirectDamageTargetEffect(Duration duration, int amount) { super(duration, amount, true); - staticText = "The next " + amount + " damage that would be dealt to target creature or player this turn is dealt to {this} instead"; + staticText = "The next " + amount + " damage that would be dealt to target creature, planeswalker, or player this turn is dealt to {this} instead"; } public MartyrdomRedirectDamageTargetEffect(final MartyrdomRedirectDamageTargetEffect effect) { diff --git a/Mage.Sets/src/mage/cards/m/MartyrsCause.java b/Mage.Sets/src/mage/cards/m/MartyrsCause.java index 6100cc9ee3..24e166b007 100644 --- a/Mage.Sets/src/mage/cards/m/MartyrsCause.java +++ b/Mage.Sets/src/mage/cards/m/MartyrsCause.java @@ -50,7 +50,7 @@ public class MartyrsCause extends CardImpl { public MartyrsCause(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); - // Sacrifice a creature: The next time a source of your choice would deal damage to target creature or player this turn, prevent that damage. + // Sacrifice a creature: The next time a source of your choice would deal damage to any target this turn, prevent that damage. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventNextDamageFromChosenSourceToTargetEffect(Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/m/MassiveRaid.java b/Mage.Sets/src/mage/cards/m/MassiveRaid.java index dc03fafd7a..0d865fc1df 100644 --- a/Mage.Sets/src/mage/cards/m/MassiveRaid.java +++ b/Mage.Sets/src/mage/cards/m/MassiveRaid.java @@ -46,7 +46,7 @@ public class MassiveRaid extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{R}{R}"); - // Massive Raid deals damage to target creature or player equal to the number of creatures you control. + // Massive Raid deals damage to any target equal to the number of creatures you control. this.getSpellAbility().addEffect(new DamageTargetEffect(new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent()))); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/m/MasterApothecary.java b/Mage.Sets/src/mage/cards/m/MasterApothecary.java index b127329aa9..c8ecf3fb9c 100644 --- a/Mage.Sets/src/mage/cards/m/MasterApothecary.java +++ b/Mage.Sets/src/mage/cards/m/MasterApothecary.java @@ -67,7 +67,7 @@ public class MasterApothecary extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // Tap an untapped Cleric you control: Prevent the next 2 damage that would be dealt to target creature or player this turn. + // Tap an untapped Cleric you control: Prevent the next 2 damage that would be dealt to any target this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true))); diff --git a/Mage.Sets/src/mage/cards/m/MasterHealer.java b/Mage.Sets/src/mage/cards/m/MasterHealer.java index 47579d2ed9..dcd71c3557 100644 --- a/Mage.Sets/src/mage/cards/m/MasterHealer.java +++ b/Mage.Sets/src/mage/cards/m/MasterHealer.java @@ -55,7 +55,7 @@ public class MasterHealer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(4); - // {tap}: Prevent the next 4 damage that would be dealt to target creature or player this turn. + // {tap}: Prevent the next 4 damage that would be dealt to any target this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 4), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MasterTheWay.java b/Mage.Sets/src/mage/cards/m/MasterTheWay.java index 6fa1723c5d..93573959a5 100644 --- a/Mage.Sets/src/mage/cards/m/MasterTheWay.java +++ b/Mage.Sets/src/mage/cards/m/MasterTheWay.java @@ -47,10 +47,10 @@ public class MasterTheWay extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{U}{R}"); - // Draw a card. Master the Way deals damage to target creature or player equal to the number of cards in your hand. + // Draw a card. Master the Way deals damage to any target equal to the number of cards in your hand. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); Effect effect = new DamageTargetEffect(new CardsInControllerHandCount()); - effect.setText("{this} deals damage to target creature or player equal to the number of cards in your hand"); + effect.setText("{this} deals damage to any target equal to the number of cards in your hand"); this.getSpellAbility().addEffect(effect); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/m/MendingHands.java b/Mage.Sets/src/mage/cards/m/MendingHands.java index be394e6ec7..bc73ccb652 100644 --- a/Mage.Sets/src/mage/cards/m/MendingHands.java +++ b/Mage.Sets/src/mage/cards/m/MendingHands.java @@ -44,7 +44,7 @@ public class MendingHands extends CardImpl { public MendingHands(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{W}"); - // Prevent the next 4 damage that would be dealt to target creature or player this turn. + // Prevent the next 4 damage that would be dealt to any target this turn. this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, 4)); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/m/MeteorStorm.java b/Mage.Sets/src/mage/cards/m/MeteorStorm.java index b3b76d080f..04fcaeed3a 100644 --- a/Mage.Sets/src/mage/cards/m/MeteorStorm.java +++ b/Mage.Sets/src/mage/cards/m/MeteorStorm.java @@ -51,7 +51,7 @@ public class MeteorStorm extends CardImpl { public MeteorStorm(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{R}{G}"); - // {2}{R}{G}, Discard two cards at random: Meteor Storm deals 4 damage to target creature or player. + // {2}{R}{G}, Discard two cards at random: Meteor Storm deals 4 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4), new ManaCostsImpl("{2}{R}{G}")); ability.addCost(new DiscardTargetCost(new TargetCardInHand(2, new FilterCard("two cards at random")), true)); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/m/Meteorite.java b/Mage.Sets/src/mage/cards/m/Meteorite.java index 0bc026643b..de2eae4298 100644 --- a/Mage.Sets/src/mage/cards/m/Meteorite.java +++ b/Mage.Sets/src/mage/cards/m/Meteorite.java @@ -46,7 +46,7 @@ public class Meteorite extends CardImpl { public Meteorite(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); - // When Meteorite enters the battlefield, it deals 2 damage to target creature or player. + // When Meteorite enters the battlefield, it deals 2 damage to any target. Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(2, "it"), false); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MilitantMonk.java b/Mage.Sets/src/mage/cards/m/MilitantMonk.java index 1a3e9631b6..1f98a9396e 100644 --- a/Mage.Sets/src/mage/cards/m/MilitantMonk.java +++ b/Mage.Sets/src/mage/cards/m/MilitantMonk.java @@ -58,7 +58,7 @@ public class MilitantMonk extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); - // {T}: Prevent the next 1 damage that would be dealt to target creature or player this turn. + // {T}: Prevent the next 1 damage that would be dealt to any target this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MoggFanatic.java b/Mage.Sets/src/mage/cards/m/MoggFanatic.java index 115aff8536..34b68e41d6 100644 --- a/Mage.Sets/src/mage/cards/m/MoggFanatic.java +++ b/Mage.Sets/src/mage/cards/m/MoggFanatic.java @@ -53,7 +53,7 @@ public class MoggFanatic extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // Sacrifice Mogg Fanatic: Mogg Fanatic deals 1 damage to target creature or player. + // Sacrifice Mogg Fanatic: Mogg Fanatic deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MoltenHydra.java b/Mage.Sets/src/mage/cards/m/MoltenHydra.java index 103792eaeb..8ff157ed21 100644 --- a/Mage.Sets/src/mage/cards/m/MoltenHydra.java +++ b/Mage.Sets/src/mage/cards/m/MoltenHydra.java @@ -67,7 +67,7 @@ public class MoltenHydra extends CardImpl { // {1}{R}{R}: Put a +1/+1 counter on Molten Hydra. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new ManaCostsImpl("{1}{R}{R}"))); - // {tap}, Remove all +1/+1 counters from Molten Hydra: Molten Hydra deals damage to target creature or player equal to the number of +1/+1 counters removed this way. + // {tap}, Remove all +1/+1 counters from Molten Hydra: Molten Hydra deals damage to any target equal to the number of +1/+1 counters removed this way. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new MotltenHydraDynamicValue()), new TapSourceCost()); ability.addCost(new RemoveAllCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/m/MoltenNursery.java b/Mage.Sets/src/mage/cards/m/MoltenNursery.java index 41ce81e9db..c991f71ecc 100644 --- a/Mage.Sets/src/mage/cards/m/MoltenNursery.java +++ b/Mage.Sets/src/mage/cards/m/MoltenNursery.java @@ -57,7 +57,7 @@ public class MoltenNursery extends CardImpl { // Devoid this.addAbility(new DevoidAbility(this.color)); - // Whenever you cast a colorless spell, Molten Nursery deals 1 damage to target creature or player. + // Whenever you cast a colorless spell, Molten Nursery deals 1 damage to any target. Ability ability = new SpellCastControllerTriggeredAbility(new DamageTargetEffect(1), filter, false); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MoltenTailMasticore.java b/Mage.Sets/src/mage/cards/m/MoltenTailMasticore.java index 2b0fca61b9..f5f846e9e7 100644 --- a/Mage.Sets/src/mage/cards/m/MoltenTailMasticore.java +++ b/Mage.Sets/src/mage/cards/m/MoltenTailMasticore.java @@ -66,7 +66,7 @@ public class MoltenTailMasticore extends CardImpl { // At the beginning of your upkeep, sacrifice Molten-Tail Masticore unless you discard a card. this.addAbility(new MoltenTailMasticoreAbility()); - // {4}, Exile a creature card from your graveyard: Molten-Tail Masticore deals 4 damage to target creature or player. + // {4}, Exile a creature card from your graveyard: Molten-Tail Masticore deals 4 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4), new GenericManaCost(4)); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(new FilterCreatureCard("a creature card from your graveyard")))); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/m/MoltenVortex.java b/Mage.Sets/src/mage/cards/m/MoltenVortex.java index c155579409..caa6795fee 100644 --- a/Mage.Sets/src/mage/cards/m/MoltenVortex.java +++ b/Mage.Sets/src/mage/cards/m/MoltenVortex.java @@ -50,7 +50,7 @@ public class MoltenVortex extends CardImpl { public MoltenVortex(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{R}"); - // {R}, Discard a land card: Molten Vortex deals 2 damage to target creature or player. + // {R}, Discard a land card: Molten Vortex deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new DiscardTargetCost(new TargetCardInHand(new FilterLandCard()))); ability.addCost(new ManaCostsImpl("{R}")); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/m/MoongloveExtract.java b/Mage.Sets/src/mage/cards/m/MoongloveExtract.java index b2af1acc20..e0eb06c8c8 100644 --- a/Mage.Sets/src/mage/cards/m/MoongloveExtract.java +++ b/Mage.Sets/src/mage/cards/m/MoongloveExtract.java @@ -47,7 +47,7 @@ public class MoongloveExtract extends CardImpl { public MoongloveExtract(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); - // Sacrifice Moonglove Extract: Moonglove Extract deals 2 damage to target creature or player. + // Sacrifice Moonglove Extract: Moonglove Extract deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MorbidHunger.java b/Mage.Sets/src/mage/cards/m/MorbidHunger.java index 767a049fae..c4e0ad3fbb 100644 --- a/Mage.Sets/src/mage/cards/m/MorbidHunger.java +++ b/Mage.Sets/src/mage/cards/m/MorbidHunger.java @@ -48,7 +48,7 @@ public class MorbidHunger extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{B}{B}"); - // Morbid Hunger deals 3 damage to target creature or player. You gain 3 life. + // Morbid Hunger deals 3 damage to any target. You gain 3 life. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new GainLifeEffect(3)); diff --git a/Mage.Sets/src/mage/cards/m/MorgueBurst.java b/Mage.Sets/src/mage/cards/m/MorgueBurst.java index 9da2a22df3..94ca706440 100644 --- a/Mage.Sets/src/mage/cards/m/MorgueBurst.java +++ b/Mage.Sets/src/mage/cards/m/MorgueBurst.java @@ -53,7 +53,7 @@ public class MorgueBurst extends CardImpl { public MorgueBurst(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{4}{B}{R}"); - // Return target creature card from your graveyard to your hand. Morgue Burst deals damage to target creature or player equal to the power of the card returned this way. + // Return target creature card from your graveyard to your hand. Morgue Burst deals damage to any target equal to the power of the card returned this way. this.getSpellAbility().addEffect(new MorgueBurstEffect()); this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); this.getSpellAbility().addTarget(new TargetAnyTarget()); @@ -110,7 +110,7 @@ class MorgueBurstEffect extends OneShotEffect { @Override public String getText(Mode mode) { StringBuilder sb = new StringBuilder(); - sb.append("Return target creature card from your graveyard to your hand. Morgue Burst deals damage to target creature or player equal to the power of the card returned this way"); + sb.append("Return target creature card from your graveyard to your hand. Morgue Burst deals damage to any target equal to the power of the card returned this way"); return sb.toString(); } } diff --git a/Mage.Sets/src/mage/cards/m/Mortarpod.java b/Mage.Sets/src/mage/cards/m/Mortarpod.java index 519ff415c7..378e892742 100644 --- a/Mage.Sets/src/mage/cards/m/Mortarpod.java +++ b/Mage.Sets/src/mage/cards/m/Mortarpod.java @@ -61,14 +61,14 @@ public class Mortarpod extends CardImpl { // Living weapon (When this Equipment enters the battlefield, create a 0/0 black Germ creature token, then attach this to it.) this.addAbility(new LivingWeaponAbility()); - // Equipped creature gets +0/+1 and has "Sacrifice this creature: This creature deals 1 damage to target creature or player." + // Equipped creature gets +0/+1 and has "Sacrifice this creature: This creature deals 1 damage to any target." Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(0, 1)); SimpleActivatedAbility abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeSourceCost()); abilityToGain.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAttachedEffect(abilityToGain, AttachmentType.EQUIPMENT); - effect.setText("and has \"Sacrifice this creature: This creature deals 1 damage to target creature or player.\""); + effect.setText("and has \"Sacrifice this creature: This creature deals 1 damage to any target.\""); ability.addEffect(effect); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MudbuttonTorchrunner.java b/Mage.Sets/src/mage/cards/m/MudbuttonTorchrunner.java index 7178fff968..093b1ba7a6 100644 --- a/Mage.Sets/src/mage/cards/m/MudbuttonTorchrunner.java +++ b/Mage.Sets/src/mage/cards/m/MudbuttonTorchrunner.java @@ -51,7 +51,7 @@ public class MudbuttonTorchrunner extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // When Mudbutton Torchrunner dies, it deals 3 damage to target creature or player. + // When Mudbutton Torchrunner dies, it deals 3 damage to any target. Ability ability = new DiesTriggeredAbility(new DamageTargetEffect(3, "it"), false); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MurderousRedcap.java b/Mage.Sets/src/mage/cards/m/MurderousRedcap.java index 253f93974a..d3a21b57ae 100644 --- a/Mage.Sets/src/mage/cards/m/MurderousRedcap.java +++ b/Mage.Sets/src/mage/cards/m/MurderousRedcap.java @@ -58,7 +58,7 @@ public class MurderousRedcap extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // When Murderous Redcap enters the battlefield, it deals damage equal to its power to target creature or player. + // When Murderous Redcap enters the battlefield, it deals damage equal to its power to any target. Ability ability = new EntersBattlefieldTriggeredAbility(new MurderousRedcapEffect()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); @@ -80,7 +80,7 @@ class MurderousRedcapEffect extends OneShotEffect { public MurderousRedcapEffect() { super(Outcome.Damage); - staticText = "it deals damage equal to its power to target creature or player"; + staticText = "it deals damage equal to its power to any target"; } public MurderousRedcapEffect(final MurderousRedcapEffect effect) { diff --git a/Mage.Sets/src/mage/cards/n/NeedleDrop.java b/Mage.Sets/src/mage/cards/n/NeedleDrop.java index 6c84d92cd9..946cd232be 100644 --- a/Mage.Sets/src/mage/cards/n/NeedleDrop.java +++ b/Mage.Sets/src/mage/cards/n/NeedleDrop.java @@ -60,7 +60,7 @@ public class NeedleDrop extends CardImpl { public NeedleDrop(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{R}"); - // Needle Drop deals 1 damage to target creature or player that was dealt damage this turn. + // Needle Drop deals 1 damage to any target that was dealt damage this turn. Effect effect = new DamageTargetEffect(1); effect.setText("{this} deals 1 damage to any target that was dealt damage this turn"); this.getSpellAbility().addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/n/NicolBolasGodPharaoh.java b/Mage.Sets/src/mage/cards/n/NicolBolasGodPharaoh.java index 901dcfdb96..4d0412b7b6 100644 --- a/Mage.Sets/src/mage/cards/n/NicolBolasGodPharaoh.java +++ b/Mage.Sets/src/mage/cards/n/NicolBolasGodPharaoh.java @@ -82,7 +82,7 @@ public class NicolBolasGodPharaoh extends CardImpl { // +1: Each opponent exiles two cards from their hand. this.addAbility(new LoyaltyAbility(new NicolBolasGodPharaohPlusOneEffect(), 1)); - // -4: Nicol Bolas, God-Pharaoh deals 7 damage to target creature or player. + // -4: Nicol Bolas, God-Pharaoh deals 7 damage to any target. ability = new LoyaltyAbility(new DamageTargetEffect(7), -4); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NightfireGiant.java b/Mage.Sets/src/mage/cards/n/NightfireGiant.java index fe73e9db1f..1e3a74cf8d 100644 --- a/Mage.Sets/src/mage/cards/n/NightfireGiant.java +++ b/Mage.Sets/src/mage/cards/n/NightfireGiant.java @@ -68,7 +68,7 @@ public class NightfireGiant extends CardImpl { // Nightfire Giant gets +1/+1 as long as you control a Mountain. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceWhileControlsEffect(filter, 1, 1))); - // {4}{R}: Nightfire Giant deals 2 damage to target creature or player. + // {4}{R}: Nightfire Giant deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{4}{R}")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NivMizzetDracogenius.java b/Mage.Sets/src/mage/cards/n/NivMizzetDracogenius.java index e75a5cb39c..ae97dd82a5 100644 --- a/Mage.Sets/src/mage/cards/n/NivMizzetDracogenius.java +++ b/Mage.Sets/src/mage/cards/n/NivMizzetDracogenius.java @@ -66,7 +66,7 @@ public class NivMizzetDracogenius extends CardImpl { // Whenever Niv-Mizzet, Dracogenius deals damage to a player, you may draw a card. this.addAbility(new DealsDamageToAPlayerTriggeredAbility(new DrawCardSourceControllerEffect(1), true)); - // {U}{R}: Niv-Mizzet, Dracogenius deals 1 damage to target creature or player. + // {U}{R}: Niv-Mizzet, Dracogenius deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1),new ManaCostsImpl("{U}{R}")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NivMizzetTheFiremind.java b/Mage.Sets/src/mage/cards/n/NivMizzetTheFiremind.java index d6b4ffba17..aea62de3b4 100644 --- a/Mage.Sets/src/mage/cards/n/NivMizzetTheFiremind.java +++ b/Mage.Sets/src/mage/cards/n/NivMizzetTheFiremind.java @@ -62,7 +62,7 @@ public class NivMizzetTheFiremind extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // Whenever you draw a card, Niv-Mizzet, the Firemind deals 1 damage to target creature or player. + // Whenever you draw a card, Niv-Mizzet, the Firemind deals 1 damage to any target. Ability ability = new DrawCardControllerTriggeredAbility(new DamageTargetEffect(1), false); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OgreShaman.java b/Mage.Sets/src/mage/cards/o/OgreShaman.java index 00ef0fcc89..97f1c98321 100644 --- a/Mage.Sets/src/mage/cards/o/OgreShaman.java +++ b/Mage.Sets/src/mage/cards/o/OgreShaman.java @@ -54,7 +54,7 @@ public class OgreShaman extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - // {2}, Discard a card at random: Ogre Shaman deals 2 damage to target creature or player. + // {2}, Discard a card at random: Ogre Shaman deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new GenericManaCost(2)); ability.addCost(new DiscardCardCost(true)); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/o/OmnathLocusOfRage.java b/Mage.Sets/src/mage/cards/o/OmnathLocusOfRage.java index 8be97db1d3..9f422026a8 100644 --- a/Mage.Sets/src/mage/cards/o/OmnathLocusOfRage.java +++ b/Mage.Sets/src/mage/cards/o/OmnathLocusOfRage.java @@ -69,7 +69,7 @@ public class OmnathLocusOfRage extends CardImpl { // Landfall - Whenever a land enters the battlefield under your control, create a 5/5 red and green Elemental creature token. this.addAbility(new LandfallAbility(new CreateTokenEffect(new OmnathElementalToken()), false)); - // Whenever Omnath, Locus of Rage or another Elemental you control dies, Omnath deals 3 damage to target creature or player. + // Whenever Omnath, Locus of Rage or another Elemental you control dies, Omnath deals 3 damage to any target. Ability ability = new DiesThisOrAnotherCreatureTriggeredAbility(new DamageTargetEffect(3), false, filter); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OpenFire.java b/Mage.Sets/src/mage/cards/o/OpenFire.java index 61b5a34672..987f88072c 100644 --- a/Mage.Sets/src/mage/cards/o/OpenFire.java +++ b/Mage.Sets/src/mage/cards/o/OpenFire.java @@ -43,7 +43,7 @@ public class OpenFire extends CardImpl { public OpenFire(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{R}"); - // Open Fire deals 3 damage to target creature or player. + // Open Fire deals 3 damage to any target. getSpellAbility().addEffect(new DamageTargetEffect(3)); getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/o/OrcishArtillery.java b/Mage.Sets/src/mage/cards/o/OrcishArtillery.java index bb87b8852b..8c0f30dcd5 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishArtillery.java +++ b/Mage.Sets/src/mage/cards/o/OrcishArtillery.java @@ -55,7 +55,7 @@ public class OrcishArtillery extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(3); - // {tap}: Orcish Artillery deals 2 damage to target creature or player and 3 damage to you. + // {tap}: Orcish Artillery deals 2 damage to any target and 3 damage to you. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); ability.addEffect(new DamageControllerEffect(3)); diff --git a/Mage.Sets/src/mage/cards/o/OrcishBloodpainter.java b/Mage.Sets/src/mage/cards/o/OrcishBloodpainter.java index 9e90b6d58f..b4c5c87b8d 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishBloodpainter.java +++ b/Mage.Sets/src/mage/cards/o/OrcishBloodpainter.java @@ -56,7 +56,7 @@ public class OrcishBloodpainter extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - // {tap}, Sacrifice a creature: Orcish Bloodpainter deals 1 damage to target creature or player. + // {tap}, Sacrifice a creature: Orcish Bloodpainter deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/o/OrcishCannonade.java b/Mage.Sets/src/mage/cards/o/OrcishCannonade.java index 06871fc4b0..0659bb8b9b 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishCannonade.java +++ b/Mage.Sets/src/mage/cards/o/OrcishCannonade.java @@ -46,7 +46,7 @@ public class OrcishCannonade extends CardImpl { public OrcishCannonade(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{R}{R}"); - // Orcish Cannonade deals 2 damage to target creature or player and 3 damage to you. + // Orcish Cannonade deals 2 damage to any target and 3 damage to you. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellAbility().addTarget(new TargetAnyTarget()); Effect effect = new DamageControllerEffect(3); diff --git a/Mage.Sets/src/mage/cards/o/OrcishCannoneers.java b/Mage.Sets/src/mage/cards/o/OrcishCannoneers.java index 89354fe3c7..6cf13f0bd1 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishCannoneers.java +++ b/Mage.Sets/src/mage/cards/o/OrcishCannoneers.java @@ -56,7 +56,7 @@ public class OrcishCannoneers extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(3); - // {tap}: Orcish Cannoneers deals 2 damage to target creature or player and 3 damage to you. + // {tap}: Orcish Cannoneers deals 2 damage to any target and 3 damage to you. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); Effect effect = new DamageControllerEffect(3); effect.setText("and 3 damage to you"); diff --git a/Mage.Sets/src/mage/cards/o/OrcishMechanics.java b/Mage.Sets/src/mage/cards/o/OrcishMechanics.java index afd68e6cfe..be1bd9158e 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishMechanics.java +++ b/Mage.Sets/src/mage/cards/o/OrcishMechanics.java @@ -55,7 +55,7 @@ public class OrcishMechanics extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // {tap}, Sacrifice an artifact: Orcish Mechanics deals 2 damage to target creature or player. + // {tap}, Sacrifice an artifact: Orcish Mechanics deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(new FilterControlledArtifactPermanent("an artifact")))); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/o/OrdealOfPurphoros.java b/Mage.Sets/src/mage/cards/o/OrdealOfPurphoros.java index e2fd1d42c3..9382b1d141 100644 --- a/Mage.Sets/src/mage/cards/o/OrdealOfPurphoros.java +++ b/Mage.Sets/src/mage/cards/o/OrdealOfPurphoros.java @@ -71,7 +71,7 @@ public class OrdealOfPurphoros extends CardImpl { ability.addEffect(new ConditionalOneShotEffect(new SacrificeSourceEffect(), new AttachedToCounterCondition(CounterType.P1P1, 3), "Then if it has three or more +1/+1 counters on it, sacrifice {this}")); this.addAbility(ability); - // When you sacrifice Ordeal of Purphoros, it deals 3 damage to target creature or player. + // When you sacrifice Ordeal of Purphoros, it deals 3 damage to any target. ability = new SacrificeSourceTriggeredAbility( new DamageTargetEffect(3, "it"),false); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/o/OrimSamiteHealer.java b/Mage.Sets/src/mage/cards/o/OrimSamiteHealer.java index 4e4aea3e62..0f8b6b77ed 100644 --- a/Mage.Sets/src/mage/cards/o/OrimSamiteHealer.java +++ b/Mage.Sets/src/mage/cards/o/OrimSamiteHealer.java @@ -59,7 +59,7 @@ public class OrimSamiteHealer extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 3), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); - // {tap}: Prevent the next 3 damage that would be dealt to target creature or player this turn. + // {tap}: Prevent the next 3 damage that would be dealt to any target this turn. } public OrimSamiteHealer(final OrimSamiteHealer card) { diff --git a/Mage.Sets/src/mage/cards/o/OrimsCure.java b/Mage.Sets/src/mage/cards/o/OrimsCure.java index ce15b971c6..dfb9875c88 100644 --- a/Mage.Sets/src/mage/cards/o/OrimsCure.java +++ b/Mage.Sets/src/mage/cards/o/OrimsCure.java @@ -68,7 +68,7 @@ public class OrimsCure extends CardImpl { cost.setText(" tap an untapped creature you control"); this.addAbility(new AlternativeCostSourceAbility(cost, new PermanentsOnTheBattlefieldCondition(filter))); - // Prevent the next 4 damage that would be dealt to target creature or player this turn. + // Prevent the next 4 damage that would be dealt to any target this turn. this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, 4)); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/o/OrimsTouch.java b/Mage.Sets/src/mage/cards/o/OrimsTouch.java index 77747ddd5d..27020d9cd7 100644 --- a/Mage.Sets/src/mage/cards/o/OrimsTouch.java +++ b/Mage.Sets/src/mage/cards/o/OrimsTouch.java @@ -52,7 +52,7 @@ public class OrimsTouch extends CardImpl { // Kicker {1} this.addAbility(new KickerAbility("{1}")); - // Prevent the next 2 damage that would be dealt to target creature or player this turn. If Orim's Touch was kicked, prevent the next 4 damage that would be dealt to that creature or player this turn instead. + // Prevent the next 2 damage that would be dealt to any target this turn. If Orim's Touch was kicked, prevent the next 4 damage that would be dealt to that creature or player this turn instead. Effect effect = new ConditionalReplacementEffect( new PreventDamageToTargetEffect(Duration.EndOfTurn, 4), new LockedInCondition(KickedCondition.instance), diff --git a/Mage.Sets/src/mage/cards/o/OutpostSiege.java b/Mage.Sets/src/mage/cards/o/OutpostSiege.java index 2453fe7b6d..7887d55754 100644 --- a/Mage.Sets/src/mage/cards/o/OutpostSiege.java +++ b/Mage.Sets/src/mage/cards/o/OutpostSiege.java @@ -62,7 +62,7 @@ import mage.target.targetpointer.FixedTarget; public class OutpostSiege extends CardImpl { private final static String ruleTrigger1 = "&bull Khans — At the beginning of your upkeep, exile the top card of your library. Until end of turn, you may play that card."; - private final static String ruleTrigger2 = "&bull Dragons — Whenever a creature you control leaves the battlefield, {this} deals 1 damage to target creature or player."; + private final static String ruleTrigger2 = "&bull Dragons — Whenever a creature you control leaves the battlefield, {this} deals 1 damage to any target."; public OutpostSiege(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{R}"); @@ -77,7 +77,7 @@ public class OutpostSiege extends CardImpl { new ModeChoiceSourceCondition("Khans"), ruleTrigger1)); - // * Dragons - Whenever a creature you control leaves the battlefield, Outpost Siege deals 1 damage to target creature or player. + // * Dragons - Whenever a creature you control leaves the battlefield, Outpost Siege deals 1 damage to any target. Ability ability2 = new ConditionalTriggeredAbility( new ZoneChangeAllTriggeredAbility(Zone.BATTLEFIELD, Zone.BATTLEFIELD, null, new DamageTargetEffect(1), new FilterControlledCreaturePermanent(), "", false), diff --git a/Mage.Sets/src/mage/cards/p/Panacea.java b/Mage.Sets/src/mage/cards/p/Panacea.java index 86f27bf54a..260a564add 100644 --- a/Mage.Sets/src/mage/cards/p/Panacea.java +++ b/Mage.Sets/src/mage/cards/p/Panacea.java @@ -49,7 +49,7 @@ public class Panacea extends CardImpl { public Panacea(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); - // {X}{X}, {tap}: Prevent the next X damage that would be dealt to target creature or player this turn. + // {X}{X}, {tap}: Prevent the next X damage that would be dealt to any target this turn. Ability ability = new SimpleActivatedAbility( new PreventDamageToTargetEffect(Duration.EndOfTurn, false, true, new ManacostVariableValue()), new ManaCostsImpl("{X}{X}") diff --git a/Mage.Sets/src/mage/cards/p/Pandemonium.java b/Mage.Sets/src/mage/cards/p/Pandemonium.java index dadbed9516..75b58d14b0 100644 --- a/Mage.Sets/src/mage/cards/p/Pandemonium.java +++ b/Mage.Sets/src/mage/cards/p/Pandemonium.java @@ -54,7 +54,7 @@ public class Pandemonium extends CardImpl { public Pandemonium(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}"); - // Whenever a creature enters the battlefield, that creature's controller may have it deal damage equal to its power to target creature or player of their choice. + // Whenever a creature enters the battlefield, that creature's controller may have it deal damage equal to its power to any target of their choice. Ability ability = new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new PandemoniumEffect(), StaticFilters.FILTER_PERMANENT_CREATURE, false, SetTargetPointer.PERMANENT, ""); ability.addTarget(new TargetAnyTarget()); originalId = ability.getOriginalId(); @@ -87,7 +87,7 @@ class PandemoniumEffect extends OneShotEffect { public PandemoniumEffect() { super(Outcome.Benefit); - this.staticText = "that creature's controller may have it deal damage equal to its power to target creature or player of their choice"; + this.staticText = "that creature's controller may have it deal damage equal to its power to any target of their choice"; } public PandemoniumEffect(final PandemoniumEffect effect) { diff --git a/Mage.Sets/src/mage/cards/p/Parch.java b/Mage.Sets/src/mage/cards/p/Parch.java index 2601644cc3..f965ee2504 100644 --- a/Mage.Sets/src/mage/cards/p/Parch.java +++ b/Mage.Sets/src/mage/cards/p/Parch.java @@ -55,7 +55,7 @@ public class Parch extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{R}"); - // Choose one - Parch deals 2 damage to target creature or player; or Parch deals 4 damage to target blue creature. + // Choose one - Parch deals 2 damage to any target; or Parch deals 4 damage to target blue creature. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellAbility().addTarget(new TargetAnyTarget()); Mode mode = new Mode(); diff --git a/Mage.Sets/src/mage/cards/p/PardicArsonist.java b/Mage.Sets/src/mage/cards/p/PardicArsonist.java index 71bfa2b0aa..392fb2fb42 100644 --- a/Mage.Sets/src/mage/cards/p/PardicArsonist.java +++ b/Mage.Sets/src/mage/cards/p/PardicArsonist.java @@ -57,13 +57,13 @@ public class PardicArsonist extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - // Threshold - As long as seven or more cards are in your graveyard, Pardic Arsonist has "When Pardic Arsonist enters the battlefield, it deals 3 damage to target creature or player." + // Threshold - As long as seven or more cards are in your graveyard, Pardic Arsonist has "When Pardic Arsonist enters the battlefield, it deals 3 damage to any target." Ability gainedAbility = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(3, "it")); gainedAbility.addTarget(new TargetAnyTarget()); Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect(gainedAbility), new CardsInControllerGraveCondition(7), - "As long as seven or more cards are in your graveyard, {this} has \"When {this} enters the battlefield, it deals 3 damage to target creature or player.\"")); + "As long as seven or more cards are in your graveyard, {this} has \"When {this} enters the battlefield, it deals 3 damage to any target.\"")); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PearlShard.java b/Mage.Sets/src/mage/cards/p/PearlShard.java index 02327e7165..86ba231846 100644 --- a/Mage.Sets/src/mage/cards/p/PearlShard.java +++ b/Mage.Sets/src/mage/cards/p/PearlShard.java @@ -49,7 +49,7 @@ public class PearlShard extends CardImpl { public PearlShard(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); - // {3}, {tap} or {W}, {tap}: Prevent the next 2 damage that would be dealt to target creature or player this turn. + // {3}, {tap} or {W}, {tap}: Prevent the next 2 damage that would be dealt to any target this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new ManaCostsImpl("{3}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/p/PerilousMyr.java b/Mage.Sets/src/mage/cards/p/PerilousMyr.java index 89e09ec599..3f8d5a9b62 100644 --- a/Mage.Sets/src/mage/cards/p/PerilousMyr.java +++ b/Mage.Sets/src/mage/cards/p/PerilousMyr.java @@ -50,7 +50,7 @@ public class PerilousMyr extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // When Perilous Myr dies, it deals 2 damage to target creature or player. + // When Perilous Myr dies, it deals 2 damage to any target. Ability ability = new DiesTriggeredAbility(new DamageTargetEffect(2, "it"), false); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PiaAndKiranNalaar.java b/Mage.Sets/src/mage/cards/p/PiaAndKiranNalaar.java index ba36419061..6acc4d6ba1 100644 --- a/Mage.Sets/src/mage/cards/p/PiaAndKiranNalaar.java +++ b/Mage.Sets/src/mage/cards/p/PiaAndKiranNalaar.java @@ -67,7 +67,7 @@ public class PiaAndKiranNalaar extends CardImpl { effect.setText("create two 1/1 colorless Thopter artifact creature tokens with flying"); this.addAbility(new EntersBattlefieldTriggeredAbility(effect)); - // {2}{R}, Sacrifice an artifact: Pia and Kiran Nalaar deals 2 damage to target creature or player. + // {2}{R}, Sacrifice an artifact: Pia and Kiran Nalaar deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{2}{R}")); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(1, 1, new FilterControlledArtifactPermanent("an artifact"), true))); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/p/PillarOfFlame.java b/Mage.Sets/src/mage/cards/p/PillarOfFlame.java index b904a2fb58..d3e016cd93 100644 --- a/Mage.Sets/src/mage/cards/p/PillarOfFlame.java +++ b/Mage.Sets/src/mage/cards/p/PillarOfFlame.java @@ -46,7 +46,7 @@ public class PillarOfFlame extends CardImpl { public PillarOfFlame(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{R}"); - // Pillar of Flame deals 2 damage to target creature or player. + // Pillar of Flame deals 2 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellAbility().addTarget(new TargetAnyTarget()); // If a creature dealt damage this way would die this turn, exile it instead. diff --git a/Mage.Sets/src/mage/cards/p/PirateShip.java b/Mage.Sets/src/mage/cards/p/PirateShip.java index 2ddef0b2b8..7c0d507060 100644 --- a/Mage.Sets/src/mage/cards/p/PirateShip.java +++ b/Mage.Sets/src/mage/cards/p/PirateShip.java @@ -61,7 +61,7 @@ public class PirateShip extends CardImpl { // Pirate Ship can't attack unless defending player controls an Island. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); - // {tap}: Pirate Ship deals 1 damage to target creature or player. + // {tap}: Pirate Ship deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PitchburnDevils.java b/Mage.Sets/src/mage/cards/p/PitchburnDevils.java index d8a2783db1..b7ec0ed362 100644 --- a/Mage.Sets/src/mage/cards/p/PitchburnDevils.java +++ b/Mage.Sets/src/mage/cards/p/PitchburnDevils.java @@ -50,7 +50,7 @@ public class PitchburnDevils extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - // When Pitchburn Devils dies, it deals 3 damage to target creature or player. + // When Pitchburn Devils dies, it deals 3 damage to any target. DiesTriggeredAbility ability = new DiesTriggeredAbility(new DamageTargetEffect(3, "it")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PowerOfFire.java b/Mage.Sets/src/mage/cards/p/PowerOfFire.java index 9171de3e1f..bd66fa87e0 100644 --- a/Mage.Sets/src/mage/cards/p/PowerOfFire.java +++ b/Mage.Sets/src/mage/cards/p/PowerOfFire.java @@ -66,11 +66,11 @@ public class PowerOfFire extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // Enchanted creature has "{tap}: This creature deals 1 damage to target creature or player." + // Enchanted creature has "{tap}: This creature deals 1 damage to any target." Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); gainedAbility.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, - "Enchanted creature has \"{T}: This creature deals 1 damage to target creature or player.\""))); + "Enchanted creature has \"{T}: This creature deals 1 damage to any target.\""))); } diff --git a/Mage.Sets/src/mage/cards/p/PreyseizerDragon.java b/Mage.Sets/src/mage/cards/p/PreyseizerDragon.java index b127a673a9..99f156a975 100644 --- a/Mage.Sets/src/mage/cards/p/PreyseizerDragon.java +++ b/Mage.Sets/src/mage/cards/p/PreyseizerDragon.java @@ -62,7 +62,7 @@ public class PreyseizerDragon extends CardImpl { // Devour 2 (As this enters the battlefield, you may sacrifice any number of creatures. This creature enters the battlefield with twice that many +1/+1 counters on it.) this.addAbility(new DevourAbility(DevourFactor.Devour2)); - // Whenever Preyseizer Dragon attacks, it deals damage to target creature or player equal to the number of +1/+1 counters on Preyseizer Dragon. + // Whenever Preyseizer Dragon attacks, it deals damage to any target equal to the number of +1/+1 counters on Preyseizer Dragon. Ability ability = new AttacksTriggeredAbility(new DamageTargetEffect(new CountersSourceCount(CounterType.P1P1)), false); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/ProdigalSorcerer.java b/Mage.Sets/src/mage/cards/p/ProdigalSorcerer.java index d6dd14a3e6..29daf8d1cb 100644 --- a/Mage.Sets/src/mage/cards/p/ProdigalSorcerer.java +++ b/Mage.Sets/src/mage/cards/p/ProdigalSorcerer.java @@ -53,7 +53,7 @@ public class ProdigalSorcerer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - //{T}: Prodigal Sorcerer deals 1 damage to target creature or player. + //{T}: Prodigal Sorcerer deals 1 damage to any target. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/ProfanePrayers.java b/Mage.Sets/src/mage/cards/p/ProfanePrayers.java index ae801073a4..7a4f6157f5 100644 --- a/Mage.Sets/src/mage/cards/p/ProfanePrayers.java +++ b/Mage.Sets/src/mage/cards/p/ProfanePrayers.java @@ -54,7 +54,7 @@ public class ProfanePrayers extends CardImpl { public ProfanePrayers(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{B}{B}"); - // Profane Prayers deals X damage to target creature or player and you gain X life, where X is the number of Clerics on the battlefield. + // Profane Prayers deals X damage to any target and you gain X life, where X is the number of Clerics on the battlefield. this.getSpellAbility().addEffect(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter))); this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new GainLifeEffect(new PermanentsOnBattlefieldCount(filter))); diff --git a/Mage.Sets/src/mage/cards/p/PropheticBolt.java b/Mage.Sets/src/mage/cards/p/PropheticBolt.java index c7df4ff70d..fb5de701a8 100644 --- a/Mage.Sets/src/mage/cards/p/PropheticBolt.java +++ b/Mage.Sets/src/mage/cards/p/PropheticBolt.java @@ -48,7 +48,7 @@ public class PropheticBolt extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{U}{R}"); - // Prophetic Bolt deals 4 damage to target creature or player. Look at the top four cards of your library. Put one of those cards into your hand and the rest on the bottom of your library in any order. + // Prophetic Bolt deals 4 damage to any target. Look at the top four cards of your library. Put one of those cards into your hand and the rest on the bottom of your library in any order. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new LookLibraryAndPickControllerEffect(new StaticValue(4), false, new StaticValue(1), new FilterCard(), Zone.LIBRARY, false, false)); diff --git a/Mage.Sets/src/mage/cards/p/PsionicBlast.java b/Mage.Sets/src/mage/cards/p/PsionicBlast.java index 8695f219a6..9f15fb07cb 100644 --- a/Mage.Sets/src/mage/cards/p/PsionicBlast.java +++ b/Mage.Sets/src/mage/cards/p/PsionicBlast.java @@ -49,7 +49,7 @@ public class PsionicBlast extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{U}"); - // Psionic Blast deals 4 damage to target creature or player and 2 damage to you. + // Psionic Blast deals 4 damage to any target and 2 damage to you. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); this.getSpellAbility().addEffect(new PsionicBlastEffect()); this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/p/PsionicEntity.java b/Mage.Sets/src/mage/cards/p/PsionicEntity.java index bab08b1882..cdf46e7727 100644 --- a/Mage.Sets/src/mage/cards/p/PsionicEntity.java +++ b/Mage.Sets/src/mage/cards/p/PsionicEntity.java @@ -54,7 +54,7 @@ public class PsionicEntity extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // {tap}: Psionic Entity deals 2 damage to target creature or player and 3 damage to itself. + // {tap}: Psionic Entity deals 2 damage to any target and 3 damage to itself. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); ability.addEffect(new DamageSelfEffect(3).setText("and 3 damage to itself")); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/p/PsionicGift.java b/Mage.Sets/src/mage/cards/p/PsionicGift.java index 7ac135113c..75111941f3 100644 --- a/Mage.Sets/src/mage/cards/p/PsionicGift.java +++ b/Mage.Sets/src/mage/cards/p/PsionicGift.java @@ -65,7 +65,7 @@ public class PsionicGift extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // Enchanted creature has "{tap}: This creature deals 1 damage to target creature or player." + // Enchanted creature has "{tap}: This creature deals 1 damage to any target." Ability psiAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); psiAbility.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(psiAbility, AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/p/PsionicSliver.java b/Mage.Sets/src/mage/cards/p/PsionicSliver.java index f42272e395..073bd61a01 100644 --- a/Mage.Sets/src/mage/cards/p/PsionicSliver.java +++ b/Mage.Sets/src/mage/cards/p/PsionicSliver.java @@ -60,17 +60,17 @@ public class PsionicSliver extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // All Sliver creatures have "{T}: This creature deals 2 damage to target creature or player and 3 damage to itself." + // All Sliver creatures have "{T}: This creature deals 2 damage to any target and 3 damage to itself." Ability ability = new SimpleActivatedAbility( Zone.BATTLEFIELD, - new DamageTargetEffect(2).setText("This creature deals 2 damage to target creature or player"), + new DamageTargetEffect(2).setText("This creature deals 2 damage to any target"), new TapSourceCost() ); ability.addEffect(new DamageSelfEffect(3).setText("3 damage to itself.")); ability.addTarget(new TargetAnyTarget()); this.addAbility( new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, filter, - "All Sliver creatures have \"{T}: This creature deals 2 damage to target creature or player and 3 damage to itself.\"") + "All Sliver creatures have \"{T}: This creature deals 2 damage to any target and 3 damage to itself.\"") ) ); } diff --git a/Mage.Sets/src/mage/cards/p/PsychicPurge.java b/Mage.Sets/src/mage/cards/p/PsychicPurge.java index 1d0b39ea8e..257c2a597a 100644 --- a/Mage.Sets/src/mage/cards/p/PsychicPurge.java +++ b/Mage.Sets/src/mage/cards/p/PsychicPurge.java @@ -53,7 +53,7 @@ public class PsychicPurge extends CardImpl { public PsychicPurge(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{U}"); - // Psychic Purge deals 1 damage to target creature or player. + // Psychic Purge deals 1 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/p/PunishingFire.java b/Mage.Sets/src/mage/cards/p/PunishingFire.java index 617ae110c3..717eb46bf0 100644 --- a/Mage.Sets/src/mage/cards/p/PunishingFire.java +++ b/Mage.Sets/src/mage/cards/p/PunishingFire.java @@ -52,7 +52,7 @@ public class PunishingFire extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{R}"); - // Punishing Fire deals 2 damage to target creature or player. + // Punishing Fire deals 2 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellAbility().addTarget(new TargetAnyTarget()); // Whenever an opponent gains life, you may pay {R}. If you do, return Punishing Fire from your graveyard to your hand. diff --git a/Mage.Sets/src/mage/cards/p/PyreZombie.java b/Mage.Sets/src/mage/cards/p/PyreZombie.java index 8bfe4ab235..1bef108c76 100644 --- a/Mage.Sets/src/mage/cards/p/PyreZombie.java +++ b/Mage.Sets/src/mage/cards/p/PyreZombie.java @@ -61,7 +61,7 @@ public class PyreZombie extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.GRAVEYARD, new DoIfCostPaid(new ReturnToHandSourceEffect().setText("return {this} to your hand"), new ManaCostsImpl("{1}{B}{B}")), TargetController.YOU, false)); - // {1}{R}{R}, Sacrifice Pyre Zombie: Pyre Zombie deals 2 damage to target creature or player. + // {1}{R}{R}, Sacrifice Pyre Zombie: Pyre Zombie deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{1}{R}{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/p/Pyroconvergence.java b/Mage.Sets/src/mage/cards/p/Pyroconvergence.java index aefcc4d5d9..48681f1456 100644 --- a/Mage.Sets/src/mage/cards/p/Pyroconvergence.java +++ b/Mage.Sets/src/mage/cards/p/Pyroconvergence.java @@ -54,7 +54,7 @@ public class Pyroconvergence extends CardImpl { public Pyroconvergence(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{4}{R}"); - // Whenever you cast a multicolored spell, Pyroconvergence deals 2 damage to target creature or player. + // Whenever you cast a multicolored spell, Pyroconvergence deals 2 damage to any target. Ability ability = new SpellCastControllerTriggeredAbility(new DamageTargetEffect(2), filter, false); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PyromancersAssault.java b/Mage.Sets/src/mage/cards/p/PyromancersAssault.java index e5d2c7efe6..e3450eb745 100644 --- a/Mage.Sets/src/mage/cards/p/PyromancersAssault.java +++ b/Mage.Sets/src/mage/cards/p/PyromancersAssault.java @@ -50,7 +50,7 @@ public class PyromancersAssault extends CardImpl { public PyromancersAssault(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{R}"); - // Whenever you cast your second spell each turn, Pyromancer's Assault deals 2 damage to target creature or player. + // Whenever you cast your second spell each turn, Pyromancer's Assault deals 2 damage to any target. Ability ability = new PyromancersAssaultTriggeredAbility(); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability, new CastSpellLastTurnWatcher()); @@ -99,6 +99,6 @@ class PyromancersAssaultTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever you cast your second spell each turn, {this} deals 2 damage to target creature or player."; + return "Whenever you cast your second spell each turn, {this} deals 2 damage to any target."; } } diff --git a/Mage.Sets/src/mage/cards/p/Pyromancy.java b/Mage.Sets/src/mage/cards/p/Pyromancy.java index 21292c6c1b..ec0473adf9 100644 --- a/Mage.Sets/src/mage/cards/p/Pyromancy.java +++ b/Mage.Sets/src/mage/cards/p/Pyromancy.java @@ -50,7 +50,7 @@ public class Pyromancy extends CardImpl { public Pyromancy(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}{R}"); - // {3}, Discard a card at random: Pyromancy deals damage to target creature or player equal to the converted mana cost of the discarded card. + // {3}, Discard a card at random: Pyromancy deals damage to any target equal to the converted mana cost of the discarded card. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new DiscardCostCardConvertedMana()), new ManaCostsImpl("{3}")); ability.addTarget(new TargetAnyTarget()); ability.addCost(new DiscardCardCost(true)); diff --git a/Mage.Sets/src/mage/cards/p/Pyromania.java b/Mage.Sets/src/mage/cards/p/Pyromania.java index 75df70b0dd..c052456aba 100644 --- a/Mage.Sets/src/mage/cards/p/Pyromania.java +++ b/Mage.Sets/src/mage/cards/p/Pyromania.java @@ -49,12 +49,12 @@ public class Pyromania extends CardImpl { public Pyromania(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}"); - // {1}{R}, Discard a card at random: Pyromania deals 1 damage to target creature or player. + // {1}{R}, Discard a card at random: Pyromania deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}{R}")); ability.addCost(new DiscardCardCost(true)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); - // {1}{R}, Sacrifice Pyromania: Pyromania deals 1 damage to target creature or player. + // {1}{R}, Sacrifice Pyromania: Pyromania deals 1 damage to any target. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/p/Pyromatics.java b/Mage.Sets/src/mage/cards/p/Pyromatics.java index dc2c9cf82c..fe456209b9 100644 --- a/Mage.Sets/src/mage/cards/p/Pyromatics.java +++ b/Mage.Sets/src/mage/cards/p/Pyromatics.java @@ -47,7 +47,7 @@ public class Pyromatics extends CardImpl { // Replicate {1}{R} this.addAbility(new ReplicateAbility(this, "{1}{R}")); - // Pyromatics deals 1 damage to target creature or player. + // Pyromatics deals 1 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/q/QuicksmithRebel.java b/Mage.Sets/src/mage/cards/q/QuicksmithRebel.java index d5300507f5..59485b8bc4 100644 --- a/Mage.Sets/src/mage/cards/q/QuicksmithRebel.java +++ b/Mage.Sets/src/mage/cards/q/QuicksmithRebel.java @@ -61,13 +61,13 @@ public class QuicksmithRebel extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(2); - // When Quicksmith Rebel enters the battlefield, target artifact you control gains "{T}: This artifact deals 2 damage to target creature or player" for as long as you control Quicksmith Rebel. + // When Quicksmith Rebel enters the battlefield, target artifact you control gains "{T}: This artifact deals 2 damage to any target" for as long as you control Quicksmith Rebel. Ability artifactAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); artifactAbility.addTarget(new TargetAnyTarget()); ConditionalContinuousEffect effect = new ConditionalContinuousEffect( new GainAbilityTargetEffect(artifactAbility, Duration.Custom), new SourceOnBattlefieldControlUnchangedCondition(), - "target artifact you control gains \"{T}: This artifact deals 2 damage to target creature or player\" for as long as you control {this}"); + "target artifact you control gains \"{T}: This artifact deals 2 damage to any target\" for as long as you control {this}"); Ability ability = new EntersBattlefieldTriggeredAbility(effect, false); ability.addTarget(new TargetPermanent(new FilterControlledArtifactPermanent())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RageExtractor.java b/Mage.Sets/src/mage/cards/r/RageExtractor.java index 171cbf2a17..3b69656a5a 100644 --- a/Mage.Sets/src/mage/cards/r/RageExtractor.java +++ b/Mage.Sets/src/mage/cards/r/RageExtractor.java @@ -103,6 +103,6 @@ class RageExtractorTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever you cast a spell with p in its mana cost, {this} deals damage equal to that spell's converted mana cost to target creature or player."; + return "Whenever you cast a spell with p in its mana cost, {this} deals damage equal to that spell's converted mana cost to any target."; } } diff --git a/Mage.Sets/src/mage/cards/r/RagingRegisaur.java b/Mage.Sets/src/mage/cards/r/RagingRegisaur.java index 5b1a29e9ad..71498566c7 100644 --- a/Mage.Sets/src/mage/cards/r/RagingRegisaur.java +++ b/Mage.Sets/src/mage/cards/r/RagingRegisaur.java @@ -50,7 +50,7 @@ public class RagingRegisaur extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); - // Whenever Raging Regisaur attacks, it deals 1 damage to target creature or player. + // Whenever Raging Regisaur attacks, it deals 1 damage to any target. Ability ability = new AttacksTriggeredAbility(new DamageTargetEffect(1, "it"), false); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/Rakalite.java b/Mage.Sets/src/mage/cards/r/Rakalite.java index edfba0ae63..ea71e2bc95 100644 --- a/Mage.Sets/src/mage/cards/r/Rakalite.java +++ b/Mage.Sets/src/mage/cards/r/Rakalite.java @@ -51,7 +51,7 @@ public class Rakalite extends CardImpl { public Rakalite(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{6}"); - // {2}: Prevent the next 1 damage that would be dealt to target creature or player this turn. Return Rakalite to its owner's hand at the beginning of the next end step. + // {2}: Prevent the next 1 damage that would be dealt to any target this turn. Return Rakalite to its owner's hand at the beginning of the next end step. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1, false), new GenericManaCost(2)); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/r/RalZarek.java b/Mage.Sets/src/mage/cards/r/RalZarek.java index 1a07380534..df41e94667 100644 --- a/Mage.Sets/src/mage/cards/r/RalZarek.java +++ b/Mage.Sets/src/mage/cards/r/RalZarek.java @@ -84,7 +84,7 @@ public class RalZarek extends CardImpl { ability1.addTarget(secondTarget); this.addAbility(ability1); - // -2: Ral Zarek deals 3 damage to target creature or player. + // -2: Ral Zarek deals 3 damage to any target. LoyaltyAbility ability2 = new LoyaltyAbility(new DamageTargetEffect(3), -2); ability2.addTarget(new TargetAnyTarget()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/r/RathsEdge.java b/Mage.Sets/src/mage/cards/r/RathsEdge.java index d4d5542fb7..24939327bc 100644 --- a/Mage.Sets/src/mage/cards/r/RathsEdge.java +++ b/Mage.Sets/src/mage/cards/r/RathsEdge.java @@ -58,7 +58,7 @@ public class RathsEdge extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); - // {4}, {tap}, Sacrifice a land: Rath's Edge deals 1 damage to target creature or player. + // {4}, {tap}, Sacrifice a land: Rath's Edge deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); diff --git a/Mage.Sets/src/mage/cards/r/RazorBoomerang.java b/Mage.Sets/src/mage/cards/r/RazorBoomerang.java index 3a3ea39806..20fe9169b1 100644 --- a/Mage.Sets/src/mage/cards/r/RazorBoomerang.java +++ b/Mage.Sets/src/mage/cards/r/RazorBoomerang.java @@ -55,7 +55,7 @@ public class RazorBoomerang extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); this.subtype.add(SubType.EQUIPMENT); - // Equipped creature has "{tap}, Unattach Razor Boomerang: Razor Boomerang deals 1 damage to target creature or player. Return Razor Boomerang to its owner's hand." + // Equipped creature has "{tap}, Unattach Razor Boomerang: Razor Boomerang deals 1 damage to any target. Return Razor Boomerang to its owner's hand." Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RazorBoomerangEffect(this.getId()), new TapSourceCost()); gainAbility.addCost(new UnattachCost(this.getName(), this.getId())); gainAbility.addTarget(new TargetAnyTarget()); @@ -77,7 +77,7 @@ public class RazorBoomerang extends CardImpl { class RazorBoomerangEffect extends OneShotEffect { - private static String text = "Razor Boomerang deals 1 damage to target creature or player. Return Razor Boomerang to its owner's hand"; + private static String text = "Razor Boomerang deals 1 damage to any target. Return Razor Boomerang to its owner's hand"; private UUID attachmentid; RazorBoomerangEffect(UUID attachmentid) { diff --git a/Mage.Sets/src/mage/cards/r/RealityHemorrhage.java b/Mage.Sets/src/mage/cards/r/RealityHemorrhage.java index 984abd5975..f4e5258441 100644 --- a/Mage.Sets/src/mage/cards/r/RealityHemorrhage.java +++ b/Mage.Sets/src/mage/cards/r/RealityHemorrhage.java @@ -47,7 +47,7 @@ public class RealityHemorrhage extends CardImpl { // Devoid this.addAbility(new DevoidAbility(this.color)); - // Reality Hemorrhage deals 2 damage to target creature or player. + // Reality Hemorrhage deals 2 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/r/RecklessAbandon.java b/Mage.Sets/src/mage/cards/r/RecklessAbandon.java index 39b5106295..79095c7c5d 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessAbandon.java +++ b/Mage.Sets/src/mage/cards/r/RecklessAbandon.java @@ -49,7 +49,7 @@ public class RecklessAbandon extends CardImpl { // As an additional cost to cast Reckless Abandon, sacrifice a creature. this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); - // Reckless Abandon deals 4 damage to target creature or player. + // Reckless Abandon deals 4 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/r/RecklessAssault.java b/Mage.Sets/src/mage/cards/r/RecklessAssault.java index c7d3aa162c..77338105ca 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessAssault.java +++ b/Mage.Sets/src/mage/cards/r/RecklessAssault.java @@ -49,7 +49,7 @@ public class RecklessAssault extends CardImpl { public RecklessAssault(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{B}{R}"); - // {1}, Pay 2 life: Reckless Assault deals 1 damage to target creature or player. + // {1}, Pay 2 life: Reckless Assault deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}")); ability.addCost(new PayLifeCost(2)); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/r/RecklessEmbermage.java b/Mage.Sets/src/mage/cards/r/RecklessEmbermage.java index cc0995ffb2..7337204d56 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessEmbermage.java +++ b/Mage.Sets/src/mage/cards/r/RecklessEmbermage.java @@ -55,7 +55,7 @@ public class RecklessEmbermage extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // {1}{R}: Reckless Embermage deals 1 damage to target creature or player and 1 damage to itself. + // {1}{R}: Reckless Embermage deals 1 damage to any target and 1 damage to itself. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}{R}")); ability.addEffect(new DamageSelfEffect(1)); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/r/RedSunsZenith.java b/Mage.Sets/src/mage/cards/r/RedSunsZenith.java index 400cf9bc58..67d1fc0fdd 100644 --- a/Mage.Sets/src/mage/cards/r/RedSunsZenith.java +++ b/Mage.Sets/src/mage/cards/r/RedSunsZenith.java @@ -48,7 +48,7 @@ public class RedSunsZenith extends CardImpl { public RedSunsZenith(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{X}{R}"); - // Red Sun's Zenith deals X damage to target creature or player. + // Red Sun's Zenith deals X damage to any target. // If a creature dealt damage this way would die this turn, exile it instead. // Shuffle Red Sun's Zenith into its owner's library. this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/r/RefractionTrap.java b/Mage.Sets/src/mage/cards/r/RefractionTrap.java index fa73436d4f..3dcfdb627b 100644 --- a/Mage.Sets/src/mage/cards/r/RefractionTrap.java +++ b/Mage.Sets/src/mage/cards/r/RefractionTrap.java @@ -65,7 +65,7 @@ public class RefractionTrap extends CardImpl { // If an opponent cast a red instant or sorcery spell this turn, you may pay {W} rather than pay Refraction Trap's mana cost. this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl("{W}"), RefractionTrapCondition.instance), new SpellsCastWatcher()); - // Prevent the next 3 damage that a source of your choice would deal to you and/or permanents you control this turn. If damage is prevented this way, Refraction Trap deals that much damage to target creature or player. + // Prevent the next 3 damage that a source of your choice would deal to you and/or permanents you control this turn. If damage is prevented this way, Refraction Trap deals that much damage to any target. this.getSpellAbility().addEffect(new RefractionTrapPreventDamageEffect(Duration.EndOfTurn, 3)); this.getSpellAbility().addTarget(new TargetAnyTarget()); } @@ -117,7 +117,7 @@ class RefractionTrapPreventDamageEffect extends PreventionEffectImpl { super(duration, amount, false, false); this.amount = amount; this.target = new TargetSource(); - staticText = "The next " + amount + " damage that a source of your choice would deal to you and/or permanents you control this turn. If damage is prevented this way, {this} deals that much damage to target creature or player"; + staticText = "The next " + amount + " damage that a source of your choice would deal to you and/or permanents you control this turn. If damage is prevented this way, {this} deals that much damage to any target"; } public RefractionTrapPreventDamageEffect(final RefractionTrapPreventDamageEffect effect) { diff --git a/Mage.Sets/src/mage/cards/r/RekindledFlame.java b/Mage.Sets/src/mage/cards/r/RekindledFlame.java index 5c68524798..7d9a9ab336 100644 --- a/Mage.Sets/src/mage/cards/r/RekindledFlame.java +++ b/Mage.Sets/src/mage/cards/r/RekindledFlame.java @@ -54,7 +54,7 @@ public class RekindledFlame extends CardImpl { public RekindledFlame(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{R}{R}"); - // Rekindled Flame deals 4 damage to target creature or player. + // Rekindled Flame deals 4 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/r/ReleaseTheAnts.java b/Mage.Sets/src/mage/cards/r/ReleaseTheAnts.java index bb14700b59..7448783482 100644 --- a/Mage.Sets/src/mage/cards/r/ReleaseTheAnts.java +++ b/Mage.Sets/src/mage/cards/r/ReleaseTheAnts.java @@ -45,7 +45,7 @@ public class ReleaseTheAnts extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{R}"); - // Release the Ants deals 1 damage to target creature or player. Clash with an opponent. If you win, return Release the Ants to its owner's hand. + // Release the Ants deals 1 damage to any target. Clash with an opponent. If you win, return Release the Ants to its owner's hand. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(ClashWinReturnToHandSpellEffect.getInstance()); diff --git a/Mage.Sets/src/mage/cards/r/RepeatingBarrage.java b/Mage.Sets/src/mage/cards/r/RepeatingBarrage.java index 501e4007e6..e8cfb2a295 100644 --- a/Mage.Sets/src/mage/cards/r/RepeatingBarrage.java +++ b/Mage.Sets/src/mage/cards/r/RepeatingBarrage.java @@ -51,7 +51,7 @@ public class RepeatingBarrage extends CardImpl { public RepeatingBarrage(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{R}{R}"); - // Repeating Barrage deals 3 damage to target creature or player. + // Repeating Barrage deals 3 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/r/ResoundingThunder.java b/Mage.Sets/src/mage/cards/r/ResoundingThunder.java index 3796c71b17..e03c8b1ad3 100644 --- a/Mage.Sets/src/mage/cards/r/ResoundingThunder.java +++ b/Mage.Sets/src/mage/cards/r/ResoundingThunder.java @@ -48,12 +48,12 @@ public class ResoundingThunder extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{R}"); - // Resounding Thunder deals 3 damage to target creature or player. + // Resounding Thunder deals 3 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetAnyTarget()); // Cycling {5}{B}{R}{G} this.addAbility(new CyclingAbility(new ManaCostsImpl("{5}{B}{R}{G}"))); - // When you cycle Resounding Thunder, it deals 6 damage to target creature or player. + // When you cycle Resounding Thunder, it deals 6 damage to any target. Ability ability = new CycleTriggeredAbility(new DamageTargetEffect(6, "it")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RevekaWizardSavant.java b/Mage.Sets/src/mage/cards/r/RevekaWizardSavant.java index 9a7001efe6..7ea2852c51 100644 --- a/Mage.Sets/src/mage/cards/r/RevekaWizardSavant.java +++ b/Mage.Sets/src/mage/cards/r/RevekaWizardSavant.java @@ -56,7 +56,7 @@ public class RevekaWizardSavant extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(1); - // {tap}: Reveka, Wizard Savant deals 2 damage to target creature or player and doesn't untap during your next untap step. + // {tap}: Reveka, Wizard Savant deals 2 damage to any target and doesn't untap during your next untap step. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); ability.addEffect(new DontUntapInControllersNextUntapStepSourceEffect()); diff --git a/Mage.Sets/src/mage/cards/r/RhysticLightning.java b/Mage.Sets/src/mage/cards/r/RhysticLightning.java index 5613e874f2..03e8371e45 100644 --- a/Mage.Sets/src/mage/cards/r/RhysticLightning.java +++ b/Mage.Sets/src/mage/cards/r/RhysticLightning.java @@ -46,10 +46,10 @@ public class RhysticLightning extends CardImpl { public RhysticLightning(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{R}"); - // Rhystic Lightning deals 4 damage to target creature or player unless that creature's controller or that player pays {2}. If he or she does, Rhystic Lightning deals 2 damage to the creature or player. + // Rhystic Lightning deals 4 damage to any target unless that creature's controller or that player pays {2}. If he or she does, Rhystic Lightning deals 2 damage to the creature or player. Effect effect = new DoUnlessTargetPlayerOrTargetsControllerPaysEffect(new DamageTargetEffect(4), new DamageTargetEffect(2), new ManaCostsImpl("{2}"), "Pay {2} to have {this} deal 2 damage instead of 4 damage?"); - effect.setText("{this} deals 4 damage to target creature or player unless that creature's controller or that player pays {2}. If he or she does, {this} deals 2 damage to the creature or player"); + effect.setText("{this} deals 4 damage to any target unless that creature's controller or that player pays {2}. If he or she does, {this} deals 2 damage to the creature or player"); this.getSpellAbility().addEffect(effect); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/r/RiddleOfLightning.java b/Mage.Sets/src/mage/cards/r/RiddleOfLightning.java index b353b74fc7..89860eaca4 100644 --- a/Mage.Sets/src/mage/cards/r/RiddleOfLightning.java +++ b/Mage.Sets/src/mage/cards/r/RiddleOfLightning.java @@ -52,7 +52,7 @@ public class RiddleOfLightning extends CardImpl { public RiddleOfLightning(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{R}{R}"); - // Choose target creature or player. Scry 3, then reveal the top card of your library. Riddle of Lightning deals damage equal to that card's converted mana cost to that creature or player. + // Choose any target. Scry 3, then reveal the top card of your library. Riddle of Lightning deals damage equal to that card's converted mana cost to that creature or player. this.getSpellAbility().addTarget(new TargetAnyTarget()); Effect effect = new ScryEffect(3); effect.setText("Choose any target. Scry 3"); diff --git a/Mage.Sets/src/mage/cards/r/RiftBolt.java b/Mage.Sets/src/mage/cards/r/RiftBolt.java index 6137e28b41..cb0d541cd4 100644 --- a/Mage.Sets/src/mage/cards/r/RiftBolt.java +++ b/Mage.Sets/src/mage/cards/r/RiftBolt.java @@ -46,7 +46,7 @@ public class RiftBolt extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{R}"); - // Rift Bolt deals 3 damage to target creature or player. + // Rift Bolt deals 3 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/r/RoarOfTheCrowd.java b/Mage.Sets/src/mage/cards/r/RoarOfTheCrowd.java index b586ffabf2..c4b995cc01 100644 --- a/Mage.Sets/src/mage/cards/r/RoarOfTheCrowd.java +++ b/Mage.Sets/src/mage/cards/r/RoarOfTheCrowd.java @@ -53,7 +53,7 @@ public class RoarOfTheCrowd extends CardImpl { public RoarOfTheCrowd(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{R}"); - // Choose a creature type. Roar of the Crowd deals damage to target creature or player equal to the number of permanents you control of the chosen type. + // Choose a creature type. Roar of the Crowd deals damage to any target equal to the number of permanents you control of the chosen type. TargetAnyTarget target = new TargetAnyTarget(); this.getSpellAbility().addTarget(target); this.getSpellAbility().addEffect(new RoarOfTheCrowdEffect()); @@ -73,7 +73,7 @@ class RoarOfTheCrowdEffect extends OneShotEffect { RoarOfTheCrowdEffect() { super(Outcome.LoseLife); - this.staticText = "Choose a creature type. {this} deals damage to target creature or player equal to the number of permanents you control of the chosen type."; + this.staticText = "Choose a creature type. {this} deals damage to any target equal to the number of permanents you control of the chosen type."; } RoarOfTheCrowdEffect(final RoarOfTheCrowdEffect effect) { diff --git a/Mage.Sets/src/mage/cards/r/RocketLauncher.java b/Mage.Sets/src/mage/cards/r/RocketLauncher.java index 9a4a374412..0241898e80 100644 --- a/Mage.Sets/src/mage/cards/r/RocketLauncher.java +++ b/Mage.Sets/src/mage/cards/r/RocketLauncher.java @@ -57,7 +57,7 @@ public class RocketLauncher extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); Watcher watcher = new RocketLauncherWatcher(this.getId()); - // {2}: Rocket Launcher deals 1 damage to target creature or player. Destroy Rocket Launcher at the beginning of the next end step. Activate this ability only if you've controlled Rocket Launcher continuously since the beginning of your most recent turn. + // {2}: Rocket Launcher deals 1 damage to any target. Destroy Rocket Launcher at the beginning of the next end step. Activate this ability only if you've controlled Rocket Launcher continuously since the beginning of your most recent turn. Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new GenericManaCost(2), ControlledTurnCondition.instance); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/r/RumblingAftershocks.java b/Mage.Sets/src/mage/cards/r/RumblingAftershocks.java index bf8c7cf3dc..0732874d28 100644 --- a/Mage.Sets/src/mage/cards/r/RumblingAftershocks.java +++ b/Mage.Sets/src/mage/cards/r/RumblingAftershocks.java @@ -64,7 +64,7 @@ public class RumblingAftershocks extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{4}{R}"); - // Whenever you cast a kicked spell, you may have Rumbling Aftershocks deal damage to target creature or player equal to the number of times that spell was kicked. + // Whenever you cast a kicked spell, you may have Rumbling Aftershocks deal damage to any target equal to the number of times that spell was kicked. Ability ability = new RumblingAftershocksTriggeredAbility(); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); @@ -129,7 +129,7 @@ class RumblingAftershocksDealDamageEffect extends OneShotEffect { public RumblingAftershocksDealDamageEffect() { super(Outcome.Damage); - this.staticText = "you may have {this} deal damage to target creature or player equal to the number of times that spell was kicked"; + this.staticText = "you may have {this} deal damage to any target equal to the number of times that spell was kicked"; } public RumblingAftershocksDealDamageEffect(final RumblingAftershocksDealDamageEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SamiteArcher.java b/Mage.Sets/src/mage/cards/s/SamiteArcher.java index 9cfc29c33d..3486c9ce35 100644 --- a/Mage.Sets/src/mage/cards/s/SamiteArcher.java +++ b/Mage.Sets/src/mage/cards/s/SamiteArcher.java @@ -57,12 +57,12 @@ public class SamiteArcher extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // {T}: Prevent the next 1 damage that would be dealt to target creature or player this turn. + // {T}: Prevent the next 1 damage that would be dealt to any target this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); - // {T}: Samite Archer deals 1 damage to target creature or player. + // {T}: Samite Archer deals 1 damage to any target. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SanctumCustodian.java b/Mage.Sets/src/mage/cards/s/SanctumCustodian.java index c25b24e679..01317eb1cb 100644 --- a/Mage.Sets/src/mage/cards/s/SanctumCustodian.java +++ b/Mage.Sets/src/mage/cards/s/SanctumCustodian.java @@ -54,7 +54,7 @@ public class SanctumCustodian extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - // {tap}: Prevent the next 2 damage that would be dealt to target creature or player this turn. + // {tap}: Prevent the next 2 damage that would be dealt to any target this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SanctumGuardian.java b/Mage.Sets/src/mage/cards/s/SanctumGuardian.java index 86db0abfff..aa1e519953 100644 --- a/Mage.Sets/src/mage/cards/s/SanctumGuardian.java +++ b/Mage.Sets/src/mage/cards/s/SanctumGuardian.java @@ -54,7 +54,7 @@ public class SanctumGuardian extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(4); - // Sacrifice Sanctum Guardian: The next time a source of your choice would deal damage to target creature or player this turn, prevent that damage. + // Sacrifice Sanctum Guardian: The next time a source of your choice would deal damage to any target this turn, prevent that damage. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventNextDamageFromChosenSourceToTargetEffect(Duration.EndOfTurn), new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/s/SarkhansRage.java b/Mage.Sets/src/mage/cards/s/SarkhansRage.java index 7f504b3558..bf0b37f13d 100644 --- a/Mage.Sets/src/mage/cards/s/SarkhansRage.java +++ b/Mage.Sets/src/mage/cards/s/SarkhansRage.java @@ -49,7 +49,7 @@ public class SarkhansRage extends CardImpl { public SarkhansRage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{4}{R}"); - // Sarkhan's Rage deals 5 damage to target creature or player. If you control no Dragons, Sarkhan's Rage deals 2 damage to you. + // Sarkhan's Rage deals 5 damage to any target. If you control no Dragons, Sarkhan's Rage deals 2 damage to you. this.getSpellAbility().addEffect(new DamageTargetEffect(5)); this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new DamageControllerEffect(2), diff --git a/Mage.Sets/src/mage/cards/s/Scaldkin.java b/Mage.Sets/src/mage/cards/s/Scaldkin.java index eb7b2f04d4..f0e9471821 100644 --- a/Mage.Sets/src/mage/cards/s/Scaldkin.java +++ b/Mage.Sets/src/mage/cards/s/Scaldkin.java @@ -57,7 +57,7 @@ public class Scaldkin extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // {2}{R}, Sacrifice Scaldkin: Scaldkin deals 2 damage to target creature or player. + // {2}{R}, Sacrifice Scaldkin: Scaldkin deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{2}{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/s/ScorchingLava.java b/Mage.Sets/src/mage/cards/s/ScorchingLava.java index 1365aeea7a..09653d9b66 100644 --- a/Mage.Sets/src/mage/cards/s/ScorchingLava.java +++ b/Mage.Sets/src/mage/cards/s/ScorchingLava.java @@ -60,7 +60,7 @@ public class ScorchingLava extends CardImpl { // Kicker {R} this.addAbility(new KickerAbility("{R}")); - // Scorching Lava deals 2 damage to target creature or player. If Scorching Lava was kicked, that creature can't be regenerated this turn and if it would die this turn, exile it instead. + // Scorching Lava deals 2 damage to any target. If Scorching Lava was kicked, that creature can't be regenerated this turn and if it would die this turn, exile it instead. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellAbility().addEffect(new ConditionalContinuousRuleModifyingEffect( new CantRegenerateTargetEffect(Duration.EndOfTurn, "that creature"), new LockedInCondition(KickedCondition.instance))); diff --git a/Mage.Sets/src/mage/cards/s/ScorchingSpear.java b/Mage.Sets/src/mage/cards/s/ScorchingSpear.java index 0fad9fde33..77c5bcd165 100644 --- a/Mage.Sets/src/mage/cards/s/ScorchingSpear.java +++ b/Mage.Sets/src/mage/cards/s/ScorchingSpear.java @@ -43,7 +43,7 @@ public class ScorchingSpear extends CardImpl { public ScorchingSpear(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{R}"); - // Scorching Spear deals 1 damage to target creature or player. + // Scorching Spear deals 1 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/s/ScourgeOfValkas.java b/Mage.Sets/src/mage/cards/s/ScourgeOfValkas.java index 48e3f641ec..e108894cfc 100644 --- a/Mage.Sets/src/mage/cards/s/ScourgeOfValkas.java +++ b/Mage.Sets/src/mage/cards/s/ScourgeOfValkas.java @@ -63,7 +63,7 @@ public class ScourgeOfValkas extends CardImpl { filter2.add(new SubtypePredicate(SubType.DRAGON)); } - private static final String rule = "Whenever {this} or another Dragon enters the battlefield under your control, it deals X damage to target creature or player, where X is the number of Dragons you control."; + private static final String rule = "Whenever {this} or another Dragon enters the battlefield under your control, it deals X damage to any target, where X is the number of Dragons you control."; public ScourgeOfValkas(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}{R}"); @@ -76,7 +76,7 @@ public class ScourgeOfValkas extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // Whenever Scourge of Valkas or another Dragon enters the battlefield under your control, it deals X damage to target creature or player, where X is the number of Dragons you control. + // Whenever Scourge of Valkas or another Dragon enters the battlefield under your control, it deals X damage to any target, where X is the number of Dragons you control. DynamicValue dragons = new PermanentsOnBattlefieldCount(filter2); Ability ability = new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new DamageTargetEffect(dragons), filter, false, rule); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/s/SealOfFire.java b/Mage.Sets/src/mage/cards/s/SealOfFire.java index b2e439afc4..dbd0072b29 100644 --- a/Mage.Sets/src/mage/cards/s/SealOfFire.java +++ b/Mage.Sets/src/mage/cards/s/SealOfFire.java @@ -48,7 +48,7 @@ public class SealOfFire extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{R}"); - // Sacrifice Seal of Fire: Seal of Fire deals 2 damage to target creature or player. + // Sacrifice Seal of Fire: Seal of Fire deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SearingMeditation.java b/Mage.Sets/src/mage/cards/s/SearingMeditation.java index 9c6aca22b7..030c2788f7 100644 --- a/Mage.Sets/src/mage/cards/s/SearingMeditation.java +++ b/Mage.Sets/src/mage/cards/s/SearingMeditation.java @@ -50,7 +50,7 @@ public class SearingMeditation extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{R}{W}"); - // Whenever you gain life, you may pay {2}. If you do, Searing Meditation deals 2 damage to target creature or player. + // Whenever you gain life, you may pay {2}. If you do, Searing Meditation deals 2 damage to any target. Ability ability = new SimpleTriggeredAbility(Zone.BATTLEFIELD, GameEvent.EventType.GAINED_LIFE, new DoIfCostPaid(new DamageTargetEffect(2), new GenericManaCost(2)), "Whenever you gain life, ", true); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SearingSpear.java b/Mage.Sets/src/mage/cards/s/SearingSpear.java index 76a00858f0..fbb4e1659b 100644 --- a/Mage.Sets/src/mage/cards/s/SearingSpear.java +++ b/Mage.Sets/src/mage/cards/s/SearingSpear.java @@ -44,7 +44,7 @@ public class SearingSpear extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{R}"); - // Searing Spear deals 3 damage to target creature or player. + // Searing Spear deals 3 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/s/SearingTouch.java b/Mage.Sets/src/mage/cards/s/SearingTouch.java index cf5163ef0d..0c15e6aef0 100644 --- a/Mage.Sets/src/mage/cards/s/SearingTouch.java +++ b/Mage.Sets/src/mage/cards/s/SearingTouch.java @@ -48,7 +48,7 @@ public class SearingTouch extends CardImpl { // Buyback {4} (You may pay an additional {4} as you cast this spell. If you do, put this card into your hand as it resolves.) this.addAbility(new BuybackAbility("{4}")); - // Searing Touch deals 1 damage to target creature or player. + // Searing Touch deals 1 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/s/SearingWind.java b/Mage.Sets/src/mage/cards/s/SearingWind.java index 06282650c5..076fddb6f8 100644 --- a/Mage.Sets/src/mage/cards/s/SearingWind.java +++ b/Mage.Sets/src/mage/cards/s/SearingWind.java @@ -44,7 +44,7 @@ public class SearingWind extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{8}{R}"); - // Searing Wind deals 10 damage to target creature or player. + // Searing Wind deals 10 damage to any target. this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DamageTargetEffect(10)); } diff --git a/Mage.Sets/src/mage/cards/s/SeismicAssault.java b/Mage.Sets/src/mage/cards/s/SeismicAssault.java index 56df849b21..7bb6d4bbe6 100644 --- a/Mage.Sets/src/mage/cards/s/SeismicAssault.java +++ b/Mage.Sets/src/mage/cards/s/SeismicAssault.java @@ -53,7 +53,7 @@ public class SeismicAssault extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{R}{R}{R}"); - // Discard a land card: Seismic Assault deals 2 damage to target creature or player. + // Discard a land card: Seismic Assault deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new DiscardTargetCost(new TargetCardInHand(filter))); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SerraPaladin.java b/Mage.Sets/src/mage/cards/s/SerraPaladin.java index 54c5bda21b..7d36805742 100644 --- a/Mage.Sets/src/mage/cards/s/SerraPaladin.java +++ b/Mage.Sets/src/mage/cards/s/SerraPaladin.java @@ -58,7 +58,7 @@ public class SerraPaladin extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // {tap}: Prevent the next 1 damage that would be dealt to target creature or player this turn. + // {tap}: Prevent the next 1 damage that would be dealt to any target this turn. Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ShadowGuildmage.java b/Mage.Sets/src/mage/cards/s/ShadowGuildmage.java index 2820c4d8be..e8ba413383 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowGuildmage.java +++ b/Mage.Sets/src/mage/cards/s/ShadowGuildmage.java @@ -63,7 +63,7 @@ public class ShadowGuildmage extends CardImpl { ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); - // {R}, {tap}: Shadow Guildmage deals 1 damage to target creature or player and 1 damage to you. + // {R}, {tap}: Shadow Guildmage deals 1 damage to any target and 1 damage to you. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{R}")); ability.addCost(new TapSourceCost()); ability.addEffect(new DamageControllerEffect(1)); diff --git a/Mage.Sets/src/mage/cards/s/ShardVolley.java b/Mage.Sets/src/mage/cards/s/ShardVolley.java index 63fbef7d4e..33451a4061 100644 --- a/Mage.Sets/src/mage/cards/s/ShardVolley.java +++ b/Mage.Sets/src/mage/cards/s/ShardVolley.java @@ -50,7 +50,7 @@ public class ShardVolley extends CardImpl { // As an additional cost to cast Shard Volley, sacrifice a land. this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledPermanent(StaticFilters.FILTER_CONTROLLED_LAND_SHORT_TEXT))); - // Shard Volley deals 3 damage to target creature or player. + // Shard Volley deals 3 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/s/ShieldmageAdvocate.java b/Mage.Sets/src/mage/cards/s/ShieldmageAdvocate.java index 643cb969b5..627d7fe9f7 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldmageAdvocate.java +++ b/Mage.Sets/src/mage/cards/s/ShieldmageAdvocate.java @@ -65,7 +65,7 @@ public class ShieldmageAdvocate extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(3); - // {tap}: Return target card from an opponent's graveyard to their hand. Prevent all damage that would be dealt to target creature or player this turn by a source of your choice. + // {tap}: Return target card from an opponent's graveyard to their hand. Prevent all damage that would be dealt to any target this turn by a source of your choice. Effect effect = new ReturnFromGraveyardToHandTargetEffect(); effect.setText("Return target card from an opponent's graveyard to their hand"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); @@ -94,7 +94,7 @@ class ShieldmageAdvocateEffect extends PreventionEffectImpl { public ShieldmageAdvocateEffect() { super(Duration.EndOfTurn, Integer.MAX_VALUE, false); - staticText = "Prevent all damage that would be dealt to target creature or player this turn by a source of your choice"; + staticText = "Prevent all damage that would be dealt to any target this turn by a source of your choice"; this.targetSource = new TargetSource(); } diff --git a/Mage.Sets/src/mage/cards/s/ShiningShoal.java b/Mage.Sets/src/mage/cards/s/ShiningShoal.java index 46fb8c43cf..ec4ec33919 100644 --- a/Mage.Sets/src/mage/cards/s/ShiningShoal.java +++ b/Mage.Sets/src/mage/cards/s/ShiningShoal.java @@ -69,7 +69,7 @@ public class ShiningShoal extends CardImpl { filter.add(Predicates.not(new CardIdPredicate(this.getId()))); // the exile cost can never be paid with the card itself this.addAbility(new AlternativeCostSourceAbility(new ExileFromHandCost(new TargetCardInHand(filter), true))); - // The next X damage that a source of your choice would deal to you and/or creatures you control this turn is dealt to target creature or player instead. + // The next X damage that a source of your choice would deal to you and/or creatures you control this turn is dealt to any target instead. this.getSpellAbility().addEffect(new ShiningShoalRedirectDamageTargetEffect(Duration.EndOfTurn, new ExileFromHandCostCardConvertedMana())); this.getSpellAbility().addTarget(new TargetSource()); this.getSpellAbility().addTarget(new TargetAnyTarget()); @@ -92,7 +92,7 @@ class ShiningShoalRedirectDamageTargetEffect extends RedirectDamageFromSourceToT public ShiningShoalRedirectDamageTargetEffect(Duration duration, DynamicValue dynamicAmount) { super(duration, 0, true); this.dynamicAmount = dynamicAmount; - staticText = "The next X damage that a source of your choice would deal to you and/or creatures you control this turn is dealt to target creature or player instead"; + staticText = "The next X damage that a source of your choice would deal to you and/or creatures you control this turn is dealt to any target instead"; } public ShiningShoalRedirectDamageTargetEffect(final ShiningShoalRedirectDamageTargetEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/ShivanFire.java b/Mage.Sets/src/mage/cards/s/ShivanFire.java index bbb4778f1e..da76aa6569 100644 --- a/Mage.Sets/src/mage/cards/s/ShivanFire.java +++ b/Mage.Sets/src/mage/cards/s/ShivanFire.java @@ -52,7 +52,7 @@ public class ShivanFire extends CardImpl { // Kicker {4} (You may pay an additional {4} as you cast this spell.) this.addAbility(new KickerAbility("{4}")); - // Shivan Fire deals 2 damage to target creature or player. If Shivan Fire was kicked, it deals 4 damage to that creature or player instead. + // Shivan Fire deals 2 damage to any target. If Shivan Fire was kicked, it deals 4 damage to that creature or player instead. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new DamageTargetEffect(4), new DamageTargetEffect(2), KickedCondition.instance, "{this} deals 2 damage to target creature. If {this} was kicked, it deals 4 damage to that creature instead")); diff --git a/Mage.Sets/src/mage/cards/s/ShockTroops.java b/Mage.Sets/src/mage/cards/s/ShockTroops.java index 35edf5b026..6ef48b6abb 100644 --- a/Mage.Sets/src/mage/cards/s/ShockTroops.java +++ b/Mage.Sets/src/mage/cards/s/ShockTroops.java @@ -54,7 +54,7 @@ public class ShockTroops extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // Sacrifice Shock Troops: Shock Troops deals 2 damage to target creature or player. + // Sacrifice Shock Troops: Shock Troops deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SithMarauder.java b/Mage.Sets/src/mage/cards/s/SithMarauder.java index 49e451de37..5261b8ff0f 100644 --- a/Mage.Sets/src/mage/cards/s/SithMarauder.java +++ b/Mage.Sets/src/mage/cards/s/SithMarauder.java @@ -54,11 +54,11 @@ public class SithMarauder extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(4); - // Hate — When Sith Marauder enters the battlefield, if an opponent lost life from a source other than combat damage this turn, Sith Marauder deals 3 damage to target creature or player. + // Hate — When Sith Marauder enters the battlefield, if an opponent lost life from a source other than combat damage this turn, Sith Marauder deals 3 damage to any target. Ability ability = new ConditionalTriggeredAbility( new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(3)), HateCondition.instance, - "Hate — When {this} enters the battlefield, if an opponent lost life from a source other than combat damage this turn, {this} deals 3 damage to target creature or player"); + "Hate — When {this} enters the battlefield, if an opponent lost life from a source other than combat damage this turn, {this} deals 3 damage to any target"); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability, new LifeLossOtherFromCombatWatcher()); } diff --git a/Mage.Sets/src/mage/cards/s/SkarrganSkybreaker.java b/Mage.Sets/src/mage/cards/s/SkarrganSkybreaker.java index 0c03435560..484d0df021 100644 --- a/Mage.Sets/src/mage/cards/s/SkarrganSkybreaker.java +++ b/Mage.Sets/src/mage/cards/s/SkarrganSkybreaker.java @@ -59,7 +59,7 @@ public class SkarrganSkybreaker extends CardImpl { // Bloodthirst 3 this.addAbility(new BloodthirstAbility(3)); - // {1}, Sacrifice Skarrgan Skybreaker: Skarrgan Skybreaker deals damage equal to its power to target creature or player. + // {1}, Sacrifice Skarrgan Skybreaker: Skarrgan Skybreaker deals damage equal to its power to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new SourcePermanentPowerCount()), new GenericManaCost(1)); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/s/SkirkMarauder.java b/Mage.Sets/src/mage/cards/s/SkirkMarauder.java index 74a20fd24a..91387e3b98 100644 --- a/Mage.Sets/src/mage/cards/s/SkirkMarauder.java +++ b/Mage.Sets/src/mage/cards/s/SkirkMarauder.java @@ -55,7 +55,7 @@ public class SkirkMarauder extends CardImpl { // Morph {2}{R} this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{R}"))); - // When Skirk Marauder is turned face up, it deals 2 damage to target creature or player. + // When Skirk Marauder is turned face up, it deals 2 damage to any target. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new DamageTargetEffect(2, "it")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SkirsdagCultist.java b/Mage.Sets/src/mage/cards/s/SkirsdagCultist.java index e2c56138ff..eb403f45af 100644 --- a/Mage.Sets/src/mage/cards/s/SkirsdagCultist.java +++ b/Mage.Sets/src/mage/cards/s/SkirsdagCultist.java @@ -57,7 +57,7 @@ public class SkirsdagCultist extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // {R}, {T}, Sacrifice a creature: Skirsdag Cultist deals 2 damage to target creature or player. + // {R}, {T}, Sacrifice a creature: Skirsdag Cultist deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); diff --git a/Mage.Sets/src/mage/cards/s/SkullCatapult.java b/Mage.Sets/src/mage/cards/s/SkullCatapult.java index c9238bed78..8b29788160 100644 --- a/Mage.Sets/src/mage/cards/s/SkullCatapult.java +++ b/Mage.Sets/src/mage/cards/s/SkullCatapult.java @@ -51,7 +51,7 @@ public class SkullCatapult extends CardImpl { public SkullCatapult(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); - // {1}, {tap}, Sacrifice a creature: Skull Catapult deals 2 damage to target creature or player. + // {1}, {tap}, Sacrifice a creature: Skull Catapult deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); diff --git a/Mage.Sets/src/mage/cards/s/SolarBlast.java b/Mage.Sets/src/mage/cards/s/SolarBlast.java index a8fdd844f8..6e2344977f 100644 --- a/Mage.Sets/src/mage/cards/s/SolarBlast.java +++ b/Mage.Sets/src/mage/cards/s/SolarBlast.java @@ -48,12 +48,12 @@ public class SolarBlast extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{R}"); - // Solar Blast deals 3 damage to target creature or player. + // Solar Blast deals 3 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetAnyTarget()); // Cycling {1}{R}{R} this.addAbility(new CyclingAbility(new ManaCostsImpl("{1}{R}{R}"))); - // When you cycle Solar Blast, you may have it deal 1 damage to target creature or player. + // When you cycle Solar Blast, you may have it deal 1 damage to any target. Ability ability = new CycleTriggeredAbility(new DamageTargetEffect(1), true); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SonicBurst.java b/Mage.Sets/src/mage/cards/s/SonicBurst.java index 049fb1d05c..5b25b5e17e 100644 --- a/Mage.Sets/src/mage/cards/s/SonicBurst.java +++ b/Mage.Sets/src/mage/cards/s/SonicBurst.java @@ -46,7 +46,7 @@ public class SonicBurst extends CardImpl { // As an additional cost to cast Sonic Burst, discard a card at random. this.getSpellAbility().addCost(new DiscardCardCost(true)); - // Sonic Burst deals 4 damage to target creature or player. + // Sonic Burst deals 4 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/s/SonicSeizure.java b/Mage.Sets/src/mage/cards/s/SonicSeizure.java index 3607a46092..21725bfa71 100644 --- a/Mage.Sets/src/mage/cards/s/SonicSeizure.java +++ b/Mage.Sets/src/mage/cards/s/SonicSeizure.java @@ -46,7 +46,7 @@ public class SonicSeizure extends CardImpl { // As an additional cost to cast Sonic Seizure, discard a card at random. this.getSpellAbility().addCost(new DiscardCardCost(true)); - // Sonic Seizure deals 3 damage to target creature or player. + // Sonic Seizure deals 3 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/s/SorinMarkov.java b/Mage.Sets/src/mage/cards/s/SorinMarkov.java index 53689e6807..d6adb50b89 100644 --- a/Mage.Sets/src/mage/cards/s/SorinMarkov.java +++ b/Mage.Sets/src/mage/cards/s/SorinMarkov.java @@ -60,7 +60,7 @@ public class SorinMarkov extends CardImpl { this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(4)); - // +2: Sorin Markov deals 2 damage to target creature or player and you gain 2 life. + // +2: Sorin Markov deals 2 damage to any target and you gain 2 life. LoyaltyAbility ability1 = new LoyaltyAbility(new DamageTargetEffect(2), 2); ability1.addEffect(new GainLifeEffect(2)); ability1.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/s/SoulBurn.java b/Mage.Sets/src/mage/cards/s/SoulBurn.java index 7612e3cd4f..0e27a8a9a7 100644 --- a/Mage.Sets/src/mage/cards/s/SoulBurn.java +++ b/Mage.Sets/src/mage/cards/s/SoulBurn.java @@ -58,7 +58,7 @@ public class SoulBurn extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{X}{2}{B}"); // Spend only black or red mana on X. - // Soul Burn deals X damage to target creature or player. You gain life equal to the damage dealt for each black mana spent on X; not more life than the player's life total before Soul Burn dealt damage, or the creature's toughness. + // Soul Burn deals X damage to any target. You gain life equal to the damage dealt for each black mana spent on X; not more life than the player's life total before Soul Burn dealt damage, or the creature's toughness. this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new SoulBurnEffect()); VariableCost variableCost = this.getSpellAbility().getManaCostsToPay().getVariableCosts().get(0); @@ -81,7 +81,7 @@ class SoulBurnEffect extends OneShotEffect { public SoulBurnEffect() { super(Outcome.Damage); - staticText = "{this} deals X damage to target creature or player for each black or red mana spent on X. You gain life equal to the damage dealt for each black mana spent; not more life than the player's life total before Soul Burn dealt damage, or the creature's toughness."; + staticText = "{this} deals X damage to any target for each black or red mana spent on X. You gain life equal to the damage dealt for each black mana spent; not more life than the player's life total before Soul Burn dealt damage, or the creature's toughness."; } public SoulBurnEffect(final SoulBurnEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SoulSpike.java b/Mage.Sets/src/mage/cards/s/SoulSpike.java index 41a51f64b6..b42d060de7 100644 --- a/Mage.Sets/src/mage/cards/s/SoulSpike.java +++ b/Mage.Sets/src/mage/cards/s/SoulSpike.java @@ -59,7 +59,7 @@ public class SoulSpike extends CardImpl { // You may exile two black cards from your hand rather than pay Soul Spike's mana cost. this.addAbility(new AlternativeCostSourceAbility(new ExileFromHandCost(new TargetCardInHand(2, filter)))); - // Soul Spike deals 4 damage to target creature or player and you gain 4 life. + // Soul Spike deals 4 damage to any target and you gain 4 life. this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DamageTargetEffect(4)); this.getSpellAbility().addEffect(new GainLifeEffect(4)); diff --git a/Mage.Sets/src/mage/cards/s/Soulblast.java b/Mage.Sets/src/mage/cards/s/Soulblast.java index cf60493fbc..d2709169cb 100644 --- a/Mage.Sets/src/mage/cards/s/Soulblast.java +++ b/Mage.Sets/src/mage/cards/s/Soulblast.java @@ -54,7 +54,7 @@ public class Soulblast extends CardImpl { // As an additional cost to cast Soulblast, sacrifice all creatures you control. this.getSpellAbility().addCost(new SacrificeAllCost(StaticFilters.FILTER_PERMANENT_CREATURES_CONTROLLED)); - // Soulblast deals damage to target creature or player equal to the total power of the sacrificed creatures. + // Soulblast deals damage to any target equal to the total power of the sacrificed creatures. this.getSpellAbility().addEffect(new SoulblastEffect()); this.getSpellAbility().addTarget(new TargetAnyTarget()); } @@ -73,7 +73,7 @@ class SoulblastEffect extends OneShotEffect { public SoulblastEffect() { super(Outcome.Benefit); - this.staticText = "Soulblast deals damage to target creature or player equal to the total power of the sacrificed creatures"; + this.staticText = "Soulblast deals damage to any target equal to the total power of the sacrificed creatures"; } public SoulblastEffect(final SoulblastEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SoulsFire.java b/Mage.Sets/src/mage/cards/s/SoulsFire.java index 2b2363c96f..4208809bd5 100644 --- a/Mage.Sets/src/mage/cards/s/SoulsFire.java +++ b/Mage.Sets/src/mage/cards/s/SoulsFire.java @@ -51,7 +51,7 @@ public class SoulsFire extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{R}"); - // Target creature you control on the battlefield deals damage equal to its power to target creature or player. + // Target creature you control on the battlefield deals damage equal to its power to any target. this.getSpellAbility().addEffect(new SoulsFireEffect()); this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); this.getSpellAbility().addTarget(new TargetAnyTarget()); @@ -71,7 +71,7 @@ class SoulsFireEffect extends OneShotEffect { public SoulsFireEffect() { super(Outcome.Damage); - this.staticText = "Target creature you control on the battlefield deals damage equal to its power to target creature or player"; + this.staticText = "Target creature you control on the battlefield deals damage equal to its power to any target"; } public SoulsFireEffect(final SoulsFireEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SparkJolt.java b/Mage.Sets/src/mage/cards/s/SparkJolt.java index bce3e24db7..e5fa551abe 100644 --- a/Mage.Sets/src/mage/cards/s/SparkJolt.java +++ b/Mage.Sets/src/mage/cards/s/SparkJolt.java @@ -45,7 +45,7 @@ public class SparkJolt extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{R}"); - // Spark Jolt deals 1 damage to target creature or player. Scry 1. + // Spark Jolt deals 1 damage to any target. Scry 1. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new ScryEffect(1)); diff --git a/Mage.Sets/src/mage/cards/s/SparkSpray.java b/Mage.Sets/src/mage/cards/s/SparkSpray.java index 77b8213bc5..1413487f9a 100644 --- a/Mage.Sets/src/mage/cards/s/SparkSpray.java +++ b/Mage.Sets/src/mage/cards/s/SparkSpray.java @@ -46,7 +46,7 @@ public class SparkSpray extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{R}"); - // Spark Spray deals 1 damage to target creature or player. + // Spark Spray deals 1 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/s/SpawnOfThraxes.java b/Mage.Sets/src/mage/cards/s/SpawnOfThraxes.java index 6984504b80..498a8c8096 100644 --- a/Mage.Sets/src/mage/cards/s/SpawnOfThraxes.java +++ b/Mage.Sets/src/mage/cards/s/SpawnOfThraxes.java @@ -63,7 +63,7 @@ public class SpawnOfThraxes extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // When Spawn of Thraxes enters the battlefield, it deals damage to target creature or player equal to the number of Mountains you control. + // When Spawn of Thraxes enters the battlefield, it deals damage to any target equal to the number of Mountains you control. Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter))); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SphinxBoneWand.java b/Mage.Sets/src/mage/cards/s/SphinxBoneWand.java index ddebac309c..22e38436c9 100644 --- a/Mage.Sets/src/mage/cards/s/SphinxBoneWand.java +++ b/Mage.Sets/src/mage/cards/s/SphinxBoneWand.java @@ -61,7 +61,7 @@ public class SphinxBoneWand extends CardImpl { public SphinxBoneWand(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{7}"); - // Whenever you cast an instant or sorcery spell, you may put a charge counter on Sphinx-Bone Wand. If you do, Sphinx-Bone Wand deals damage equal to the number of charge counters on it to target creature or player. + // Whenever you cast an instant or sorcery spell, you may put a charge counter on Sphinx-Bone Wand. If you do, Sphinx-Bone Wand deals damage equal to the number of charge counters on it to any target. SpellCastControllerTriggeredAbility ability = new SpellCastControllerTriggeredAbility(new SphinxBoneWandEffect(), filter, true); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); @@ -81,7 +81,7 @@ class SphinxBoneWandEffect extends OneShotEffect { public SphinxBoneWandEffect() { super(Outcome.Damage); - this.staticText = "put a charge counter on Sphinx-Bone Wand. If you do, Sphinx-Bone Wand deals damage equal to the number of charge counters on it to target creature or player"; + this.staticText = "put a charge counter on Sphinx-Bone Wand. If you do, Sphinx-Bone Wand deals damage equal to the number of charge counters on it to any target"; } public SphinxBoneWandEffect(final SphinxBoneWandEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SpikeshotElder.java b/Mage.Sets/src/mage/cards/s/SpikeshotElder.java index cdefa76c5b..820072c8a0 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeshotElder.java +++ b/Mage.Sets/src/mage/cards/s/SpikeshotElder.java @@ -76,7 +76,7 @@ public class SpikeshotElder extends CardImpl { class SpikeshotElderEffect extends OneShotEffect { public SpikeshotElderEffect() { super(Outcome.Damage); - staticText = "{this} deals damage equal to its power to target creature or player"; + staticText = "{this} deals damage equal to its power to any target"; } public SpikeshotElderEffect(final SpikeshotElderEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SpikeshotGoblin.java b/Mage.Sets/src/mage/cards/s/SpikeshotGoblin.java index 87373126d1..e60040e372 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeshotGoblin.java +++ b/Mage.Sets/src/mage/cards/s/SpikeshotGoblin.java @@ -56,7 +56,7 @@ public class SpikeshotGoblin extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - // {R}, {tap}: Spikeshot Goblin deals damage equal to its power to target creature or player. + // {R}, {tap}: Spikeshot Goblin deals damage equal to its power to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SpikeshotGoblinEffect(), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); @@ -76,7 +76,7 @@ public class SpikeshotGoblin extends CardImpl { class SpikeshotGoblinEffect extends OneShotEffect { public SpikeshotGoblinEffect() { super(Outcome.Damage); - staticText = "{this} deals damage equal to its power to target creature or player"; + staticText = "{this} deals damage equal to its power to any target"; } public SpikeshotGoblinEffect(final SpikeshotGoblinEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SpiralingEmbers.java b/Mage.Sets/src/mage/cards/s/SpiralingEmbers.java index 19307895cb..6ed7061b50 100644 --- a/Mage.Sets/src/mage/cards/s/SpiralingEmbers.java +++ b/Mage.Sets/src/mage/cards/s/SpiralingEmbers.java @@ -48,9 +48,9 @@ public class SpiralingEmbers extends CardImpl { this.subtype.add(SubType.ARCANE); - // Spiraling Embers deals damage to target creature or player equal to the number of cards in your hand. + // Spiraling Embers deals damage to any target equal to the number of cards in your hand. Effect effect = new DamageTargetEffect(new CardsInControllerHandCount()); - effect.setText("{this} deals damage to target creature or player equal to the number of cards in your hand."); + effect.setText("{this} deals damage to any target equal to the number of cards in your hand."); this.getSpellAbility().addEffect(effect); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/s/SpireBarrage.java b/Mage.Sets/src/mage/cards/s/SpireBarrage.java index 70e2943c87..db3d98eeec 100644 --- a/Mage.Sets/src/mage/cards/s/SpireBarrage.java +++ b/Mage.Sets/src/mage/cards/s/SpireBarrage.java @@ -56,7 +56,7 @@ public class SpireBarrage extends CardImpl { public SpireBarrage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{R}"); - // Spire Barrage deals damage to target creature or player equal to the number of Mountains you control. + // Spire Barrage deals damage to any target equal to the number of Mountains you control. this.getSpellAbility().addEffect(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter))); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/s/Spitemare.java b/Mage.Sets/src/mage/cards/s/Spitemare.java index 0b3faec854..c94dc3d457 100644 --- a/Mage.Sets/src/mage/cards/s/Spitemare.java +++ b/Mage.Sets/src/mage/cards/s/Spitemare.java @@ -58,7 +58,7 @@ public class Spitemare extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - // Whenever Spitemare is dealt damage, it deals that much damage to target creature or player. + // Whenever Spitemare is dealt damage, it deals that much damage to any target. Ability ability = new SpitemareTriggeredAbility(); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); @@ -114,7 +114,7 @@ class SpitemareEffect extends OneShotEffect { public SpitemareEffect() { super(Outcome.Damage); - staticText = "it deals that much damage to target creature or player"; + staticText = "it deals that much damage to any target"; } public SpitemareEffect(final SpitemareEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SpitfireBastion.java b/Mage.Sets/src/mage/cards/s/SpitfireBastion.java index 66f13bed04..052e259545 100644 --- a/Mage.Sets/src/mage/cards/s/SpitfireBastion.java +++ b/Mage.Sets/src/mage/cards/s/SpitfireBastion.java @@ -56,7 +56,7 @@ public class SpitfireBastion extends CardImpl { // {T}: Add {R}. this.addAbility(new RedManaAbility()); - // {2}{R}, {T}: Spitfire Bastion deals 3 damage to target creature or player. + // {2}{R}, {T}: Spitfire Bastion deals 3 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new TapSourceCost()); ability.addCost(new ManaCostsImpl("{2}{R}")); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/s/SplitTailMiko.java b/Mage.Sets/src/mage/cards/s/SplitTailMiko.java index 797e78bec0..258402dd14 100644 --- a/Mage.Sets/src/mage/cards/s/SplitTailMiko.java +++ b/Mage.Sets/src/mage/cards/s/SplitTailMiko.java @@ -52,7 +52,7 @@ public class SplitTailMiko extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // {W}, {tap}: Prevent the next 2 damage that would be dealt to target creature or player this turn. + // {W}, {tap}: Prevent the next 2 damage that would be dealt to any target this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/s/StaffOfNin.java b/Mage.Sets/src/mage/cards/s/StaffOfNin.java index df9409157a..63876dd4da 100644 --- a/Mage.Sets/src/mage/cards/s/StaffOfNin.java +++ b/Mage.Sets/src/mage/cards/s/StaffOfNin.java @@ -52,7 +52,7 @@ public class StaffOfNin extends CardImpl { // At the beginning of your upkeep, draw a card. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DrawCardSourceControllerEffect(1), TargetController.YOU, false)); - // {tap}: Staff of Nin deals 1 damage to target creature or player. + // {tap}: Staff of Nin deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SteamcoreWeird.java b/Mage.Sets/src/mage/cards/s/SteamcoreWeird.java index 3758fa8e68..4097f645b0 100644 --- a/Mage.Sets/src/mage/cards/s/SteamcoreWeird.java +++ b/Mage.Sets/src/mage/cards/s/SteamcoreWeird.java @@ -54,11 +54,11 @@ public class SteamcoreWeird extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(3); - // When Steamcore Weird enters the battlefield, if {R} was spent to cast Steamcore Weird, it deals 2 damage to target creature or player. + // When Steamcore Weird enters the battlefield, if {R} was spent to cast Steamcore Weird, it deals 2 damage to any target. TriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(2, "it")); ability.addTarget(new TargetAnyTarget()); this.addAbility(new ConditionalTriggeredAbility(ability, new ManaWasSpentCondition(ColoredManaSymbol.R), - "if {R} was spent to cast {this}, it deals 2 damage to target creature or player."), + "if {R} was spent to cast {this}, it deals 2 damage to any target."), new ManaSpentToCastWatcher()); } diff --git a/Mage.Sets/src/mage/cards/s/StingingBarrier.java b/Mage.Sets/src/mage/cards/s/StingingBarrier.java index 83de1c09ba..dad35fbee3 100644 --- a/Mage.Sets/src/mage/cards/s/StingingBarrier.java +++ b/Mage.Sets/src/mage/cards/s/StingingBarrier.java @@ -55,7 +55,7 @@ public class StingingBarrier extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); - // {U}, {tap}: Stinging Barrier deals 1 damage to target creature or player. + // {U}, {tap}: Stinging Barrier deals 1 damage to any target. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/s/StokeTheFlames.java b/Mage.Sets/src/mage/cards/s/StokeTheFlames.java index acca896927..77c4044f4a 100644 --- a/Mage.Sets/src/mage/cards/s/StokeTheFlames.java +++ b/Mage.Sets/src/mage/cards/s/StokeTheFlames.java @@ -48,7 +48,7 @@ public class StokeTheFlames extends CardImpl { // Convoke this.addAbility(new ConvokeAbility()); - // Stoke the Flames deals 4 damage to target creature or player. + // Stoke the Flames deals 4 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/s/StompingSlabs.java b/Mage.Sets/src/mage/cards/s/StompingSlabs.java index 8f7bfe83ff..2a77c5d161 100644 --- a/Mage.Sets/src/mage/cards/s/StompingSlabs.java +++ b/Mage.Sets/src/mage/cards/s/StompingSlabs.java @@ -53,7 +53,7 @@ public class StompingSlabs extends CardImpl { public StompingSlabs(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{R}"); - // Reveal the top seven cards of your library, then put those cards on the bottom of your library in any order. If a card named Stomping Slabs was revealed this way, Stomping Slabs deals 7 damage to target creature or player. + // Reveal the top seven cards of your library, then put those cards on the bottom of your library in any order. If a card named Stomping Slabs was revealed this way, Stomping Slabs deals 7 damage to any target. this.getSpellAbility().addEffect(new StompingSlabsEffect()); this.getSpellAbility().addTarget(new TargetAnyTarget()); } @@ -72,7 +72,7 @@ class StompingSlabsEffect extends OneShotEffect { StompingSlabsEffect() { super(Outcome.Damage); - this.staticText = "Reveal the top seven cards of your library, then put those cards on the bottom of your library in any order. If a card named Stomping Slabs was revealed this way, {this} deals 7 damage to target creature or player"; + this.staticText = "Reveal the top seven cards of your library, then put those cards on the bottom of your library in any order. If a card named Stomping Slabs was revealed this way, {this} deals 7 damage to any target"; } StompingSlabsEffect(final StompingSlabsEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/StormFleetPyromancer.java b/Mage.Sets/src/mage/cards/s/StormFleetPyromancer.java index 9888b409f2..08163b6bea 100644 --- a/Mage.Sets/src/mage/cards/s/StormFleetPyromancer.java +++ b/Mage.Sets/src/mage/cards/s/StormFleetPyromancer.java @@ -56,11 +56,11 @@ public class StormFleetPyromancer extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(2); - // Raid - When Storm Fleet Pyromancer enters the battlefield, if you attacked with a creature this turn, Storm Fleet Pyromancer deals 2 damage to target creature or player. + // Raid - When Storm Fleet Pyromancer enters the battlefield, if you attacked with a creature this turn, Storm Fleet Pyromancer deals 2 damage to any target. Ability ability = new ConditionalTriggeredAbility( new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(2)), RaidCondition.instance, - "Raid — When {this} enters the battlefield, if you attacked with a creature this turn, {this} deals 2 damage to target creature or player."); + "Raid — When {this} enters the battlefield, if you attacked with a creature this turn, {this} deals 2 damage to any target."); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability, new PlayerAttackedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/s/Stormbind.java b/Mage.Sets/src/mage/cards/s/Stormbind.java index 719e9b7cba..22f938de26 100644 --- a/Mage.Sets/src/mage/cards/s/Stormbind.java +++ b/Mage.Sets/src/mage/cards/s/Stormbind.java @@ -49,7 +49,7 @@ public class Stormbind extends CardImpl { public Stormbind(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{R}{G}"); - // {2}, Discard a card at random: Stormbind deals 2 damage to target creature or player. + // {2}, Discard a card at random: Stormbind deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{2}")); ability.addCost(new DiscardCardCost(true)); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/s/SuddenShock.java b/Mage.Sets/src/mage/cards/s/SuddenShock.java index dbfd1c82f3..4fe84f90ca 100644 --- a/Mage.Sets/src/mage/cards/s/SuddenShock.java +++ b/Mage.Sets/src/mage/cards/s/SuddenShock.java @@ -47,7 +47,7 @@ public class SuddenShock extends CardImpl { // Split second this.addAbility(new SplitSecondAbility()); - // Sudden Shock deals 2 damage to target creature or player. + // Sudden Shock deals 2 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(2, true)); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/s/SunfireBalm.java b/Mage.Sets/src/mage/cards/s/SunfireBalm.java index a4e8602cf5..459410c1e9 100644 --- a/Mage.Sets/src/mage/cards/s/SunfireBalm.java +++ b/Mage.Sets/src/mage/cards/s/SunfireBalm.java @@ -48,12 +48,12 @@ public class SunfireBalm extends CardImpl { public SunfireBalm(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{W}"); - // Prevent the next 4 damage that would be dealt to target creature or player this turn. + // Prevent the next 4 damage that would be dealt to any target this turn. this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, 4)); this.getSpellAbility().addTarget(new TargetAnyTarget()); // Cycling {1}{W} this.addAbility(new CyclingAbility(new ManaCostsImpl("{1}{W}"))); - // When you cycle Sunfire Balm, you may prevent the next 1 damage that would be dealt to target creature or player this turn. + // When you cycle Sunfire Balm, you may prevent the next 1 damage that would be dealt to any target this turn. Ability ability = new CycleTriggeredAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), true); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SunflareShaman.java b/Mage.Sets/src/mage/cards/s/SunflareShaman.java index fbc9e5dd8f..86b396037e 100644 --- a/Mage.Sets/src/mage/cards/s/SunflareShaman.java +++ b/Mage.Sets/src/mage/cards/s/SunflareShaman.java @@ -61,7 +61,7 @@ public class SunflareShaman extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - // {1}{R}, {tap}: Sunflare Shaman deals X damage to target creature or player and X damage to itself, where X is the number of Elemental cards in your graveyard. + // {1}{R}, {tap}: Sunflare Shaman deals X damage to any target and X damage to itself, where X is the number of Elemental cards in your graveyard. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SunflareShamanEffect(), new ManaCostsImpl("{1}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); @@ -89,7 +89,7 @@ class SunflareShamanEffect extends OneShotEffect { public SunflareShamanEffect() { super(Outcome.Damage); - this.staticText = "{this} deals X damage to target creature or player and X damage to itself, where X is the number of Elemental cards in your graveyard"; + this.staticText = "{this} deals X damage to any target and X damage to itself, where X is the number of Elemental cards in your graveyard"; } public SunflareShamanEffect(final SunflareShamanEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SuqAtaFirewalker.java b/Mage.Sets/src/mage/cards/s/SuqAtaFirewalker.java index d23824c811..f8df4da88e 100644 --- a/Mage.Sets/src/mage/cards/s/SuqAtaFirewalker.java +++ b/Mage.Sets/src/mage/cards/s/SuqAtaFirewalker.java @@ -69,7 +69,7 @@ public class SuqAtaFirewalker extends CardImpl { // Suq'Ata Firewalker can't be the target of red spells or abilities from red sources. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeTargetedSourceEffect(filterRed, Duration.WhileOnBattlefield))); - //{T}: Suq'Ata Firewalker deals 1 damage to target creature or player. + //{T}: Suq'Ata Firewalker deals 1 damage to any target. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SurgingFlame.java b/Mage.Sets/src/mage/cards/s/SurgingFlame.java index 7644134ee2..3efb4febae 100644 --- a/Mage.Sets/src/mage/cards/s/SurgingFlame.java +++ b/Mage.Sets/src/mage/cards/s/SurgingFlame.java @@ -47,7 +47,7 @@ public class SurgingFlame extends CardImpl { // Ripple 4 this.addAbility(new RippleAbility(4).setRuleAtTheTop(true)); - // Surging Flame deals 2 damage to target creature or player. + // Surging Flame deals 2 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/s/SwiftManeuver.java b/Mage.Sets/src/mage/cards/s/SwiftManeuver.java index 7c569691a6..817d541195 100644 --- a/Mage.Sets/src/mage/cards/s/SwiftManeuver.java +++ b/Mage.Sets/src/mage/cards/s/SwiftManeuver.java @@ -47,7 +47,7 @@ public class SwiftManeuver extends CardImpl { public SwiftManeuver(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{W}"); - // Prevent the next 2 damage that would be dealt to target creature or player this turn. + // Prevent the next 2 damage that would be dealt to any target this turn. this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, 2)); this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/s/SwordOfFireAndIce.java b/Mage.Sets/src/mage/cards/s/SwordOfFireAndIce.java index 8c9214e07d..d03508ec30 100644 --- a/Mage.Sets/src/mage/cards/s/SwordOfFireAndIce.java +++ b/Mage.Sets/src/mage/cards/s/SwordOfFireAndIce.java @@ -65,7 +65,7 @@ public class SwordOfFireAndIce extends CardImpl { // Equipped creature gets +2/+2 and has protection from red and from blue. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ProtectionAbility.from(ObjectColor.RED, ObjectColor.BLUE), AttachmentType.EQUIPMENT))); - // Whenever equipped creature deals combat damage to a player, Sword of Fire and Ice deals 2 damage to target creature or player and you draw a card. + // Whenever equipped creature deals combat damage to a player, Sword of Fire and Ice deals 2 damage to any target and you draw a card. this.addAbility(new SwordOfFireAndIceAbility()); // Equip this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); @@ -113,6 +113,6 @@ class SwordOfFireAndIceAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever equipped creature deals combat damage to a player, {this} deals 2 damage to target creature or player and you draw a card."; + return "Whenever equipped creature deals combat damage to a player, {this} deals 2 damage to any target and you draw a card."; } } diff --git a/Mage.Sets/src/mage/cards/s/SwordOfTheAges.java b/Mage.Sets/src/mage/cards/s/SwordOfTheAges.java index 95db19ab36..2c6cea0f13 100644 --- a/Mage.Sets/src/mage/cards/s/SwordOfTheAges.java +++ b/Mage.Sets/src/mage/cards/s/SwordOfTheAges.java @@ -63,7 +63,7 @@ public class SwordOfTheAges extends CardImpl { // Sword of the Ages enters the battlefield tapped. this.addAbility(new EntersBattlefieldTappedAbility()); - // {T}, Sacrifice Sword of the Ages and any number of creatures you control: Sword of the Ages deals X damage to target creature or player, where X is the total power of the creatures sacrificed this way, then exile Sword of the Ages and those creature cards. + // {T}, Sacrifice Sword of the Ages and any number of creatures you control: Sword of the Ages deals X damage to any target, where X is the total power of the creatures sacrificed this way, then exile Sword of the Ages and those creature cards. Cost cost = new SacrificeSourceCost(); cost.setText("Sacrifice {this} and any number of creatures you control"); Cost cost2 = new SacrificeTargetCost(new TargetControlledCreaturePermanent(0, Integer.MAX_VALUE, new FilterControlledCreaturePermanent(), true)); @@ -89,7 +89,7 @@ class SwordOfTheAgesEffect extends OneShotEffect { public SwordOfTheAgesEffect() { super(Outcome.Damage); - this.staticText = "{this} deals X damage to target creature or player, where X is the total power of the creatures sacrificed this way, then exile {this} and those creature cards"; + this.staticText = "{this} deals X damage to any target, where X is the total power of the creatures sacrificed this way, then exile {this} and those creature cards"; } public SwordOfTheAgesEffect(final SwordOfTheAgesEffect effect) { diff --git a/Mage.Sets/src/mage/cards/t/TalonOfPain.java b/Mage.Sets/src/mage/cards/t/TalonOfPain.java index 8da16479ec..b4c1df248e 100644 --- a/Mage.Sets/src/mage/cards/t/TalonOfPain.java +++ b/Mage.Sets/src/mage/cards/t/TalonOfPain.java @@ -67,7 +67,7 @@ public class TalonOfPain extends CardImpl { */ this.addAbility(new TalonOfPainTriggeredAbility()); - // {X}, {T}, Remove X charge counters from Talon of Pain: Talon of Pain deals X damage to target creature or player. + // {X}, {T}, Remove X charge counters from Talon of Pain: Talon of Pain deals X damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new ManacostVariableValue()), new ManaCostsImpl("{X}")); ability.addCost(new TapSourceCost()); ability.addCost(new TalonOfPainRemoveVariableCountersSourceCost(CounterType.CHARGE.createInstance())); diff --git a/Mage.Sets/src/mage/cards/t/TarPitcher.java b/Mage.Sets/src/mage/cards/t/TarPitcher.java index 420898e252..786960d578 100644 --- a/Mage.Sets/src/mage/cards/t/TarPitcher.java +++ b/Mage.Sets/src/mage/cards/t/TarPitcher.java @@ -63,7 +63,7 @@ public class TarPitcher extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // {tap}, Sacrifice a Goblin: Tar Pitcher deals 2 damage to target creature or player. + // {tap}, Sacrifice a Goblin: Tar Pitcher deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true))); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/t/Tarfire.java b/Mage.Sets/src/mage/cards/t/Tarfire.java index 760283539c..2a9d910aba 100644 --- a/Mage.Sets/src/mage/cards/t/Tarfire.java +++ b/Mage.Sets/src/mage/cards/t/Tarfire.java @@ -45,7 +45,7 @@ public class Tarfire extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.INSTANT},"{R}"); this.subtype.add(SubType.GOBLIN); - // Tarfire deals 2 damage to target creature or player. + // Tarfire deals 2 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/t/ThornThallid.java b/Mage.Sets/src/mage/cards/t/ThornThallid.java index 2b294e82ce..07321b63a8 100644 --- a/Mage.Sets/src/mage/cards/t/ThornThallid.java +++ b/Mage.Sets/src/mage/cards/t/ThornThallid.java @@ -58,7 +58,7 @@ public class ThornThallid extends CardImpl { // At the beginning of your upkeep, put a spore counter on Thorn Thallid. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()), TargetController.YOU, false)); - // Remove three spore counters from Thorn Thallid: Thorn Thallid deals 1 damage to target creature or player. + // Remove three spore counters from Thorn Thallid: Thorn Thallid deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3))); diff --git a/Mage.Sets/src/mage/cards/t/ThornbiteStaff.java b/Mage.Sets/src/mage/cards/t/ThornbiteStaff.java index 42da050279..cd1c5bde21 100644 --- a/Mage.Sets/src/mage/cards/t/ThornbiteStaff.java +++ b/Mage.Sets/src/mage/cards/t/ThornbiteStaff.java @@ -65,12 +65,12 @@ public class ThornbiteStaff extends CardImpl { this.subtype.add(SubType.SHAMAN); this.subtype.add(SubType.EQUIPMENT); - // Equipped creature has "{2}, {T}: This creature deals 1 damage to target creature or player" and "Whenever a creature dies, untap this creature." + // Equipped creature has "{2}, {T}: This creature deals 1 damage to any target" and "Whenever a creature dies, untap this creature." Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new GenericManaCost(2)); gainedAbility.addCost(new TapSourceCost()); gainedAbility.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.EQUIPMENT); - effect.setText("Equipped creature has \"{2}, {T}: This creature deals 1 damage to target creature or player\""); + effect.setText("Equipped creature has \"{2}, {T}: This creature deals 1 damage to any target\""); Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); effect = new GainAbilityAttachedEffect(new DiesCreatureTriggeredAbility(new UntapSourceEffect(),false), AttachmentType.EQUIPMENT); effect.setText("and \"Whenever a creature dies, untap this creature.\""); diff --git a/Mage.Sets/src/mage/cards/t/ThorncasterSliver.java b/Mage.Sets/src/mage/cards/t/ThorncasterSliver.java index 8af9f66187..de3e841aa5 100644 --- a/Mage.Sets/src/mage/cards/t/ThorncasterSliver.java +++ b/Mage.Sets/src/mage/cards/t/ThorncasterSliver.java @@ -56,13 +56,13 @@ public class ThorncasterSliver extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // Sliver creatures you control have "Whenever this creature attacks, it deals 1 damage to target creature or player." + // Sliver creatures you control have "Whenever this creature attacks, it deals 1 damage to any target." Ability ability = new AttacksTriggeredAbility(new DamageTargetEffect(1, "it"), false); ability.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(ability, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE_SLIVERS) - .setText("Sliver creatures you control have \"Whenever this creature attacks, it deals 1 damage to target creature or player.\""))); + .setText("Sliver creatures you control have \"Whenever this creature attacks, it deals 1 damage to any target.\""))); } public ThorncasterSliver(final ThorncasterSliver card) { diff --git a/Mage.Sets/src/mage/cards/t/ThornscapeBattlemage.java b/Mage.Sets/src/mage/cards/t/ThornscapeBattlemage.java index cb9b5031ed..82de3710e2 100644 --- a/Mage.Sets/src/mage/cards/t/ThornscapeBattlemage.java +++ b/Mage.Sets/src/mage/cards/t/ThornscapeBattlemage.java @@ -61,11 +61,11 @@ public class ThornscapeBattlemage extends CardImpl { kickerAbility.addKickerCost("{W}"); this.addAbility(kickerAbility); - // When {this} enters the battlefield, if it was kicked with its {R} kicker, it deals 2 damage to target creature or player. + // When {this} enters the battlefield, if it was kicked with its {R} kicker, it deals 2 damage to any target. TriggeredAbility ability1 = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(2, "it")); ability1.addTarget(new TargetAnyTarget()); this.addAbility(new ConditionalTriggeredAbility(ability1, new KickedCostCondition("{R}"), - "When {this} enters the battlefield, if it was kicked with its {R} kicker, it deals 2 damage to target creature or player.")); + "When {this} enters the battlefield, if it was kicked with its {R} kicker, it deals 2 damage to any target.")); // When {this} enters the battlefield, if it was kicked with its {W} kicker, destroy target artifact. TriggeredAbility ability2 = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/cards/t/ThornwindFaeries.java b/Mage.Sets/src/mage/cards/t/ThornwindFaeries.java index 55001b631a..ca31923e2c 100644 --- a/Mage.Sets/src/mage/cards/t/ThornwindFaeries.java +++ b/Mage.Sets/src/mage/cards/t/ThornwindFaeries.java @@ -56,7 +56,7 @@ public class ThornwindFaeries extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // {tap}: Thornwind Faeries deals 1 damage to target creature or player. + // {tap}: Thornwind Faeries deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThrowingKnife.java b/Mage.Sets/src/mage/cards/t/ThrowingKnife.java index 58a98dde70..825fbd164c 100644 --- a/Mage.Sets/src/mage/cards/t/ThrowingKnife.java +++ b/Mage.Sets/src/mage/cards/t/ThrowingKnife.java @@ -58,7 +58,7 @@ public class ThrowingKnife extends CardImpl { // Equipped creature gets +2/+0. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0))); - // Whenever equipped creature attacks, you may sacrifice Throwing Knife. If you do, Throwing Knife deals 2 damage to target creature or player. + // Whenever equipped creature attacks, you may sacrifice Throwing Knife. If you do, Throwing Knife deals 2 damage to any target. Effect effect = new SacrificeSourceEffect(); effect.setText("you may sacrifice {this}. If you do, "); Ability ability = new AttacksAttachedTriggeredAbility(new SacrificeSourceEffect(), true); diff --git a/Mage.Sets/src/mage/cards/t/ThunderbladeCharge.java b/Mage.Sets/src/mage/cards/t/ThunderbladeCharge.java index b156fb2092..73f3e813c3 100644 --- a/Mage.Sets/src/mage/cards/t/ThunderbladeCharge.java +++ b/Mage.Sets/src/mage/cards/t/ThunderbladeCharge.java @@ -53,7 +53,7 @@ public class ThunderbladeCharge extends CardImpl { public ThunderbladeCharge(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{R}{R}"); - // Thunderblade Charge deals 3 damage to target creature or player. + // Thunderblade Charge deals 3 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/t/ThunderousWrath.java b/Mage.Sets/src/mage/cards/t/ThunderousWrath.java index 980bbbe38e..f2757f79c4 100644 --- a/Mage.Sets/src/mage/cards/t/ThunderousWrath.java +++ b/Mage.Sets/src/mage/cards/t/ThunderousWrath.java @@ -46,7 +46,7 @@ public class ThunderousWrath extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{4}{R}{R}"); - // Thunderous Wrath deals 5 damage to target creature or player. + // Thunderous Wrath deals 5 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(5)); this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/t/TickingGnomes.java b/Mage.Sets/src/mage/cards/t/TickingGnomes.java index 756d1a3b6b..4bb74237cc 100644 --- a/Mage.Sets/src/mage/cards/t/TickingGnomes.java +++ b/Mage.Sets/src/mage/cards/t/TickingGnomes.java @@ -56,7 +56,7 @@ public class TickingGnomes extends CardImpl { // Echo {3} this.addAbility(new EchoAbility("{3}")); - // Sacrifice Ticking Gnomes: Ticking Gnomes deals 1 damage to target creature or player. + // Sacrifice Ticking Gnomes: Ticking Gnomes deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TitanOfEternalFire.java b/Mage.Sets/src/mage/cards/t/TitanOfEternalFire.java index 585adc8cae..5a64bd8e18 100644 --- a/Mage.Sets/src/mage/cards/t/TitanOfEternalFire.java +++ b/Mage.Sets/src/mage/cards/t/TitanOfEternalFire.java @@ -59,12 +59,12 @@ public class TitanOfEternalFire extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(6); - // Each Human creature you control has "{R}, {T}: This creature deals 1 damage to target creature or player." + // Each Human creature you control has "{R}, {T}: This creature deals 1 damage to any target." Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityControlledEffect(ability, Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.HUMAN, "Each Human creature")); - effect.setText("Each Human creature you control has \"{R}, {T}: This creature deals 1 damage to target creature or player.\""); + effect.setText("Each Human creature you control has \"{R}, {T}: This creature deals 1 damage to any target.\""); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } diff --git a/Mage.Sets/src/mage/cards/t/TitansRevenge.java b/Mage.Sets/src/mage/cards/t/TitansRevenge.java index dc56fa3b2c..e313aa1a03 100644 --- a/Mage.Sets/src/mage/cards/t/TitansRevenge.java +++ b/Mage.Sets/src/mage/cards/t/TitansRevenge.java @@ -46,7 +46,7 @@ public class TitansRevenge extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{X}{R}{R}"); - // Titan's Revenge deals X damage to target creature or player. Clash with an opponent. If you win, return Titan's Revenge to its owner's hand. + // Titan's Revenge deals X damage to any target. Clash with an opponent. If you win, return Titan's Revenge to its owner's hand. this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(ClashWinReturnToHandSpellEffect.getInstance()); diff --git a/Mage.Sets/src/mage/cards/t/TorchSong.java b/Mage.Sets/src/mage/cards/t/TorchSong.java index 0aec506f7c..95c817566d 100644 --- a/Mage.Sets/src/mage/cards/t/TorchSong.java +++ b/Mage.Sets/src/mage/cards/t/TorchSong.java @@ -57,7 +57,7 @@ public class TorchSong extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.VERSE.createInstance(), true), TargetController.YOU, true)); - // {2}{R}, Sacrifice Torch Song: Torch Song deals X damage to target creature or player, where X is the number of verse counters on Torch Song. + // {2}{R}, Sacrifice Torch Song: Torch Song deals X damage to any target, where X is the number of verse counters on Torch Song. Ability ability = new SimpleActivatedAbility( Zone.BATTLEFIELD, new DamageTargetEffect(new CountersSourceCount(CounterType.VERSE)), diff --git a/Mage.Sets/src/mage/cards/t/TorrentOfFire.java b/Mage.Sets/src/mage/cards/t/TorrentOfFire.java index 1e10e590aa..b2ad280f6c 100644 --- a/Mage.Sets/src/mage/cards/t/TorrentOfFire.java +++ b/Mage.Sets/src/mage/cards/t/TorrentOfFire.java @@ -44,9 +44,9 @@ public class TorrentOfFire extends CardImpl { public TorrentOfFire(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{R}{R}"); - // Torrent of Fire deals damage equal to the highest converted mana cost among permanents you control to target creature or player. + // Torrent of Fire deals damage equal to the highest converted mana cost among permanents you control to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(new HighestConvertedManaCostValue()) - .setText("{this} deals damage to target creature or player equal to the highest converted mana cost among permanents you control.") + .setText("{this} deals damage to any target equal to the highest converted mana cost among permanents you control.") ); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/t/TouchOfTheVoid.java b/Mage.Sets/src/mage/cards/t/TouchOfTheVoid.java index b285b78787..b15b16dc17 100644 --- a/Mage.Sets/src/mage/cards/t/TouchOfTheVoid.java +++ b/Mage.Sets/src/mage/cards/t/TouchOfTheVoid.java @@ -51,7 +51,7 @@ public class TouchOfTheVoid extends CardImpl { // Devoid this.addAbility(new DevoidAbility(this.color)); - // Touch of the Void deals 3 damage to target creature or player. If a creature dealt damage this way would die this turn, exile it instead. + // Touch of the Void deals 3 damage to any target. If a creature dealt damage this way would die this turn, exile it instead. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetAnyTarget()); Effect effect = new DealtDamageToCreatureBySourceDies(this, Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/cards/t/TreefolkHealer.java b/Mage.Sets/src/mage/cards/t/TreefolkHealer.java index 7e0898db62..98261c82ed 100644 --- a/Mage.Sets/src/mage/cards/t/TreefolkHealer.java +++ b/Mage.Sets/src/mage/cards/t/TreefolkHealer.java @@ -55,7 +55,7 @@ public class TreefolkHealer extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(3); - // {2}{W}, {tap}: Prevent the next 2 damage that would be dealt to target creature or player this turn. + // {2}{W}, {tap}: Prevent the next 2 damage that would be dealt to any target this turn. Ability ability = new SimpleActivatedAbility( Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), diff --git a/Mage.Sets/src/mage/cards/t/TrialOfZeal.java b/Mage.Sets/src/mage/cards/t/TrialOfZeal.java index cfd45b7bbb..876d86e3be 100644 --- a/Mage.Sets/src/mage/cards/t/TrialOfZeal.java +++ b/Mage.Sets/src/mage/cards/t/TrialOfZeal.java @@ -56,7 +56,7 @@ public class TrialOfZeal extends CardImpl { public TrialOfZeal(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); - // When Trial of Zeal enters the battlefield, it deals 3 damage to target creature or player. + // When Trial of Zeal enters the battlefield, it deals 3 damage to any target. Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(3, "it")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TribalFlames.java b/Mage.Sets/src/mage/cards/t/TribalFlames.java index b79226333a..cc9726954d 100644 --- a/Mage.Sets/src/mage/cards/t/TribalFlames.java +++ b/Mage.Sets/src/mage/cards/t/TribalFlames.java @@ -45,7 +45,7 @@ public class TribalFlames extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{R}"); - // Domain - Tribal Flames deals X damage to target creature or player, where X is the number of basic land types among lands you control. + // Domain - Tribal Flames deals X damage to any target, where X is the number of basic land types among lands you control. this.getSpellAbility().addEffect(new DamageTargetEffect(new DomainValue())); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/t/Triskelavus.java b/Mage.Sets/src/mage/cards/t/Triskelavus.java index b0d4434443..69c4cd860f 100644 --- a/Mage.Sets/src/mage/cards/t/Triskelavus.java +++ b/Mage.Sets/src/mage/cards/t/Triskelavus.java @@ -63,7 +63,7 @@ public class Triskelavus extends CardImpl { // Triskelavus enters the battlefield with three +1/+1 counters on it. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(3)), "with three +1/+1 counters on it")); - // {1}, Remove a +1/+1 counter from Triskelavus: Create a 1/1 colorless Triskelavite artifact creature token with flying. It has "Sacrifice this creature: This creature deals 1 damage to target creature or player." + // {1}, Remove a +1/+1 counter from Triskelavus: Create a 1/1 colorless Triskelavite artifact creature token with flying. It has "Sacrifice this creature: This creature deals 1 damage to any target." Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new TriskelaviteToken()), new GenericManaCost(1)); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/Triskelion.java b/Mage.Sets/src/mage/cards/t/Triskelion.java index e344d353d8..7fc7fbce72 100644 --- a/Mage.Sets/src/mage/cards/t/Triskelion.java +++ b/Mage.Sets/src/mage/cards/t/Triskelion.java @@ -58,7 +58,7 @@ public class Triskelion extends CardImpl { // Triskelion enters the battlefield with three +1/+1 counters on it. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(3)), "with three +1/+1 counters on it")); - // Remove a +1/+1 counter from Triskelion: Triskelion deals 1 damage to target creature or player. + // Remove a +1/+1 counter from Triskelion: Triskelion deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TroubledHealer.java b/Mage.Sets/src/mage/cards/t/TroubledHealer.java index aaa4e6bfba..189b86ad56 100644 --- a/Mage.Sets/src/mage/cards/t/TroubledHealer.java +++ b/Mage.Sets/src/mage/cards/t/TroubledHealer.java @@ -56,7 +56,7 @@ public class TroubledHealer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - // Sacrifice a land: Prevent the next 2 damage that would be dealt to target creature or player this turn. + // Sacrifice a land: Prevent the next 2 damage that would be dealt to any target this turn. Ability ability = new SimpleActivatedAbility( Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), diff --git a/Mage.Sets/src/mage/cards/t/TurnBurn.java b/Mage.Sets/src/mage/cards/t/TurnBurn.java index e5310e088c..eb89d5ef0a 100644 --- a/Mage.Sets/src/mage/cards/t/TurnBurn.java +++ b/Mage.Sets/src/mage/cards/t/TurnBurn.java @@ -60,9 +60,9 @@ public class TurnBurn extends SplitCard { getLeftHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent()); // Burn - // Burn deals 2 damage to target creature or player. + // Burn deals 2 damage to any target. effect = new DamageTargetEffect(2); - effect.setText("Burn deals 2 damage to target creature or player"); + effect.setText("Burn deals 2 damage to any target"); getRightHalfCard().getSpellAbility().addEffect(effect); getRightHalfCard().getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/t/TyrantOfValakut.java b/Mage.Sets/src/mage/cards/t/TyrantOfValakut.java index a44839a862..8b429fe8dc 100644 --- a/Mage.Sets/src/mage/cards/t/TyrantOfValakut.java +++ b/Mage.Sets/src/mage/cards/t/TyrantOfValakut.java @@ -59,11 +59,11 @@ public class TyrantOfValakut extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // When Tyrant of Valakut enters the battlefield, if its surge cost was paid, it deals 3 damage to target creature or player. + // When Tyrant of Valakut enters the battlefield, if its surge cost was paid, it deals 3 damage to any target. EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(3), false); ability.addTarget(new TargetAnyTarget()); this.addAbility(new ConditionalTriggeredAbility(ability, SurgedCondition.instance, - "When {this} enters the battlefield, if its surge cost was paid, it deals 3 damage to target creature or player.")); + "When {this} enters the battlefield, if its surge cost was paid, it deals 3 damage to any target.")); } public TyrantOfValakut(final TyrantOfValakut card) { diff --git a/Mage.Sets/src/mage/cards/u/UginTheSpiritDragon.java b/Mage.Sets/src/mage/cards/u/UginTheSpiritDragon.java index f91d4ff1ef..f716266b9c 100644 --- a/Mage.Sets/src/mage/cards/u/UginTheSpiritDragon.java +++ b/Mage.Sets/src/mage/cards/u/UginTheSpiritDragon.java @@ -70,7 +70,7 @@ public class UginTheSpiritDragon extends CardImpl { this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(7)); - // +2: Ugin, the Spirit Dragon deals 3 damage to target creature or player. + // +2: Ugin, the Spirit Dragon deals 3 damage to any target. LoyaltyAbility ability = new LoyaltyAbility(new DamageTargetEffect(3), 2); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/u/UndyingFlames.java b/Mage.Sets/src/mage/cards/u/UndyingFlames.java index 1008fd337b..69508a4367 100644 --- a/Mage.Sets/src/mage/cards/u/UndyingFlames.java +++ b/Mage.Sets/src/mage/cards/u/UndyingFlames.java @@ -53,7 +53,7 @@ public class UndyingFlames extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{R}{R}"); - // Exile cards from the top of your library until you exile a nonland card. Undying Flames deals damage to target creature or player equal to that card's converted mana cost. + // Exile cards from the top of your library until you exile a nonland card. Undying Flames deals damage to any target equal to that card's converted mana cost. this.getSpellAbility().addEffect(new UndyingFlamesEffect()); this.getSpellAbility().addTarget(new TargetAnyTarget()); @@ -76,7 +76,7 @@ class UndyingFlamesEffect extends OneShotEffect { public UndyingFlamesEffect() { super(Outcome.Benefit); - staticText = "Exile cards from the top of your library until you exile a nonland card. {this} deals damage to target creature or player equal to that card's converted mana cost"; + staticText = "Exile cards from the top of your library until you exile a nonland card. {this} deals damage to any target equal to that card's converted mana cost"; } public UndyingFlamesEffect(final UndyingFlamesEffect effect) { diff --git a/Mage.Sets/src/mage/cards/u/UnfriendlyFire.java b/Mage.Sets/src/mage/cards/u/UnfriendlyFire.java index 3a470d2066..e17f6bb90c 100644 --- a/Mage.Sets/src/mage/cards/u/UnfriendlyFire.java +++ b/Mage.Sets/src/mage/cards/u/UnfriendlyFire.java @@ -43,7 +43,7 @@ public class UnfriendlyFire extends CardImpl { public UnfriendlyFire(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{4}{R}"); - // Unfriendly Fire deals 4 damage to target creature or player. + // Unfriendly Fire deals 4 damage to any target. this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DamageTargetEffect(4)); } diff --git a/Mage.Sets/src/mage/cards/u/UnyaroBeeSting.java b/Mage.Sets/src/mage/cards/u/UnyaroBeeSting.java index 4cd084a077..7c7754e5b0 100644 --- a/Mage.Sets/src/mage/cards/u/UnyaroBeeSting.java +++ b/Mage.Sets/src/mage/cards/u/UnyaroBeeSting.java @@ -43,7 +43,7 @@ public class UnyaroBeeSting extends CardImpl { public UnyaroBeeSting(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{G}"); - // Unyaro Bee Sting deals 2 damage to target creature or player. + // Unyaro Bee Sting deals 2 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/u/UnyaroBees.java b/Mage.Sets/src/mage/cards/u/UnyaroBees.java index 6316542519..6287ce1213 100644 --- a/Mage.Sets/src/mage/cards/u/UnyaroBees.java +++ b/Mage.Sets/src/mage/cards/u/UnyaroBees.java @@ -60,7 +60,7 @@ public class UnyaroBees extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {G}: Unyaro Bees gets +1/+1 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{G}"))); - // {3}{G}, Sacrifice Unyaro Bees: Unyaro Bees deals 2 damage to target creature or player. + // {3}{G}, Sacrifice Unyaro Bees: Unyaro Bees deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{3}{G}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/u/UrzasRage.java b/Mage.Sets/src/mage/cards/u/UrzasRage.java index 6e139184a2..911b5d236e 100644 --- a/Mage.Sets/src/mage/cards/u/UrzasRage.java +++ b/Mage.Sets/src/mage/cards/u/UrzasRage.java @@ -61,7 +61,7 @@ public class UrzasRage extends CardImpl { ability.setRuleAtTheTop(true); this.addAbility(ability); - // Urza's Rage deals 3 damage to target creature or player. If Urza's Rage was kicked, instead it deals 10 damage to that creature or player and the damage can't be prevented. + // Urza's Rage deals 3 damage to any target. If Urza's Rage was kicked, instead it deals 10 damage to that creature or player and the damage can't be prevented. this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new DamageTargetEffect(10, false), new DamageTargetEffect(3), KickedCondition.instance, "{this} deals 3 damage to any target. If {this} was kicked, instead it deals 10 damage to that permanent or player and the damage can't be prevented.")); diff --git a/Mage.Sets/src/mage/cards/v/ValakutInvoker.java b/Mage.Sets/src/mage/cards/v/ValakutInvoker.java index 62dc3c59c0..73af292d61 100644 --- a/Mage.Sets/src/mage/cards/v/ValakutInvoker.java +++ b/Mage.Sets/src/mage/cards/v/ValakutInvoker.java @@ -53,7 +53,7 @@ public class ValakutInvoker extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(3); - // {8}: Valakut Invoker deals 3 damage to target creature or player. + // {8}: Valakut Invoker deals 3 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new GenericManaCost(8)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/ValakutTheMoltenPinnacle.java b/Mage.Sets/src/mage/cards/v/ValakutTheMoltenPinnacle.java index ac92dfbc06..4f3a1c3d28 100644 --- a/Mage.Sets/src/mage/cards/v/ValakutTheMoltenPinnacle.java +++ b/Mage.Sets/src/mage/cards/v/ValakutTheMoltenPinnacle.java @@ -65,7 +65,7 @@ public class ValakutTheMoltenPinnacle extends CardImpl { // Valakut, the Molten Pinnacle enters the battlefield tapped. this.addAbility(new EntersBattlefieldTappedAbility()); - // Whenever a Mountain enters the battlefield under your control, if you control at least five other Mountains, you may have Valakut, the Molten Pinnacle deal 3 damage to target creature or player. + // Whenever a Mountain enters the battlefield under your control, if you control at least five other Mountains, you may have Valakut, the Molten Pinnacle deal 3 damage to any target. this.addAbility(new ValakutTheMoltenPinnacleTriggeredAbility()); // {T}: Add {R}. this.addAbility(new RedManaAbility()); @@ -121,6 +121,6 @@ class ValakutTheMoltenPinnacleTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever a Mountain enters the battlefield under your control, if you control at least five other Mountains, you may have {this} deal 3 damage to target creature or player."; + return "Whenever a Mountain enters the battlefield under your control, if you control at least five other Mountains, you may have {this} deal 3 damage to any target."; } } diff --git a/Mage.Sets/src/mage/cards/v/VampiricFeast.java b/Mage.Sets/src/mage/cards/v/VampiricFeast.java index 6e1ff07be1..484ed2bdf7 100644 --- a/Mage.Sets/src/mage/cards/v/VampiricFeast.java +++ b/Mage.Sets/src/mage/cards/v/VampiricFeast.java @@ -45,9 +45,9 @@ public class VampiricFeast extends CardImpl { public VampiricFeast(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{5}{B}{B}"); - // Vampiric Feast deals 4 damage to target creature or player and you gain 4 life. + // Vampiric Feast deals 4 damage to any target and you gain 4 life. Effect effect = new DamageTargetEffect(4); - effect.setText("{this} deals 4 damage to target creature or player"); + effect.setText("{this} deals 4 damage to any target"); this.getSpellAbility().addEffect(effect); // and you gain 4 life. effect = new GainLifeEffect(4); diff --git a/Mage.Sets/src/mage/cards/v/VengefulRebirth.java b/Mage.Sets/src/mage/cards/v/VengefulRebirth.java index 2bb4e1f6f3..abf6e02dff 100644 --- a/Mage.Sets/src/mage/cards/v/VengefulRebirth.java +++ b/Mage.Sets/src/mage/cards/v/VengefulRebirth.java @@ -53,7 +53,7 @@ public class VengefulRebirth extends CardImpl { public VengefulRebirth(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{R}{G}"); - // Return target card from your graveyard to your hand. If you return a nonland card to your hand this way, {this} deals damage equal to that card's converted mana cost to target creature or player + // Return target card from your graveyard to your hand. If you return a nonland card to your hand this way, {this} deals damage equal to that card's converted mana cost to any target this.getSpellAbility().addTarget(new TargetCardInYourGraveyard()); this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new VengefulRebirthEffect()); @@ -76,7 +76,7 @@ class VengefulRebirthEffect extends OneShotEffect { public VengefulRebirthEffect() { super(Outcome.DrawCard); - staticText = "Return target card from your graveyard to your hand. If you return a nonland card to your hand this way, {this} deals damage equal to that card's converted mana cost to target creature or player"; + staticText = "Return target card from your graveyard to your hand. If you return a nonland card to your hand this way, {this} deals damage equal to that card's converted mana cost to any target"; } public VengefulRebirthEffect(final VengefulRebirthEffect effect) { diff --git a/Mage.Sets/src/mage/cards/v/ViashinoFangtail.java b/Mage.Sets/src/mage/cards/v/ViashinoFangtail.java index 6543be8f69..be499dd523 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoFangtail.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoFangtail.java @@ -54,7 +54,7 @@ public class ViashinoFangtail extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - // {tap}: Viashino Fangtail deals 1 damage to target creature or player. + // {tap}: Viashino Fangtail deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VigilanteJustice.java b/Mage.Sets/src/mage/cards/v/VigilanteJustice.java index d5a3e6a677..1d0dab6b2b 100644 --- a/Mage.Sets/src/mage/cards/v/VigilanteJustice.java +++ b/Mage.Sets/src/mage/cards/v/VigilanteJustice.java @@ -56,7 +56,7 @@ public class VigilanteJustice extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{R}"); - // Whenever a Human enters the battlefield under your control, Vigilante Justice deals 1 damage to target creature or player. + // Whenever a Human enters the battlefield under your control, Vigilante Justice deals 1 damage to any target. Ability ability = new CreatureEntersBattlefieldTriggeredAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), filter, false, false); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/ViridianLongbow.java b/Mage.Sets/src/mage/cards/v/ViridianLongbow.java index 363bfed6f6..25f3396e8f 100644 --- a/Mage.Sets/src/mage/cards/v/ViridianLongbow.java +++ b/Mage.Sets/src/mage/cards/v/ViridianLongbow.java @@ -55,9 +55,9 @@ public class ViridianLongbow extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); this.subtype.add(SubType.EQUIPMENT); - // Equipped creature has "{tap}: This creature deals 1 damage to target creature or player." + // Equipped creature has "{tap}: This creature deals 1 damage to any target." Effect effect = new DamageTargetEffect(1); - effect.setText("This creature deals 1 damage to target creature or player"); + effect.setText("This creature deals 1 damage to any target"); SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.EQUIPMENT))); diff --git a/Mage.Sets/src/mage/cards/v/VithianStinger.java b/Mage.Sets/src/mage/cards/v/VithianStinger.java index c928413b5c..e6567d9ece 100644 --- a/Mage.Sets/src/mage/cards/v/VithianStinger.java +++ b/Mage.Sets/src/mage/cards/v/VithianStinger.java @@ -56,7 +56,7 @@ public class VithianStinger extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(1); - // {tap}: Vithian Stinger deals 1 damage to target creature or player. + // {tap}: Vithian Stinger deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VolcanicGeyser.java b/Mage.Sets/src/mage/cards/v/VolcanicGeyser.java index 71de5c6c77..f08a3954eb 100644 --- a/Mage.Sets/src/mage/cards/v/VolcanicGeyser.java +++ b/Mage.Sets/src/mage/cards/v/VolcanicGeyser.java @@ -45,7 +45,7 @@ public class VolcanicGeyser extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{X}{R}{R}"); - // Volcanic Geyser deals X damage to target creature or player. + // Volcanic Geyser deals X damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/v/VolcanicHammer.java b/Mage.Sets/src/mage/cards/v/VolcanicHammer.java index 23daee257d..fde1dbc0ed 100644 --- a/Mage.Sets/src/mage/cards/v/VolcanicHammer.java +++ b/Mage.Sets/src/mage/cards/v/VolcanicHammer.java @@ -43,7 +43,7 @@ public class VolcanicHammer extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{R}"); - // Volcanic Hammer deals 3 damage to target creature or player. + // Volcanic Hammer deals 3 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/v/VoraciousDragon.java b/Mage.Sets/src/mage/cards/v/VoraciousDragon.java index 6f31ba1895..c02f4b6160 100644 --- a/Mage.Sets/src/mage/cards/v/VoraciousDragon.java +++ b/Mage.Sets/src/mage/cards/v/VoraciousDragon.java @@ -67,7 +67,7 @@ public class VoraciousDragon extends CardImpl { // Devour 1 (As this enters the battlefield, you may sacrifice any number of creatures. This creature enters the battlefield with that many +1/+1 counters on it.) this.addAbility(new DevourAbility(DevourFactor.Devour1)); - // When Voracious Dragon enters the battlefield, it deals damage to target creature or player equal to twice the number of Goblins it devoured. + // When Voracious Dragon enters the battlefield, it deals damage to any target equal to twice the number of Goblins it devoured. Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(new TwiceDevouredGoblins(), "it"), false); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VulshokSorcerer.java b/Mage.Sets/src/mage/cards/v/VulshokSorcerer.java index b8fd44f5ec..ba9decb871 100644 --- a/Mage.Sets/src/mage/cards/v/VulshokSorcerer.java +++ b/Mage.Sets/src/mage/cards/v/VulshokSorcerer.java @@ -56,7 +56,7 @@ public class VulshokSorcerer extends CardImpl { this.toughness = new MageInt(1); this.addAbility(HasteAbility.getInstance()); - // {tap}: Vulshok Sorcerer deals 1 damage to target creature or player. + // {tap}: Vulshok Sorcerer deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WalkingBallista.java b/Mage.Sets/src/mage/cards/w/WalkingBallista.java index af4f532066..5434eacec5 100644 --- a/Mage.Sets/src/mage/cards/w/WalkingBallista.java +++ b/Mage.Sets/src/mage/cards/w/WalkingBallista.java @@ -65,7 +65,7 @@ public class WalkingBallista extends CardImpl { // {4}: Put a +1/+1 counter on Walking Ballista. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new GenericManaCost(4))); - // Remove a +1/+1 counter from Walking Ballista: It deals 1 damage to target creature or player. + // Remove a +1/+1 counter from Walking Ballista: It deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "It"), new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WardOfPiety.java b/Mage.Sets/src/mage/cards/w/WardOfPiety.java index b2b71331d4..aca4ea4397 100644 --- a/Mage.Sets/src/mage/cards/w/WardOfPiety.java +++ b/Mage.Sets/src/mage/cards/w/WardOfPiety.java @@ -66,7 +66,7 @@ public class WardOfPiety extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // {1}{W}: The next 1 damage that would be dealt to enchanted creature this turn is dealt to target creature or player instead. + // {1}{W}: The next 1 damage that would be dealt to enchanted creature this turn is dealt to any target instead. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WardOfPietyPreventDamageTargetEffect(), new ManaCostsImpl("{1}{W}")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); @@ -88,7 +88,7 @@ class WardOfPietyPreventDamageTargetEffect extends RedirectionEffect { public WardOfPietyPreventDamageTargetEffect() { super(Duration.EndOfTurn, 1, true); - staticText = "The next 1 damage that would be dealt to enchanted creature this turn is dealt to target creature or player instead"; + staticText = "The next 1 damage that would be dealt to enchanted creature this turn is dealt to any target instead"; } public WardOfPietyPreventDamageTargetEffect(final WardOfPietyPreventDamageTargetEffect effect) { diff --git a/Mage.Sets/src/mage/cards/w/WarleadersHelix.java b/Mage.Sets/src/mage/cards/w/WarleadersHelix.java index 3fef78e503..ff63fc1ef1 100644 --- a/Mage.Sets/src/mage/cards/w/WarleadersHelix.java +++ b/Mage.Sets/src/mage/cards/w/WarleadersHelix.java @@ -47,7 +47,7 @@ public class WarleadersHelix extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{R}{W}"); - // Warleader's Helix deals 4 damage to target creature or player and you gain 4 life. + // Warleader's Helix deals 4 damage to any target and you gain 4 life. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); this.getSpellAbility().addEffect(new GainLifeEffect(4)); this.getSpellAbility().addTarget(new TargetAnyTarget()); @@ -65,7 +65,7 @@ public class WarleadersHelix extends CardImpl { @Override public List getRules() { List rules = new ArrayList<>(); - rules.add("Warleader's Helix deals 4 damage to target creature or player and you gain 4 life."); + rules.add("Warleader's Helix deals 4 damage to any target and you gain 4 life."); return rules; } } diff --git a/Mage.Sets/src/mage/cards/w/WarstormSurge.java b/Mage.Sets/src/mage/cards/w/WarstormSurge.java index 20ac40ef28..368f5db642 100644 --- a/Mage.Sets/src/mage/cards/w/WarstormSurge.java +++ b/Mage.Sets/src/mage/cards/w/WarstormSurge.java @@ -53,7 +53,7 @@ public class WarstormSurge extends CardImpl { public WarstormSurge(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{5}{R}"); - // Whenever a creature enters the battlefield under your control, it deals damage equal to its power to target creature or player. + // Whenever a creature enters the battlefield under your control, it deals damage equal to its power to any target. Ability ability = new WarstormSurgeTriggeredAbility(); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); @@ -98,7 +98,7 @@ class WarstormSurgeTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever a creature enters the battlefield under your control, it deals damage equal to its power to target creature or player."; + return "Whenever a creature enters the battlefield under your control, it deals damage equal to its power to any target."; } @Override @@ -111,7 +111,7 @@ class WarstormSurgeEffect extends OneShotEffect { public WarstormSurgeEffect() { super(Outcome.Damage); - staticText = "it deals damage equal to its power to target creature or player"; + staticText = "it deals damage equal to its power to any target"; } public WarstormSurgeEffect(final WarstormSurgeEffect effect) { diff --git a/Mage.Sets/src/mage/cards/w/WhereAncientsTread.java b/Mage.Sets/src/mage/cards/w/WhereAncientsTread.java index 5b1f65faaf..d495ee253c 100644 --- a/Mage.Sets/src/mage/cards/w/WhereAncientsTread.java +++ b/Mage.Sets/src/mage/cards/w/WhereAncientsTread.java @@ -55,7 +55,7 @@ import mage.target.common.TargetAnyTarget; super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{4}{R}"); - // Whenever a creature with power 5 or greater enters the battlefield under your control, you may have Where Ancients Tread deal 5 damage to target creature or player. + // Whenever a creature with power 5 or greater enters the battlefield under your control, you may have Where Ancients Tread deal 5 damage to any target. Ability ability = new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new DamageTargetEffect(5), filter, true); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WildSlash.java b/Mage.Sets/src/mage/cards/w/WildSlash.java index ea73c1e9c8..372526698c 100644 --- a/Mage.Sets/src/mage/cards/w/WildSlash.java +++ b/Mage.Sets/src/mage/cards/w/WildSlash.java @@ -55,7 +55,7 @@ public class WildSlash extends CardImpl { this.getSpellAbility().addEffect(new ConditionalContinuousRuleModifyingEffect(effect, new LockedInCondition(FerociousCondition.instance))); - // Wild Slash deals 2 damage to target creature or player. + // Wild Slash deals 2 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/w/Withstand.java b/Mage.Sets/src/mage/cards/w/Withstand.java index bd1010efa9..15ff94e3a4 100644 --- a/Mage.Sets/src/mage/cards/w/Withstand.java +++ b/Mage.Sets/src/mage/cards/w/Withstand.java @@ -48,7 +48,7 @@ public class Withstand extends CardImpl { this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, 3)); this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); - // Prevent the next 3 damage that would be dealt to target creature or player this turn. + // Prevent the next 3 damage that would be dealt to any target this turn. // Draw a card. } diff --git a/Mage.Sets/src/mage/cards/w/WolfhuntersQuiver.java b/Mage.Sets/src/mage/cards/w/WolfhuntersQuiver.java index 8f757d4d4e..bfe345483d 100644 --- a/Mage.Sets/src/mage/cards/w/WolfhuntersQuiver.java +++ b/Mage.Sets/src/mage/cards/w/WolfhuntersQuiver.java @@ -61,11 +61,11 @@ public class WolfhuntersQuiver extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); this.subtype.add(SubType.EQUIPMENT); - // Equipped creature has "{T}: This creature deals 1 damage to target creature or player" + // Equipped creature has "{T}: This creature deals 1 damage to any target" Ability abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); abilityToGain.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAttachedEffect(abilityToGain, AttachmentType.EQUIPMENT); - effect.setText("Equipped creature has \"{T}: This creature deals 1 damage to target creature or player\""); + effect.setText("Equipped creature has \"{T}: This creature deals 1 damage to any target\""); SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); // and "{T}: This creature deals 3 damage to target Werewolf creature." diff --git a/Mage.Sets/src/mage/cards/w/WordsOfWar.java b/Mage.Sets/src/mage/cards/w/WordsOfWar.java index 999ba99e21..58248334fa 100644 --- a/Mage.Sets/src/mage/cards/w/WordsOfWar.java +++ b/Mage.Sets/src/mage/cards/w/WordsOfWar.java @@ -54,7 +54,7 @@ public class WordsOfWar extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}"); - // {1}: The next time you would draw a card this turn, Words of War deals 2 damage to target creature or player instead. + // {1}: The next time you would draw a card this turn, Words of War deals 2 damage to any target instead. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WordsOfWarEffect(), new GenericManaCost(1)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); @@ -74,7 +74,7 @@ class WordsOfWarEffect extends ReplacementEffectImpl { WordsOfWarEffect() { super(Duration.EndOfTurn, Outcome.Damage); - staticText = "The next time you would draw a card this turn, {this} deals 2 damage to target creature or player instead."; + staticText = "The next time you would draw a card this turn, {this} deals 2 damage to any target instead."; } WordsOfWarEffect(final WordsOfWarEffect effect) { diff --git a/Mage.Sets/src/mage/cards/w/WuLongbowman.java b/Mage.Sets/src/mage/cards/w/WuLongbowman.java index cf8a41fbc5..d19ce12a1e 100644 --- a/Mage.Sets/src/mage/cards/w/WuLongbowman.java +++ b/Mage.Sets/src/mage/cards/w/WuLongbowman.java @@ -55,7 +55,7 @@ public class WuLongbowman extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // {tap}: Wu Longbowman deals 1 damage to target creature or player. Activate this ability only during your turn, before attackers are declared. + // {tap}: Wu Longbowman deals 1 damage to any target. Activate this ability only during your turn, before attackers are declared. Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost(), MyTurnBeforeAttackersDeclaredCondition.instance); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/y/YamabushisFlame.java b/Mage.Sets/src/mage/cards/y/YamabushisFlame.java index 0be5bfd08c..94a64379b6 100644 --- a/Mage.Sets/src/mage/cards/y/YamabushisFlame.java +++ b/Mage.Sets/src/mage/cards/y/YamabushisFlame.java @@ -48,7 +48,7 @@ public class YamabushisFlame extends CardImpl { public YamabushisFlame(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{R}"); - // Yamabushi's Flame deals 3 damage to target creature or player. + // Yamabushi's Flame deals 3 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/z/Zap.java b/Mage.Sets/src/mage/cards/z/Zap.java index bf59f3136e..bfb8e30abe 100644 --- a/Mage.Sets/src/mage/cards/z/Zap.java +++ b/Mage.Sets/src/mage/cards/z/Zap.java @@ -44,7 +44,7 @@ public class Zap extends CardImpl { public Zap(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{R}"); - // Zap deals 1 damage to target creature or player. + // Zap deals 1 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); this.getSpellAbility().addTarget(new TargetAnyTarget()); // Draw a card. diff --git a/Mage.Sets/src/mage/cards/z/ZhalfirinCrusader.java b/Mage.Sets/src/mage/cards/z/ZhalfirinCrusader.java index be3d0465e5..ddd9bf083d 100644 --- a/Mage.Sets/src/mage/cards/z/ZhalfirinCrusader.java +++ b/Mage.Sets/src/mage/cards/z/ZhalfirinCrusader.java @@ -57,7 +57,7 @@ public class ZhalfirinCrusader extends CardImpl { // Flanking this.addAbility(new FlankingAbility()); - // {1}{W}: The next 1 damage that would be dealt to Zhalfirin Crusader this turn is dealt to target creature or player instead. + // {1}{W}: The next 1 damage that would be dealt to Zhalfirin Crusader this turn is dealt to any target instead. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RedirectDamageFromSourceToTargetEffect(Duration.EndOfTurn, 1, true), new ManaCostsImpl("{1}{W}")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/z/ZuranSpellcaster.java b/Mage.Sets/src/mage/cards/z/ZuranSpellcaster.java index 03f8197273..4d14178ba3 100644 --- a/Mage.Sets/src/mage/cards/z/ZuranSpellcaster.java +++ b/Mage.Sets/src/mage/cards/z/ZuranSpellcaster.java @@ -51,7 +51,7 @@ public class ZuranSpellcaster extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // {T}: Zuran Spellcaster deals 1 damage to target creature or player. + // {T}: Zuran Spellcaster deals 1 damage to any target. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage/src/main/java/mage/game/permanent/token/DevilToken.java b/Mage/src/main/java/mage/game/permanent/token/DevilToken.java index 00af26c2af..85d8c8cc45 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DevilToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DevilToken.java @@ -45,7 +45,7 @@ import mage.target.common.TargetAnyTarget; public class DevilToken extends TokenImpl { public DevilToken() { - super("Devil", "1/1 red Devil creature with \"When this creature dies, it deals 1 damage to target creature or player.\""); + super("Devil", "1/1 red Devil creature with \"When this creature dies, it deals 1 damage to any target.\""); availableImageSetCodes.addAll(Collections.singletonList("SOI")); cardType.add(CardType.CREATURE); subtype.add(SubType.DEVIL); @@ -53,7 +53,7 @@ public class DevilToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); Effect effect = new DamageTargetEffect(1); - effect.setText("it deals 1 damage to target creature or player"); + effect.setText("it deals 1 damage to any target"); Ability ability = new DiesTriggeredAbility(effect); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability);