From 70126988c5c351bb422dee2e4104e06a39569c18 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 29 Oct 2016 23:42:19 +0200 Subject: [PATCH] Changed rule text from "put token onto the battlefield" to "create token". --- .../src/mage/cards/a/AbhorrentOverlord.java | 4 +- .../mage/cards/a/AbstruseInterference.java | 6 +- .../src/mage/cards/a/AbzanAscendancy.java | 2 +- Mage.Sets/src/mage/cards/a/AcornCatapult.java | 13 ++-- Mage.Sets/src/mage/cards/a/AcornHarvest.java | 2 +- .../src/mage/cards/a/AdventOfTheWurm.java | 2 +- .../src/mage/cards/a/AdverseConditions.java | 6 +- .../src/mage/cards/a/AerieWorshippers.java | 2 +- .../src/mage/cards/a/AetherMutation.java | 2 +- Mage.Sets/src/mage/cards/a/Afterlife.java | 4 +- .../mage/cards/a/AjaniCallerOfThePride.java | 2 +- Mage.Sets/src/mage/cards/a/AjaniGoldmane.java | 4 +- Mage.Sets/src/mage/cards/a/AjanisChosen.java | 8 +-- .../src/mage/cards/a/AkoumStonewaker.java | 6 +- .../src/mage/cards/a/AkroanCrusader.java | 2 +- Mage.Sets/src/mage/cards/a/AkroanHorse.java | 8 +-- Mage.Sets/src/mage/cards/a/AliveWell.java | 9 ++- .../src/mage/cards/a/AllianceOfArms.java | 4 +- .../mage/cards/a/AlliedReinforcements.java | 2 +- Mage.Sets/src/mage/cards/a/AngelicAccord.java | 2 +- .../src/mage/cards/a/Arachnogenesis.java | 4 +- .../src/mage/cards/a/ArchdemonOfUnx.java | 4 +- Mage.Sets/src/mage/cards/a/ArlinnKord.java | 2 +- Mage.Sets/src/mage/cards/a/ArmadaWurm.java | 11 ++-- .../src/mage/cards/a/ArmyOfTheDamned.java | 4 +- .../src/mage/cards/a/ArtifactMutation.java | 2 +- .../src/mage/cards/a/AspiringAeronaut.java | 2 +- .../src/mage/cards/a/AssaultBattery.java | 2 +- .../src/mage/cards/a/AssembleTheLegion.java | 2 +- .../src/mage/cards/a/AttendedKnight.java | 6 +- Mage.Sets/src/mage/cards/a/AuraMutation.java | 2 +- Mage.Sets/src/mage/cards/a/AvacynsCollar.java | 4 +- .../src/mage/cards/a/AvengerOfZendikar.java | 2 +- .../src/mage/cards/a/AwakenTheSkyTyrant.java | 2 +- .../src/mage/cards/b/BackFromTheBrink.java | 6 +- Mage.Sets/src/mage/cards/b/BakuAltar.java | 2 +- Mage.Sets/src/mage/cards/b/BalduvianDead.java | 4 +- .../src/mage/cards/b/BalothCageTrap.java | 2 +- .../src/mage/cards/b/BantSojourners.java | 2 +- .../src/mage/cards/b/BaruFistOfKrosa.java | 29 ++++----- Mage.Sets/src/mage/cards/b/Batterskull.java | 2 +- Mage.Sets/src/mage/cards/b/BattleScreech.java | 2 +- .../src/mage/cards/b/BeaconOfCreation.java | 2 +- .../src/mage/cards/b/BearsCompanion.java | 2 +- Mage.Sets/src/mage/cards/b/Bearscape.java | 2 +- Mage.Sets/src/mage/cards/b/BeastAttack.java | 2 +- Mage.Sets/src/mage/cards/b/BeastWithin.java | 6 +- Mage.Sets/src/mage/cards/b/BeckCall.java | 2 +- .../src/mage/cards/b/BeetlebackChief.java | 2 +- Mage.Sets/src/mage/cards/b/BelfrySpirit.java | 2 +- .../src/mage/cards/b/BenalishCommander.java | 6 +- .../src/mage/cards/b/BenevolentOffering.java | 4 +- Mage.Sets/src/mage/cards/b/Benthicore.java | 2 +- Mage.Sets/src/mage/cards/b/BirthingHulk.java | 4 +- Mage.Sets/src/mage/cards/b/Bitterblossom.java | 2 +- Mage.Sets/src/mage/cards/b/BladeSplicer.java | 2 +- Mage.Sets/src/mage/cards/b/BlazeCommando.java | 2 +- Mage.Sets/src/mage/cards/b/BlightHerder.java | 4 +- Mage.Sets/src/mage/cards/b/Blisterpod.java | 6 +- .../src/mage/cards/b/BloodlineKeeper.java | 2 +- Mage.Sets/src/mage/cards/b/BoggartMob.java | 2 +- .../src/mage/cards/b/BorisDevilboon.java | 4 +- .../src/mage/cards/b/BottleOfSuleiman.java | 4 +- .../src/mage/cards/b/BrambleElemental.java | 2 +- Mage.Sets/src/mage/cards/b/BreedingPit.java | 2 +- .../src/mage/cards/b/BriarbridgePatrol.java | 2 +- .../src/mage/cards/b/BridgeFromBelow.java | 2 +- .../src/mage/cards/b/BrimazKingOfOreskos.java | 8 +-- Mage.Sets/src/mage/cards/b/BrindleShoat.java | 2 +- .../mage/cards/b/BringerOfTheGreenDawn.java | 2 +- Mage.Sets/src/mage/cards/b/BroodBirthing.java | 2 +- Mage.Sets/src/mage/cards/b/BroodButcher.java | 2 +- Mage.Sets/src/mage/cards/b/BroodKeeper.java | 4 +- Mage.Sets/src/mage/cards/b/BroodMonitor.java | 4 +- Mage.Sets/src/mage/cards/b/BroodSliver.java | 8 +-- .../src/mage/cards/b/BroodhatchNantuko.java | 4 +- .../src/mage/cards/b/BudokaGardener.java | 10 +-- .../src/mage/cards/c/CacklingCounterpart.java | 2 +- .../src/mage/cards/c/CallOfTheConclave.java | 2 +- Mage.Sets/src/mage/cards/c/CallOfTheHerd.java | 2 +- .../src/mage/cards/c/CallOfTheNightwing.java | 2 +- .../src/mage/cards/c/CallTheBloodline.java | 2 +- Mage.Sets/src/mage/cards/c/CallTheScions.java | 4 +- .../src/mage/cards/c/CallTheSkybreaker.java | 2 +- .../src/mage/cards/c/CallerOfTheClaw.java | 2 +- .../src/mage/cards/c/CallerOfThePack.java | 2 +- Mage.Sets/src/mage/cards/c/CaptainsCall.java | 2 +- Mage.Sets/src/mage/cards/c/CaptainsClaws.java | 2 +- Mage.Sets/src/mage/cards/c/CaribouRange.java | 8 +-- Mage.Sets/src/mage/cards/c/CarrierThrall.java | 6 +- Mage.Sets/src/mage/cards/c/CarrionCall.java | 2 +- .../src/mage/cards/c/CatacombSifter.java | 2 +- Mage.Sets/src/mage/cards/c/CellarDoor.java | 6 +- .../src/mage/cards/c/CemeteryReaper.java | 2 +- .../src/mage/cards/c/CennsEnlistment.java | 2 +- Mage.Sets/src/mage/cards/c/CentaurGlade.java | 2 +- .../src/mage/cards/c/CentaursHerald.java | 2 +- .../mage/cards/c/ChancellorOfTheForge.java | 6 +- .../src/mage/cards/c/ChandraFlamecaller.java | 4 +- Mage.Sets/src/mage/cards/c/ChasmSkulker.java | 4 +- .../mage/cards/c/ChatterOfTheSquirrel.java | 2 +- Mage.Sets/src/mage/cards/c/Chronozoa.java | 8 +-- Mage.Sets/src/mage/cards/c/CloneLegion.java | 4 +- .../src/mage/cards/c/CloudgoatRanger.java | 2 +- Mage.Sets/src/mage/cards/c/Cloudseeder.java | 4 +- Mage.Sets/src/mage/cards/c/CobraTrap.java | 2 +- .../src/mage/cards/c/CommandersAuthority.java | 2 +- .../src/mage/cards/c/ConfrontTheUnknown.java | 2 +- .../src/mage/cards/c/ConquerorsPledge.java | 10 ++- .../src/mage/cards/c/ConversionChamber.java | 2 +- Mage.Sets/src/mage/cards/c/CoralBarrier.java | 2 +- Mage.Sets/src/mage/cards/c/Corpseweft.java | 8 +-- .../src/mage/cards/c/CoursersAccord.java | 4 +- .../src/mage/cards/c/CrawlingSensation.java | 12 ++-- .../src/mage/cards/c/CreakwoodLiege.java | 2 +- Mage.Sets/src/mage/cards/c/CribSwap.java | 4 +- .../src/mage/cards/c/CrushOfTentacles.java | 6 +- Mage.Sets/src/mage/cards/c/Cryptbreaker.java | 2 +- .../src/mage/cards/c/CultOfTheWaxingMoon.java | 2 +- .../mage/cards/c/CurseOfShallowGraves.java | 10 +-- .../src/mage/cards/c/CurseOfTheSwine.java | 12 ++-- .../src/mage/cards/c/CustodiSoulbinders.java | 2 +- Mage.Sets/src/mage/cards/d/DanceOfMany.java | 4 +- .../src/mage/cards/d/DanceWithDevils.java | 4 +- .../cards/d/DarettiIngeniousIconoclast.java | 8 +-- .../src/mage/cards/d/DarienKingOfKjeldor.java | 4 +- Mage.Sets/src/mage/cards/d/DarkDepths.java | 16 +++-- Mage.Sets/src/mage/cards/d/DarkSalvation.java | 4 +- .../src/mage/cards/d/DauntlessCathar.java | 2 +- .../src/mage/cards/d/DaxosTheReturned.java | 2 +- .../src/mage/cards/d/DayOfTheDragons.java | 4 +- Mage.Sets/src/mage/cards/d/DeadlyGrub.java | 4 +- .../src/mage/cards/d/DeathByDragons.java | 4 +- Mage.Sets/src/mage/cards/d/DeathMutation.java | 2 +- .../src/mage/cards/d/DeathpactAngel.java | 20 +++--- .../src/mage/cards/d/DeathsporeThallid.java | 2 +- .../src/mage/cards/d/DecreeOfJustice.java | 6 +- Mage.Sets/src/mage/cards/d/DemonicRising.java | 4 +- .../src/mage/cards/d/DeployToTheFront.java | 4 +- .../src/mage/cards/d/DerangedHermit.java | 2 +- .../mage/cards/d/DescendUponTheSinful.java | 4 +- .../src/mage/cards/d/DescentOfTheDragons.java | 4 +- .../src/mage/cards/d/DesolationTwin.java | 2 +- .../src/mage/cards/d/DesperateSentry.java | 2 +- .../src/mage/cards/d/DevastatingSummons.java | 4 +- .../src/mage/cards/d/DevilsPlayground.java | 4 +- .../src/mage/cards/d/DevoutInvocation.java | 4 +- .../src/mage/cards/d/DiamondKaleidoscope.java | 2 +- .../src/mage/cards/d/DinOfTheFireherd.java | 6 +- .../src/mage/cards/d/DiregrafColossus.java | 2 +- .../src/mage/cards/d/DocentOfPerfection.java | 2 +- .../src/mage/cards/d/DoomedTraveler.java | 2 +- .../src/mage/cards/d/DoublingSeason.java | 4 +- Mage.Sets/src/mage/cards/d/Dovescape.java | 4 +- .../src/mage/cards/d/DragonBroodmother.java | 9 ++- Mage.Sets/src/mage/cards/d/DragonEgg.java | 2 +- Mage.Sets/src/mage/cards/d/DragonFodder.java | 2 +- .../src/mage/cards/d/DragonWhisperer.java | 2 +- .../src/mage/cards/d/DragonlairSpider.java | 2 +- .../src/mage/cards/d/DragonmasterOutcast.java | 4 +- Mage.Sets/src/mage/cards/d/DranasChosen.java | 2 +- Mage.Sets/src/mage/cards/d/DreadSummons.java | 6 +- Mage.Sets/src/mage/cards/d/DreampodDruid.java | 11 ++-- .../src/mage/cards/d/DrogskolCavalry.java | 2 +- Mage.Sets/src/mage/cards/d/DrownerOfHope.java | 4 +- Mage.Sets/src/mage/cards/d/DrudgeSpell.java | 15 +++-- .../src/mage/cards/d/DruidicSatchel.java | 10 +-- Mage.Sets/src/mage/cards/d/DruidsCall.java | 4 +- .../src/mage/cards/d/DruidsDeliverance.java | 2 +- .../src/mage/cards/d/DrunauCorpseTrawler.java | 2 +- .../src/mage/cards/d/DuneBroodNephilim.java | 2 +- Mage.Sets/src/mage/cards/d/DwynensElite.java | 6 +- .../src/mage/cards/e/EldraziSkyspawner.java | 6 +- .../src/mage/cards/e/ElementalAppeal.java | 4 +- .../src/mage/cards/e/ElementalMastery.java | 4 +- .../src/mage/cards/e/ElephantAmbush.java | 2 +- Mage.Sets/src/mage/cards/e/ElephantGuide.java | 2 +- .../src/mage/cards/e/ElgaudInquisitor.java | 2 +- .../src/mage/cards/e/ElspethKnightErrant.java | 2 +- .../src/mage/cards/e/ElspethSunsChampion.java | 2 +- Mage.Sets/src/mage/cards/e/ElvishFarmer.java | 2 +- .../mage/cards/e/EmissaryOfTheSleepless.java | 4 +- Mage.Sets/src/mage/cards/e/EmptyThePits.java | 2 +- .../src/mage/cards/e/EmptyTheWarrens.java | 2 +- .../src/mage/cards/e/EmrakulsEvangel.java | 4 +- .../mage/cards/e/EndlessRanksOfTheDead.java | 2 +- Mage.Sets/src/mage/cards/e/EndlessSwarm.java | 2 +- .../mage/cards/e/EndrekSahrMasterBreeder.java | 4 +- .../src/mage/cards/e/EnlightenedManiac.java | 2 +- .../src/mage/cards/e/EntreatTheAngels.java | 2 +- .../src/mage/cards/e/EvangelOfHeliod.java | 2 +- Mage.Sets/src/mage/cards/e/ExposeEvil.java | 2 +- .../src/mage/cards/e/ExtricatorOfFlesh.java | 2 +- .../src/mage/cards/e/ExtricatorOfSin.java | 2 +- .../src/mage/cards/e/EyelessWatcher.java | 4 +- .../src/mage/cards/e/EyesInTheSkies.java | 4 +- .../src/mage/cards/e/EyesOfTheWisent.java | 4 +- .../src/mage/cards/e/EzurisPredation.java | 4 +- .../src/mage/cards/f/FatedInfatuation.java | 2 +- .../src/mage/cards/f/FatedIntervention.java | 2 +- Mage.Sets/src/mage/cards/f/FeastOrFamine.java | 2 +- Mage.Sets/src/mage/cards/f/FeedThePack.java | 4 +- .../mage/cards/f/FeldonOfTheThirdPath.java | 4 +- .../src/mage/cards/f/FelhideSpiritbinder.java | 4 +- .../src/mage/cards/f/FeralIncarnation.java | 2 +- .../src/mage/cards/f/FeralLightning.java | 4 +- .../src/mage/cards/f/FeudkillersVerdict.java | 4 +- Mage.Sets/src/mage/cards/f/FieldOfSouls.java | 2 +- .../src/mage/cards/f/FinalIteration.java | 2 +- Mage.Sets/src/mage/cards/f/FirstResponse.java | 6 +- .../src/mage/cards/f/FistsOfIronwood.java | 2 +- .../src/mage/cards/f/FlamerushRider.java | 4 +- .../mage/cards/f/FlameshadowConjuring.java | 6 +- Mage.Sets/src/mage/cards/f/Flamewright.java | 14 ++--- Mage.Sets/src/mage/cards/f/FleshCarver.java | 4 +- .../src/mage/cards/f/FlourishingDefenses.java | 4 +- Mage.Sets/src/mage/cards/f/FlurryOfHorns.java | 2 +- .../src/mage/cards/f/FollowedFootsteps.java | 4 +- .../src/mage/cards/f/ForbiddenOrchard.java | 2 +- .../src/mage/cards/f/ForlornPseudamma.java | 2 +- Mage.Sets/src/mage/cards/f/FoulEmissary.java | 4 +- .../src/mage/cards/f/FoundryOfTheConsuls.java | 2 +- Mage.Sets/src/mage/cards/f/FreshMeat.java | 2 +- .../mage/cards/f/FreyaliseLlanowarsFury.java | 6 +- Mage.Sets/src/mage/cards/f/FromBeyond.java | 2 +- .../mage/cards/f/FromUnderTheFloorboards.java | 6 +- .../src/mage/cards/f/FungalSprouting.java | 4 +- .../src/mage/cards/g/GallowsAtWillowHill.java | 4 +- .../src/mage/cards/g/GarrukApexPredator.java | 2 +- .../src/mage/cards/g/GarrukPrimalHunter.java | 4 +- .../src/mage/cards/g/GarrukRelentless.java | 2 +- .../src/mage/cards/g/GarrukTheVeilCursed.java | 10 ++- .../src/mage/cards/g/GarrukWildspeaker.java | 2 +- .../src/mage/cards/g/GatherTheTownsfolk.java | 6 +- .../src/mage/cards/g/GeistHonoredMonk.java | 2 +- .../src/mage/cards/g/GeistOfSaintTraft.java | 9 ++- Mage.Sets/src/mage/cards/g/GeistSnatch.java | 4 +- .../src/mage/cards/g/GelatinousGenesis.java | 4 +- .../src/mage/cards/g/GenesisChamber.java | 6 +- .../src/mage/cards/g/GhaveGuruOfSpores.java | 2 +- .../src/mage/cards/g/GhirapurGearcrafter.java | 2 +- .../src/mage/cards/g/GhoulcallerGisa.java | 4 +- .../mage/cards/g/GhoulcallersAccomplice.java | 2 +- Mage.Sets/src/mage/cards/g/GiantAdephage.java | 2 +- .../src/mage/cards/g/GiantCaterpillar.java | 8 +-- Mage.Sets/src/mage/cards/g/Giantbaiting.java | 4 +- .../mage/cards/g/GideonAllyOfZendikar.java | 2 +- .../src/mage/cards/g/GideonsPhalanx.java | 2 +- Mage.Sets/src/mage/cards/g/Gild.java | 4 +- .../src/mage/cards/g/GiltLeafAmbush.java | 4 +- Mage.Sets/src/mage/cards/g/GisasBidding.java | 2 +- .../src/mage/cards/g/GloomwidowsFeast.java | 4 +- Mage.Sets/src/mage/cards/g/GoblinAssault.java | 2 +- .../src/mage/cards/g/GoblinKaboomist.java | 15 +++-- Mage.Sets/src/mage/cards/g/GoblinMarshal.java | 2 +- .../src/mage/cards/g/GoblinOffensive.java | 2 +- .../src/mage/cards/g/GoblinRabblemaster.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinRally.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinScouts.java | 2 +- .../src/mage/cards/g/GoblinTrenches.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinWarrens.java | 2 +- Mage.Sets/src/mage/cards/g/Goblinslide.java | 2 +- .../src/mage/cards/g/GodFavoredGeneral.java | 2 +- .../mage/cards/g/GodsEyeGateToTheReikai.java | 2 +- .../src/mage/cards/g/GoldmeadowLookout.java | 4 +- .../src/mage/cards/g/GolgariGermination.java | 2 +- Mage.Sets/src/mage/cards/g/GrafHarvest.java | 2 +- Mage.Sets/src/mage/cards/g/GraveBirthing.java | 4 +- Mage.Sets/src/mage/cards/g/GraveTitan.java | 2 +- Mage.Sets/src/mage/cards/g/GriffinGuide.java | 2 +- Mage.Sets/src/mage/cards/g/GrizzlyFate.java | 6 +- .../src/mage/cards/g/GroveOfTheGuardian.java | 4 +- .../src/mage/cards/g/GrovetenderDruids.java | 4 +- Mage.Sets/src/mage/cards/g/GrowingRanks.java | 2 +- Mage.Sets/src/mage/cards/g/GutterGrime.java | 4 +- .../src/mage/cards/g/GwyllionHedgeMage.java | 4 +- .../mage/cards/h/HallowedSpiritkeeper.java | 4 +- .../src/mage/cards/h/HammerOfPurphoros.java | 2 +- .../src/mage/cards/h/HangarbackWalker.java | 2 +- .../src/mage/cards/h/HanweirGarrison.java | 2 +- .../cards/h/HanweirTheWrithingTownship.java | 2 +- Mage.Sets/src/mage/cards/h/HauntedAngel.java | 4 +- Mage.Sets/src/mage/cards/h/HauntedDead.java | 2 +- .../src/mage/cards/h/HavengulRunebinder.java | 2 +- Mage.Sets/src/mage/cards/h/HazezonTamar.java | 6 +- .../src/mage/cards/h/HearthcageGiant.java | 2 +- Mage.Sets/src/mage/cards/h/HeatShimmer.java | 4 +- .../src/mage/cards/h/HeliodGodOfTheSun.java | 2 +- .../src/mage/cards/h/HellionCrucible.java | 2 +- .../src/mage/cards/h/HellionEruption.java | 4 +- Mage.Sets/src/mage/cards/h/HelmOfKaldra.java | 8 +-- .../src/mage/cards/h/HeraldOfAnafenza.java | 2 +- .../src/mage/cards/h/HeroOfBladehold.java | 2 +- Mage.Sets/src/mage/cards/h/HiveStirrings.java | 2 +- .../src/mage/cards/h/HomaridSpawningBed.java | 2 +- Mage.Sets/src/mage/cards/h/HoodedHydra.java | 2 +- .../src/mage/cards/h/HoofprintsOfTheStag.java | 2 +- .../src/mage/cards/h/HordelingOutburst.java | 4 +- .../src/mage/cards/h/HorncallersChant.java | 4 +- Mage.Sets/src/mage/cards/h/HornetCannon.java | 6 +- Mage.Sets/src/mage/cards/h/HornetNest.java | 4 +- Mage.Sets/src/mage/cards/h/HornetQueen.java | 2 +- Mage.Sets/src/mage/cards/h/Hostility.java | 4 +- Mage.Sets/src/mage/cards/h/HourOfNeed.java | 4 +- Mage.Sets/src/mage/cards/h/HowlingChorus.java | 2 +- Mage.Sets/src/mage/cards/h/HowlpackAlpha.java | 4 +- Mage.Sets/src/mage/cards/h/HuntedDragon.java | 2 +- Mage.Sets/src/mage/cards/h/HuntedHorror.java | 2 +- Mage.Sets/src/mage/cards/h/HuntedLammasu.java | 2 +- .../src/mage/cards/h/HuntedPhantasm.java | 2 +- Mage.Sets/src/mage/cards/h/HuntedTroll.java | 2 +- Mage.Sets/src/mage/cards/h/HuntingPack.java | 2 +- .../mage/cards/h/HuntmasterOfTheFells.java | 4 +- .../src/mage/cards/h/HydraBroodmaster.java | 4 +- .../cards/i/IbHalfheartGoblinTactician.java | 2 +- Mage.Sets/src/mage/cards/i/IcatianCrier.java | 2 +- Mage.Sets/src/mage/cards/i/IcatianTown.java | 2 +- .../src/mage/cards/i/IncreasingDevotion.java | 6 +- .../src/mage/cards/i/IncubatorDrone.java | 4 +- .../src/mage/cards/i/InexorableBlob.java | 4 +- .../src/mage/cards/i/InfernalGenesis.java | 4 +- .../mage/cards/i/InvocationOfSaintTraft.java | 4 +- .../src/mage/cards/i/IshkanahGrafwidow.java | 4 +- .../src/mage/cards/i/ItOfTheHorridSwarm.java | 2 +- .../src/mage/cards/j/JeditOjanenOfEfrava.java | 2 +- Mage.Sets/src/mage/cards/j/JoinTheRanks.java | 2 +- Mage.Sets/src/mage/cards/j/JunglePatrol.java | 16 ++--- .../mage/cards/k/KalitasBloodchiefOfGhet.java | 4 +- .../mage/cards/k/KalitasTraitorOfGhet.java | 4 +- .../src/mage/cards/k/KalonianTwingrove.java | 6 +- .../mage/cards/k/KaminoCloningFacility.java | 2 +- Mage.Sets/src/mage/cards/k/KathariBomber.java | 2 +- .../mage/cards/k/KazuulTyrantOfTheCliffs.java | 4 +- .../src/mage/cards/k/KessigCagebreakers.java | 4 +- Mage.Sets/src/mage/cards/k/KherKeep.java | 4 +- .../mage/cards/k/KikiJikiMirrorBreaker.java | 6 +- .../src/mage/cards/k/KinTreeInvocation.java | 6 +- .../mage/cards/k/KingMacarTheGoldCursed.java | 16 +++-- .../mage/cards/k/KinsbaileBorderguard.java | 2 +- .../mage/cards/k/KioraMasterOfTheDepths.java | 4 +- .../mage/cards/k/KioraTheCrashingWave.java | 6 +- Mage.Sets/src/mage/cards/k/KirtarsWrath.java | 6 +- .../src/mage/cards/k/KjeldoranOutpost.java | 2 +- Mage.Sets/src/mage/cards/k/KnightWatch.java | 2 +- Mage.Sets/src/mage/cards/k/KnightlyValor.java | 2 +- .../src/mage/cards/k/KorozdaGuildmage.java | 2 +- Mage.Sets/src/mage/cards/k/KrenkoMobBoss.java | 2 +- .../src/mage/cards/k/KrenkosCommand.java | 2 +- Mage.Sets/src/mage/cards/l/LAATGunship.java | 2 +- Mage.Sets/src/mage/cards/l/LabRats.java | 2 +- Mage.Sets/src/mage/cards/l/LastStand.java | 6 +- .../src/mage/cards/l/LaunchTheFleet.java | 11 ++-- .../src/mage/cards/l/LeafdrakeRoost.java | 4 +- .../mage/cards/l/LilianaHereticalHealer.java | 2 +- .../src/mage/cards/l/LilianaTheLastHope.java | 2 +- .../src/mage/cards/l/LilianasReaver.java | 2 +- .../src/mage/cards/l/LingeringSouls.java | 2 +- .../src/mage/cards/l/LinvalaThePreserver.java | 4 +- Mage.Sets/src/mage/cards/l/LivingHive.java | 4 +- .../src/mage/cards/l/LlanowarMentor.java | 4 +- Mage.Sets/src/mage/cards/l/LordOfLineage.java | 2 +- .../src/mage/cards/l/LullmageMentor.java | 2 +- .../src/mage/cards/l/LuminarchAscension.java | 2 +- Mage.Sets/src/mage/cards/m/MaalfeldTwins.java | 2 +- Mage.Sets/src/mage/cards/m/MakeMischief.java | 2 +- .../src/mage/cards/m/MarathWillOfTheWild.java | 4 +- Mage.Sets/src/mage/cards/m/MarchOfSouls.java | 4 +- .../src/mage/cards/m/MarduAscendancy.java | 2 +- Mage.Sets/src/mage/cards/m/MarduCharm.java | 4 +- .../src/mage/cards/m/MarduHordechief.java | 4 +- .../src/mage/cards/m/MarduStrikeLeader.java | 2 +- Mage.Sets/src/mage/cards/m/MarrowGnawer.java | 2 +- Mage.Sets/src/mage/cards/m/MarshFlitter.java | 2 +- Mage.Sets/src/mage/cards/m/MartialCoup.java | 4 +- .../src/mage/cards/m/MasterOfTheWildHunt.java | 2 +- Mage.Sets/src/mage/cards/m/MasterOfWaves.java | 4 +- Mage.Sets/src/mage/cards/m/MaulSplicer.java | 2 +- .../src/mage/cards/m/MausoleumGuard.java | 2 +- .../mage/cards/m/MelokuTheCloudedMirror.java | 2 +- Mage.Sets/src/mage/cards/m/MercyKilling.java | 4 +- Mage.Sets/src/mage/cards/m/Metrognome.java | 4 +- .../src/mage/cards/m/MidnightHaunting.java | 2 +- .../src/mage/cards/m/MidnightRitual.java | 4 +- .../src/mage/cards/m/MidsummerRevel.java | 2 +- Mage.Sets/src/mage/cards/m/MilitiasPride.java | 4 +- Mage.Sets/src/mage/cards/m/MimicVat.java | 6 +- Mage.Sets/src/mage/cards/m/MimingSlime.java | 4 +- .../src/mage/cards/m/MinionReflector.java | 6 +- Mage.Sets/src/mage/cards/m/MirrorMatch.java | 4 +- Mage.Sets/src/mage/cards/m/MirrorMockery.java | 4 +- .../src/mage/cards/m/MirrorSigilSergeant.java | 8 +-- Mage.Sets/src/mage/cards/m/Mirrorpool.java | 2 +- Mage.Sets/src/mage/cards/m/Mirrorworks.java | 8 +-- Mage.Sets/src/mage/cards/m/MitoticSlime.java | 2 +- .../src/mage/cards/m/MoanOfTheUnhallowed.java | 2 +- Mage.Sets/src/mage/cards/m/MoggAlarm.java | 2 +- .../src/mage/cards/m/MoggInfestation.java | 4 +- .../src/mage/cards/m/MoggWarMarshal.java | 2 +- Mage.Sets/src/mage/cards/m/MoltenBirth.java | 4 +- .../src/mage/cards/m/MonasteryMentor.java | 14 +++-- Mage.Sets/src/mage/cards/m/MongrelPack.java | 2 +- Mage.Sets/src/mage/cards/m/MonkeyCage.java | 4 +- .../src/mage/cards/m/MoonsilverSpear.java | 2 +- Mage.Sets/src/mage/cards/m/MoorlandHaunt.java | 2 +- Mage.Sets/src/mage/cards/m/MorbidBloom.java | 4 +- Mage.Sets/src/mage/cards/m/Mortarpod.java | 2 +- .../src/mage/cards/m/MurderInvestigation.java | 2 +- Mage.Sets/src/mage/cards/m/Mycologist.java | 2 +- Mage.Sets/src/mage/cards/m/Mycoloth.java | 2 +- .../src/mage/cards/m/MyrBattlesphere.java | 2 +- Mage.Sets/src/mage/cards/m/MyrPropagator.java | 4 +- Mage.Sets/src/mage/cards/m/Myrsmith.java | 2 +- Mage.Sets/src/mage/cards/m/MysticGenesis.java | 4 +- .../src/mage/cards/n/NacatlWarPride.java | 6 +- .../mage/cards/n/NahiriTheLithomancer.java | 10 +-- .../src/mage/cards/n/NathOfTheGiltLeaf.java | 4 +- .../src/mage/cards/n/NearheathChaplain.java | 2 +- Mage.Sets/src/mage/cards/n/Necrogenesis.java | 2 +- .../mage/cards/n/NecromancersCovenant.java | 4 +- .../mage/cards/n/NecromancersStockpile.java | 4 +- .../src/mage/cards/n/NecromasterDragon.java | 2 +- .../src/mage/cards/n/NemataGroveGuardian.java | 2 +- Mage.Sets/src/mage/cards/n/NemesisTrap.java | 4 +- Mage.Sets/src/mage/cards/n/NestedGhoul.java | 2 +- Mage.Sets/src/mage/cards/n/NightSoil.java | 2 +- .../src/mage/cards/n/NissaSageAnimist.java | 4 +- .../mage/cards/n/NissaVoiceOfZendikar.java | 2 +- Mage.Sets/src/mage/cards/n/NoosegrafMob.java | 4 +- Mage.Sets/src/mage/cards/n/NotForgotten.java | 4 +- .../src/mage/cards/n/NotoriousThrong.java | 4 +- Mage.Sets/src/mage/cards/n/NullCaller.java | 2 +- Mage.Sets/src/mage/cards/n/NutCollector.java | 2 +- Mage.Sets/src/mage/cards/o/OathOfGideon.java | 2 +- Mage.Sets/src/mage/cards/o/OathOfLiliana.java | 4 +- .../mage/cards/o/ObNixilisOfTheBlackOath.java | 2 +- Mage.Sets/src/mage/cards/o/OgreSlumlord.java | 2 +- .../src/mage/cards/o/OjutaisSummons.java | 2 +- .../src/mage/cards/o/OmnathLocusOfRage.java | 2 +- Mage.Sets/src/mage/cards/o/OneDozenEyes.java | 4 +- .../src/mage/cards/o/OonaQueenOfTheFae.java | 4 +- Mage.Sets/src/mage/cards/o/OozeFlux.java | 4 +- Mage.Sets/src/mage/cards/o/OozeGarden.java | 6 +- Mage.Sets/src/mage/cards/o/Ophiomancer.java | 4 +- .../src/mage/cards/o/OrderedMigration.java | 7 ++- Mage.Sets/src/mage/cards/o/Ornitharch.java | 4 +- .../src/mage/cards/o/OrochiEggwatcher.java | 2 +- .../src/mage/cards/o/OrochiHatchery.java | 2 +- .../mage/cards/o/OtherworldlyOutburst.java | 6 +- Mage.Sets/src/mage/cards/o/Overburden.java | 10 ++- .../src/mage/cards/o/OverseerOfTheDamned.java | 2 +- .../mage/cards/o/OyobiWhoSplitTheHeavens.java | 2 +- Mage.Sets/src/mage/cards/p/PackGuardian.java | 2 +- Mage.Sets/src/mage/cards/p/PackRat.java | 2 +- .../src/mage/cards/p/PactOfTheTitan.java | 2 +- .../src/mage/cards/p/PallidMycoderm.java | 2 +- .../src/mage/cards/p/ParallelEvolution.java | 4 +- Mage.Sets/src/mage/cards/p/ParallelLives.java | 4 +- Mage.Sets/src/mage/cards/p/PatagiaViper.java | 2 +- .../src/mage/cards/p/PatrolSignaler.java | 2 +- Mage.Sets/src/mage/cards/p/PawnOfUlamog.java | 2 +- Mage.Sets/src/mage/cards/p/PegasusRefuge.java | 2 +- .../src/mage/cards/p/PegasusStampede.java | 2 +- Mage.Sets/src/mage/cards/p/Pentavus.java | 2 +- .../src/mage/cards/p/PenumbraSpider.java | 2 +- Mage.Sets/src/mage/cards/p/PenumbraWurm.java | 2 +- .../mage/cards/p/PharikaGodOfAffliction.java | 4 +- Mage.Sets/src/mage/cards/p/Phelddagrif.java | 2 +- .../src/mage/cards/p/PheresBandRaiders.java | 2 +- .../src/mage/cards/p/PhyrexianProcessor.java | 4 +- .../src/mage/cards/p/PhyrexianRebirth.java | 4 +- .../src/mage/cards/p/PiaAndKiranNalaar.java | 4 +- .../src/mage/cards/p/PlagueOfVermin.java | 4 +- .../src/mage/cards/p/PollenbrightWings.java | 6 +- Mage.Sets/src/mage/cards/p/Pongify.java | 4 +- .../src/mage/cards/p/PonybackBrigade.java | 2 +- .../src/mage/cards/p/PrecinctCaptain.java | 6 +- .../src/mage/cards/p/PrecursorGolem.java | 2 +- Mage.Sets/src/mage/cards/p/PredatorsHowl.java | 6 +- .../src/mage/cards/p/PredatoryAdvantage.java | 4 +- .../src/mage/cards/p/PresenceOfGond.java | 4 +- .../src/mage/cards/p/PressForAnswers.java | 4 +- .../src/mage/cards/p/PrideOfTheClouds.java | 2 +- .../mage/cards/p/PriestOfTheBloodRite.java | 2 +- Mage.Sets/src/mage/cards/p/PrimalVigor.java | 4 +- .../src/mage/cards/p/PrimevalBounty.java | 2 +- .../src/mage/cards/p/ProgenitorMimic.java | 8 +-- .../src/mage/cards/p/PromiseOfBunrei.java | 4 +- .../src/mage/cards/p/PromiseOfPower.java | 4 +- .../mage/cards/p/ProsshSkyraiderOfKher.java | 7 ++- .../src/mage/cards/p/PrototypePortal.java | 4 +- .../src/mage/cards/p/ProwessOfTheFair.java | 2 +- .../src/mage/cards/p/PsychotropeThallid.java | 2 +- .../src/mage/cards/p/PulseOfTheTangle.java | 2 +- .../src/mage/cards/p/PuppetConjurer.java | 2 +- .../mage/cards/q/QuestForTheGravelord.java | 2 +- .../src/mage/cards/q/QuestingPhelddagrif.java | 2 +- .../src/mage/cards/r/RaisedByWolves.java | 2 +- .../src/mage/cards/r/RakdosGuildmage.java | 4 +- .../src/mage/cards/r/RakshasaGravecaller.java | 2 +- Mage.Sets/src/mage/cards/r/RallyTheHorde.java | 4 +- Mage.Sets/src/mage/cards/r/RapaciousOne.java | 4 +- .../src/mage/cards/r/RapidHybridization.java | 6 +- .../src/mage/cards/r/ReachOfBranches.java | 2 +- .../mage/cards/r/RebellionOfTheFlamekin.java | 4 +- Mage.Sets/src/mage/cards/r/ReefWorm.java | 6 +- Mage.Sets/src/mage/cards/r/ReignOfThePit.java | 4 +- .../src/mage/cards/r/RenownedWeaver.java | 10 +-- .../src/mage/cards/r/RepelIntruders.java | 4 +- Mage.Sets/src/mage/cards/r/RequiemAngel.java | 2 +- .../src/mage/cards/r/ResearchDevelopment.java | 4 +- .../src/mage/cards/r/RetreatToEmeria.java | 7 +-- .../src/mage/cards/r/RevelOfTheFallenGod.java | 2 +- .../src/mage/cards/r/RhysTheRedeemed.java | 6 +- .../src/mage/cards/r/RighteousConfluence.java | 2 +- .../mage/cards/r/RikuOfTwoReflections.java | 6 +- .../src/mage/cards/r/RiptideReplicator.java | 4 +- .../src/mage/cards/r/RiseFromTheTides.java | 2 +- Mage.Sets/src/mage/cards/r/RiseOfEagles.java | 2 +- .../src/mage/cards/r/RiseOfTheHobgoblins.java | 4 +- .../src/mage/cards/r/RiteOfReplication.java | 4 +- .../mage/cards/r/RiteOfTheRagingStorm.java | 8 +-- .../src/mage/cards/r/RiteOfTheSerpent.java | 4 +- .../src/mage/cards/r/RithTheAwakener.java | 4 +- Mage.Sets/src/mage/cards/r/RithsCharm.java | 2 +- .../src/mage/cards/r/RitualOfTheReturned.java | 6 +- Mage.Sets/src/mage/cards/r/RoarOfTheWurm.java | 2 +- Mage.Sets/src/mage/cards/r/RootOut.java | 2 +- .../src/mage/cards/r/RootbornDefenses.java | 2 +- .../src/mage/cards/r/RotlungReanimator.java | 2 +- .../src/mage/cards/r/RousingOfSouls.java | 4 +- Mage.Sets/src/mage/cards/r/RukhEgg.java | 10 +-- Mage.Sets/src/mage/cards/s/SaberAnts.java | 4 +- Mage.Sets/src/mage/cards/s/SacredMesa.java | 2 +- .../src/mage/cards/s/SanctifierOfSouls.java | 2 +- .../src/mage/cards/s/SandsteppeOutcast.java | 2 +- .../src/mage/cards/s/SaprolingBurst.java | 39 ++++++------ .../src/mage/cards/s/SaprolingCluster.java | 2 +- .../src/mage/cards/s/SaprolingSymbiosis.java | 2 +- Mage.Sets/src/mage/cards/s/Sarcomancy.java | 2 +- Mage.Sets/src/mage/cards/s/SarkhanTheMad.java | 2 +- .../src/mage/cards/s/SarkhanUnbroken.java | 2 +- Mage.Sets/src/mage/cards/s/SarkhanVol.java | 2 +- .../mage/cards/s/SarpadianEmpiresVolVii.java | 4 +- Mage.Sets/src/mage/cards/s/SatyrNyxSmith.java | 2 +- .../src/mage/cards/s/SavageConception.java | 2 +- Mage.Sets/src/mage/cards/s/SavageThallid.java | 2 +- .../src/mage/cards/s/ScatterTheSeeds.java | 2 +- .../src/mage/cards/s/ScionOfVituGhazi.java | 2 +- Mage.Sets/src/mage/cards/s/ScionSummoner.java | 4 +- Mage.Sets/src/mage/cards/s/Seance.java | 4 +- Mage.Sets/src/mage/cards/s/SecondHarvest.java | 4 +- .../src/mage/cards/s/SecureTheWastes.java | 2 +- .../src/mage/cards/s/SecurityBlockade.java | 2 +- Mage.Sets/src/mage/cards/s/SeedGuardian.java | 4 +- Mage.Sets/src/mage/cards/s/SeedSpark.java | 4 +- Mage.Sets/src/mage/cards/s/SeedTheLand.java | 4 +- .../src/mage/cards/s/SekKuarDeathkeeper.java | 2 +- .../src/mage/cards/s/SekkiSeasonsGuide.java | 4 +- Mage.Sets/src/mage/cards/s/SelesnyaCharm.java | 2 +- .../src/mage/cards/s/SelesnyaEvangel.java | 2 +- .../src/mage/cards/s/SelesnyaGuildmage.java | 2 +- .../src/mage/cards/s/SellerOfSongbirds.java | 2 +- .../src/mage/cards/s/SelvalasCharge.java | 4 +- .../src/mage/cards/s/SengirAutocrat.java | 2 +- .../src/mage/cards/s/SengirNosferatu.java | 4 +- Mage.Sets/src/mage/cards/s/SensorSplicer.java | 2 +- .../src/mage/cards/s/SerpentGenerator.java | 4 +- Mage.Sets/src/mage/cards/s/ShambleBack.java | 2 +- .../src/mage/cards/s/ShardingSphinx.java | 2 +- .../src/mage/cards/s/SidisiBroodTyrant.java | 4 +- .../src/mage/cards/s/SifterOfSkulls.java | 4 +- .../src/mage/cards/s/SigardaHeronsGrace.java | 2 +- .../src/mage/cards/s/SilverfurPartisan.java | 4 +- .../src/mage/cards/s/SkeletalVampire.java | 4 +- Mage.Sets/src/mage/cards/s/Skeletonize.java | 4 +- .../src/mage/cards/s/SkirkRidgeExhumer.java | 4 +- .../src/mage/cards/s/SkirsdagHighPriest.java | 2 +- .../src/mage/cards/s/SkywiseTeachings.java | 2 +- Mage.Sets/src/mage/cards/s/SlayersPlate.java | 4 +- Mage.Sets/src/mage/cards/s/SlimeMolding.java | 4 +- Mage.Sets/src/mage/cards/s/SliverHive.java | 4 +- Mage.Sets/src/mage/cards/s/SliverQueen.java | 2 +- Mage.Sets/src/mage/cards/s/Sliversmith.java | 4 +- Mage.Sets/src/mage/cards/s/SnakeBasket.java | 2 +- Mage.Sets/src/mage/cards/s/SnakePit.java | 2 +- .../src/mage/cards/s/SorinGrimNemesis.java | 19 +++--- .../mage/cards/s/SorinLordOfInnistrad.java | 5 +- .../src/mage/cards/s/SorinSolemnVisitor.java | 2 +- .../src/mage/cards/s/SosukesSummons.java | 2 +- Mage.Sets/src/mage/cards/s/SoulFoundry.java | 6 +- .../src/mage/cards/s/SoulOfZendikar.java | 4 +- Mage.Sets/src/mage/cards/s/SoulSeparator.java | 8 +-- Mage.Sets/src/mage/cards/s/Sparkspitter.java | 2 +- Mage.Sets/src/mage/cards/s/SpawningBed.java | 2 +- .../src/mage/cards/s/SpawningGrounds.java | 4 +- .../src/mage/cards/s/SpawnsireOfUlamog.java | 2 +- Mage.Sets/src/mage/cards/s/Spawnwrithe.java | 4 +- .../src/mage/cards/s/SpectralProcession.java | 2 +- .../src/mage/cards/s/SpectralReserves.java | 4 +- .../src/mage/cards/s/SpiderSpawning.java | 6 +- Mage.Sets/src/mage/cards/s/SpikeBreeder.java | 2 +- Mage.Sets/src/mage/cards/s/SpiritCairn.java | 2 +- Mage.Sets/src/mage/cards/s/SpiritMirror.java | 4 +- .../src/mage/cards/s/SpiritualVisit.java | 2 +- Mage.Sets/src/mage/cards/s/SpittingImage.java | 4 +- Mage.Sets/src/mage/cards/s/SplinterTwin.java | 4 +- .../src/mage/cards/s/SplittingSlime.java | 2 +- Mage.Sets/src/mage/cards/s/SpoilsOfBlood.java | 4 +- .../mage/cards/s/SpontaneousGeneration.java | 2 +- Mage.Sets/src/mage/cards/s/SporeBurst.java | 2 +- Mage.Sets/src/mage/cards/s/Sporemound.java | 2 +- .../src/mage/cards/s/SporesowerThallid.java | 2 +- .../src/mage/cards/s/SporolothAncient.java | 4 +- .../src/mage/cards/s/SpringjackPasture.java | 2 +- .../src/mage/cards/s/SpringjackShepherd.java | 4 +- Mage.Sets/src/mage/cards/s/Sprout.java | 2 +- Mage.Sets/src/mage/cards/s/SproutSwarm.java | 2 +- .../src/mage/cards/s/SproutingPhytohydra.java | 6 +- Mage.Sets/src/mage/cards/s/SquirrelNest.java | 4 +- .../src/mage/cards/s/SquirrelWrangler.java | 2 +- .../src/mage/cards/s/StitcherGeralf.java | 4 +- .../src/mage/cards/s/StitchersApprentice.java | 2 +- .../src/mage/cards/s/StolenIdentity.java | 2 +- Mage.Sets/src/mage/cards/s/StoneIdolTrap.java | 4 +- .../mage/cards/s/StonybrookSchoolmaster.java | 2 +- Mage.Sets/src/mage/cards/s/StormHerd.java | 2 +- .../src/mage/cards/s/StormfrontRiders.java | 8 +-- .../src/mage/cards/s/StrengthOfArms.java | 4 +- .../src/mage/cards/s/SubterraneanTremors.java | 6 +- .../src/mage/cards/s/SummonTheSchool.java | 2 +- .../src/mage/cards/s/SummoningStation.java | 2 +- .../src/mage/cards/s/SunderingGrowth.java | 2 +- .../src/mage/cards/s/SunhomeGuildmage.java | 2 +- .../src/mage/cards/s/SunspireGatekeepers.java | 4 +- Mage.Sets/src/mage/cards/s/SupplantForm.java | 4 +- Mage.Sets/src/mage/cards/s/SupplyDemand.java | 2 +- .../src/mage/cards/s/SurveyTheWreckage.java | 2 +- Mage.Sets/src/mage/cards/s/SwanSong.java | 4 +- .../src/mage/cards/s/SwordOfBodyAndMind.java | 4 +- .../src/mage/cards/s/SylvanOffering.java | 8 +-- .../src/mage/cards/s/SymbioticBeast.java | 2 +- Mage.Sets/src/mage/cards/s/SymbioticElf.java | 2 +- Mage.Sets/src/mage/cards/s/SymbioticWurm.java | 4 +- Mage.Sets/src/mage/cards/s/SyphonFlesh.java | 4 +- Mage.Sets/src/mage/cards/t/TakeUpArms.java | 2 +- .../src/mage/cards/t/TalrandSkySummoner.java | 2 +- .../src/mage/cards/t/TalrandsInvocation.java | 2 +- .../src/mage/cards/t/TamiyosJournal.java | 2 +- .../mage/cards/t/TatsumasaTheDragonsFang.java | 4 +- .../mage/cards/t/TemptWithReflections.java | 6 +- .../src/mage/cards/t/TemptWithVengeance.java | 11 ++-- Mage.Sets/src/mage/cards/t/Terastodon.java | 4 +- Mage.Sets/src/mage/cards/t/Tetravus.java | 39 ++++++------ .../src/mage/cards/t/TeysaEnvoyOfGhosts.java | 4 +- .../src/mage/cards/t/TeysaOrzhovScion.java | 2 +- Mage.Sets/src/mage/cards/t/Thallid.java | 2 +- .../src/mage/cards/t/ThallidDevourer.java | 2 +- .../src/mage/cards/t/ThallidGerminator.java | 2 +- .../src/mage/cards/t/ThallidShellDweller.java | 2 +- .../src/mage/cards/t/ThatcherRevolt.java | 4 +- .../src/mage/cards/t/TheloniteHermit.java | 2 +- .../src/mage/cards/t/ThopterAssembly.java | 6 +- .../src/mage/cards/t/ThopterEngineer.java | 2 +- .../src/mage/cards/t/ThopterFoundry.java | 2 +- .../src/mage/cards/t/ThopterSpyNetwork.java | 4 +- .../src/mage/cards/t/ThopterSquadron.java | 2 +- .../src/mage/cards/t/ThrabenDoomsayer.java | 2 +- .../mage/cards/t/ThrabenStandardBearer.java | 2 +- Mage.Sets/src/mage/cards/t/Thragtusk.java | 2 +- .../src/mage/cards/t/ThroneOfEmpires.java | 4 +- Mage.Sets/src/mage/cards/t/Thunderheads.java | 4 +- Mage.Sets/src/mage/cards/t/TidalWave.java | 4 +- .../mage/cards/t/TimelyReinforcements.java | 4 +- .../src/mage/cards/t/TirelessTracker.java | 2 +- .../cards/t/TitaniaProtectorOfArgoth.java | 2 +- .../src/mage/cards/t/TolsimirWolfblood.java | 15 +++-- Mage.Sets/src/mage/cards/t/TombOfUrami.java | 18 +++--- Mage.Sets/src/mage/cards/t/TradingPost.java | 2 +- Mage.Sets/src/mage/cards/t/Transluminant.java | 2 +- .../src/mage/cards/t/TriplicateSpirits.java | 2 +- Mage.Sets/src/mage/cards/t/Triskelavus.java | 4 +- .../mage/cards/t/TrostaniSelesnyasVoice.java | 2 +- .../src/mage/cards/t/TrostanisJudgment.java | 2 +- .../src/mage/cards/t/TrostanisSummoner.java | 8 +-- .../src/mage/cards/t/TurntimberRanger.java | 2 +- .../src/mage/cards/t/TwilightDrover.java | 2 +- Mage.Sets/src/mage/cards/t/Twinflame.java | 4 +- .../src/mage/cards/u/UlashtTheHateSeed.java | 4 +- .../src/mage/cards/u/UlvenwaldMysteries.java | 4 +- .../src/mage/cards/u/UndeadAlchemist.java | 4 +- Mage.Sets/src/mage/cards/u/UndeadServant.java | 2 +- Mage.Sets/src/mage/cards/u/UnifiedFront.java | 4 +- .../mage/cards/u/UnscytheKillerOfKings.java | 4 +- .../src/mage/cards/u/UrbisProtector.java | 2 +- Mage.Sets/src/mage/cards/u/UrzasFactory.java | 2 +- Mage.Sets/src/mage/cards/u/UtopiaMycon.java | 2 +- .../src/mage/cards/u/UtvaraHellkite.java | 2 +- .../src/mage/cards/v/VanguardOfBrimaz.java | 2 +- .../src/mage/cards/v/VerdantEmbrace.java | 4 +- Mage.Sets/src/mage/cards/v/VerdantForce.java | 2 +- .../src/mage/cards/v/VerdelothTheAncient.java | 4 +- .../src/mage/cards/v/VesselOfEphemera.java | 4 +- Mage.Sets/src/mage/cards/v/VileRebirth.java | 2 +- Mage.Sets/src/mage/cards/v/VileRedeemer.java | 6 +- Mage.Sets/src/mage/cards/v/VitalSplicer.java | 2 +- Mage.Sets/src/mage/cards/v/VitalityCharm.java | 4 +- .../src/mage/cards/v/VitasporeThallid.java | 2 +- .../src/mage/cards/v/VituGhaziGuildmage.java | 4 +- .../mage/cards/v/VituGhaziTheCityTree.java | 2 +- .../src/mage/cards/v/VoiceOfResurgence.java | 4 +- .../src/mage/cards/v/VoiceOfTheProvinces.java | 2 +- .../src/mage/cards/v/VoiceOfTheWoods.java | 2 +- Mage.Sets/src/mage/cards/v/VoidAttendant.java | 4 +- .../src/mage/cards/v/VolrathsLaboratory.java | 4 +- .../src/mage/cards/v/VraskaTheUnseen.java | 2 +- .../src/mage/cards/w/WaitingInTheWeeds.java | 4 +- Mage.Sets/src/mage/cards/w/Wakedancer.java | 4 +- .../src/mage/cards/w/WalkerOfTheGrove.java | 2 +- Mage.Sets/src/mage/cards/w/WallOfKelp.java | 8 +-- .../src/mage/cards/w/WarbreakTrumpeter.java | 2 +- Mage.Sets/src/mage/cards/w/WarpingWail.java | 4 +- .../src/mage/cards/w/WarrenWeirding.java | 4 +- Mage.Sets/src/mage/cards/w/WasteNot.java | 4 +- .../src/mage/cards/w/WayfaringTemple.java | 2 +- Mage.Sets/src/mage/cards/w/WestvaleAbbey.java | 2 +- .../src/mage/cards/w/WestvaleCultLeader.java | 2 +- .../src/mage/cards/w/WharfInfiltrator.java | 4 +- Mage.Sets/src/mage/cards/w/WhirlerRogue.java | 4 +- .../src/mage/cards/w/WhiteSunsZenith.java | 2 +- Mage.Sets/src/mage/cards/w/WingSplicer.java | 2 +- Mage.Sets/src/mage/cards/w/WingmateRoc.java | 4 +- Mage.Sets/src/mage/cards/w/WireflyHive.java | 2 +- .../src/mage/cards/w/WirewoodHivemaster.java | 2 +- .../src/mage/cards/w/WolfSkullShaman.java | 2 +- .../src/mage/cards/w/WolfbriarElemental.java | 2 +- .../src/mage/cards/w/WolfcallersHowl.java | 4 +- Mage.Sets/src/mage/cards/w/WolfkinBond.java | 2 +- .../src/mage/cards/w/WorldspineWurm.java | 2 +- Mage.Sets/src/mage/cards/w/WormHarvest.java | 2 +- .../src/mage/cards/w/WortTheRaidmother.java | 2 +- .../src/mage/cards/w/WrensRunPackmaster.java | 2 +- Mage.Sets/src/mage/cards/w/Wurmcalling.java | 4 +- .../src/mage/cards/w/WurmcoilEngine.java | 20 +++--- .../src/mage/cards/x/XathridNecromancer.java | 2 +- .../src/mage/cards/x/XenagosTheReveler.java | 2 +- .../src/mage/cards/y/YoungPyromancer.java | 2 +- .../mage/cards/z/ZektarShrineExpedition.java | 4 +- Mage.Sets/src/mage/cards/z/ZendikarsRoil.java | 2 +- .../src/mage/cards/z/ZombieInfestation.java | 2 +- .../abilities/enters/DearlyDepartedTest.java | 25 ++++---- .../abilities/flicker/CloudshiftTest.java | 2 +- .../abilities/keywords/FlashbackTest.java | 2 +- .../cards/abilities/keywords/RetraceTest.java | 2 +- .../cards/abilities/keywords/SurgeTest.java | 2 +- .../oneshot/destroy/BaneOfProgessTest.java | 2 +- .../oneshot/sacrifice/TradingPostTest.java | 2 +- .../abilities/other/SpellFizzlesTest.java | 2 +- .../cards/asthough/SpendOtherManaTest.java | 2 +- .../continuous/AngelOfJubilationTest.java | 63 +++++++++---------- .../continuous/DaxosTheReturnedTest.java | 2 +- .../continuous/DependentEffectsTest.java | 2 +- .../test/cards/copy/ArtisanOfFormsTest.java | 4 +- .../test/cards/copy/EssenceOfTheWildtest.java | 2 +- .../cards/copy/FeldonOfTheThirdPathTest.java | 10 +-- .../mage/test/cards/copy/HiveMindTest.java | 37 +++++------ .../cards/copy/KikiJikiMirrorBreakerTest.java | 10 +-- .../mage/test/cards/copy/MimicVatTest.java | 8 +-- .../test/cards/copy/SplinterTwinTest.java | 6 +- .../mage/test/cards/mana/CryptGhastTest.java | 2 +- .../cards/mana/NykthosShrineToNyxTest.java | 2 +- .../test/cards/planeswalker/TamiyoTest.java | 4 +- .../test/cards/planeswalker/UginTest.java | 4 +- .../cards/replacement/DoublingSeasonTest.java | 4 +- .../test/cards/restriction/ArrestTest.java | 4 +- .../single/SorinLordOfInnistradTest.java | 7 +-- .../test/cards/single/SoulFoundryTest.java | 11 ++-- .../cards/single/emn/SoulSeparatorTest.java | 38 +++++------ .../single/lrw/BurrentonForgeTenderTest.java | 2 +- .../single/soi/BriarbridgePatrolTest.java | 2 +- .../cards/single/soi/ThingInTheIceTest.java | 2 +- .../cards/triggers/KarmicJusticeTest.java | 10 ++- .../triggers/ReturnToHandEffectsTest.java | 2 +- .../test/combat/DamageDistributionTest.java | 56 ++++++++--------- .../test/lki/LastKnownInformationTest.java | 2 +- .../org/mage/test/multiplayer/MyriadTest.java | 2 +- .../rollback/NewCreaturesAreRemovedTest.java | 4 +- .../mage/test/rollback/StateValuesTest.java | 2 +- .../mage/test/token/ActivatedAbilityTest.java | 7 ++- .../effects/keyword/InvestigateEffect.java | 2 +- .../keyword/LivingWeaponAbility.java | 9 +-- .../permanent/token/ClueArtifactToken.java | 4 +- .../java/mage/game/permanent/token/Token.java | 33 +++++----- 792 files changed, 1563 insertions(+), 1600 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AbhorrentOverlord.java b/Mage.Sets/src/mage/cards/a/AbhorrentOverlord.java index 46e102dbe29..f7800b70ff6 100644 --- a/Mage.Sets/src/mage/cards/a/AbhorrentOverlord.java +++ b/Mage.Sets/src/mage/cards/a/AbhorrentOverlord.java @@ -59,9 +59,9 @@ public class AbhorrentOverlord extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // When Abhorrent Overlord enters the battlefield, put a number of 1/1 black Harpy creature tokens with flying onto the battlefield equal to your devotion to black. + // When Abhorrent Overlord enters the battlefield, create a number of 1/1 black Harpy creature tokens with flying equal to your devotion to black. Effect effect = new CreateTokenEffect(new AbhorrentOverlordHarpyToken(), new DevotionCount(ColoredManaSymbol.B)); - effect.setText("put a number of 1/1 black Harpy creature tokens with flying onto the battlefield equal to your devotion to black. (Each {B} in the mana costs of permanents you control counts toward your devotion to black.)"); + effect.setText("create a number of 1/1 black Harpy creature tokens with flying equal to your devotion to black. (Each {B} in the mana costs of permanents you control counts toward your devotion to black.)"); this.addAbility(new EntersBattlefieldTriggeredAbility(effect)); // At the beginning of your upkeep, sacrifice a creature. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeControllerEffect(new FilterCreaturePermanent(), 1, null), TargetController.YOU, false)); diff --git a/Mage.Sets/src/mage/cards/a/AbstruseInterference.java b/Mage.Sets/src/mage/cards/a/AbstruseInterference.java index 544c58141af..f8a6362048c 100644 --- a/Mage.Sets/src/mage/cards/a/AbstruseInterference.java +++ b/Mage.Sets/src/mage/cards/a/AbstruseInterference.java @@ -46,7 +46,7 @@ import mage.target.TargetSpell; public class AbstruseInterference extends CardImpl { public AbstruseInterference(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{U}"); // Devoid this.addAbility(new DevoidAbility(this.color)); @@ -55,9 +55,9 @@ public class AbstruseInterference extends CardImpl { this.getSpellAbility().addTarget(new TargetSpell()); this.getSpellAbility().addEffect(new CounterUnlessPaysEffect(new GenericManaCost(1))); - // You put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has "Sacrifice this creature: Add {C} to your mana pool." + // You create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool." Effect effect = new CreateTokenEffect(new EldraziScionToken()); - effect.setText("You put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has \"Sacrifice this creature: Add {C} to your mana pool.\""); + effect.setText("You create a 1/1 colorless Eldrazi Scion creature token. It has \"Sacrifice this creature: Add {C} to your mana pool.\""); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/cards/a/AbzanAscendancy.java b/Mage.Sets/src/mage/cards/a/AbzanAscendancy.java index 4f386e86354..863e651d5ad 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanAscendancy.java +++ b/Mage.Sets/src/mage/cards/a/AbzanAscendancy.java @@ -64,7 +64,7 @@ public class AbzanAscendancy extends CardImpl { // When Abzan Ascendancy enters the battlefield, put a +1/+1 counter on each creature you control. this.addAbility(new EntersBattlefieldTriggeredAbility(new AddCountersAllEffect(CounterType.P1P1.createInstance(), new FilterControlledCreaturePermanent()), false)); - // Whenever a nontoken creature you control dies, put a 1/1 white Spirit creature token with flying onto the battlefield. + // Whenever a nontoken creature you control dies, create a 1/1 white Spirit creature token with flying. this.addAbility(new DiesCreatureTriggeredAbility(new CreateTokenEffect(new SpiritWhiteToken("KTK")), false, filter)); } diff --git a/Mage.Sets/src/mage/cards/a/AcornCatapult.java b/Mage.Sets/src/mage/cards/a/AcornCatapult.java index 29bbb450760..34e7cf959c4 100644 --- a/Mage.Sets/src/mage/cards/a/AcornCatapult.java +++ b/Mage.Sets/src/mage/cards/a/AcornCatapult.java @@ -52,9 +52,9 @@ import mage.target.common.TargetCreatureOrPlayer; public class AcornCatapult extends CardImpl { public AcornCatapult(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); + 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 puts a 1/1 green Squirrel creature token onto the battlefield. + // {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. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}")); ability.addCost(new TapSourceCost()); ability.addEffect(new AcornCatapultEffect()); @@ -72,12 +72,11 @@ public class AcornCatapult extends CardImpl { } } - class AcornCatapultEffect extends OneShotEffect { public AcornCatapultEffect() { super(Outcome.PutCreatureInPlay); - staticText = "that creature's controller or that player puts a 1/1 green Squirrel creature token onto the battlefield"; + staticText = "that creature's controller or that player creates a 1/1 green Squirrel creature token"; } public AcornCatapultEffect(final AcornCatapultEffect effect) { @@ -93,14 +92,14 @@ class AcornCatapultEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { UUID targetId = getTargetPointer().getFirst(game, source); Player player = game.getPlayer(targetId); - if(player == null) { + if (player == null) { Permanent permanent = game.getPermanent(targetId); - if(permanent != null) { + if (permanent != null) { player = game.getPlayer(permanent.getControllerId()); } } - if(player != null) { + if (player != null) { new SquirrelToken().putOntoBattlefield(1, game, source.getSourceId(), player.getId()); return true; } diff --git a/Mage.Sets/src/mage/cards/a/AcornHarvest.java b/Mage.Sets/src/mage/cards/a/AcornHarvest.java index 64cc359e05a..8a585312ed7 100644 --- a/Mage.Sets/src/mage/cards/a/AcornHarvest.java +++ b/Mage.Sets/src/mage/cards/a/AcornHarvest.java @@ -48,7 +48,7 @@ public class AcornHarvest extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{G}"); - // Put two 1/1 green Squirrel creature tokens onto the battlefield. + // Create two 1/1 green Squirrel creature tokens. this.getSpellAbility().addEffect(new CreateTokenEffect(new SquirrelToken(), 2)); // Flashback-{1}{G} - Pay 3 life. diff --git a/Mage.Sets/src/mage/cards/a/AdventOfTheWurm.java b/Mage.Sets/src/mage/cards/a/AdventOfTheWurm.java index 3ff41451866..6b0c2920ea2 100644 --- a/Mage.Sets/src/mage/cards/a/AdventOfTheWurm.java +++ b/Mage.Sets/src/mage/cards/a/AdventOfTheWurm.java @@ -46,7 +46,7 @@ public class AdventOfTheWurm extends CardImpl { public AdventOfTheWurm(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{G}{G}{W}"); - // Put a 5/5 green Wurm creature token with trample onto the battlefield. + // Create a 5/5 green Wurm creature token with trample. this.getSpellAbility().addEffect(new CreateTokenEffect(new WurmToken2())); } diff --git a/Mage.Sets/src/mage/cards/a/AdverseConditions.java b/Mage.Sets/src/mage/cards/a/AdverseConditions.java index 999028e36a3..bbb6f28945f 100644 --- a/Mage.Sets/src/mage/cards/a/AdverseConditions.java +++ b/Mage.Sets/src/mage/cards/a/AdverseConditions.java @@ -47,7 +47,7 @@ import mage.target.common.TargetCreaturePermanent; public class AdverseConditions extends CardImpl { public AdverseConditions(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{U}"); // Devoid Ability ability = new DevoidAbility(this.color); @@ -58,9 +58,9 @@ public class AdverseConditions extends CardImpl { this.getSpellAbility().addEffect(new TapTargetEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent(0, 2)); this.getSpellAbility().addEffect(new DontUntapInControllersNextUntapStepTargetEffect("Those creatures")); - // Put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has "Sacrifice this creature: Add {C} to your mana pool." + // Create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool." Effect effect = new CreateTokenEffect(new EldraziScionToken()); - effect.setText("put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has \"Sacrifice this creature: Add {C} to your mana pool.\""); + effect.setText("create a 1/1 colorless Eldrazi Scion creature token. It has \"Sacrifice this creature: Add {C} to your mana pool.\""); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/cards/a/AerieWorshippers.java b/Mage.Sets/src/mage/cards/a/AerieWorshippers.java index a871b6abdeb..336b0edfb4a 100644 --- a/Mage.Sets/src/mage/cards/a/AerieWorshippers.java +++ b/Mage.Sets/src/mage/cards/a/AerieWorshippers.java @@ -53,7 +53,7 @@ public class AerieWorshippers extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(4); - // Inspired - Whenever Aerie Worshipers becomes untapped, you may pay {2}{U}. If you do, put a 2/2 blue Bird enchantment creature token with flying onto the battlefield. + // Inspired - Whenever Aerie Worshipers becomes untapped, you may pay {2}{U}. If you do, create a 2/2 blue Bird enchantment creature token with flying. this.addAbility(new InspiredAbility(new DoIfCostPaid(new CreateTokenEffect(new AerieWorshippersBirdToken()), new ManaCostsImpl("{2}{U}")))); } diff --git a/Mage.Sets/src/mage/cards/a/AetherMutation.java b/Mage.Sets/src/mage/cards/a/AetherMutation.java index a0c13f4c253..92395cf533c 100644 --- a/Mage.Sets/src/mage/cards/a/AetherMutation.java +++ b/Mage.Sets/src/mage/cards/a/AetherMutation.java @@ -50,7 +50,7 @@ public class AetherMutation extends CardImpl { // Return target creature to its owner's hand. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - // Put X 1/1 green Saproling creature tokens onto the battlefield, where X is that creature's converted mana cost. + // create X 1/1 green Saproling creature tokens, where X is that creature's converted mana cost. this.getSpellAbility().addEffect(new CreateTokenEffect(new SaprolingToken(), new TargetConvertedManaCost())); } diff --git a/Mage.Sets/src/mage/cards/a/Afterlife.java b/Mage.Sets/src/mage/cards/a/Afterlife.java index 7fce25118be..33df33168c8 100644 --- a/Mage.Sets/src/mage/cards/a/Afterlife.java +++ b/Mage.Sets/src/mage/cards/a/Afterlife.java @@ -50,7 +50,7 @@ public class Afterlife extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{W}"); // Destroy target creature. It can't be regenerated. Its controller puts a - // 1/1 white Spirit creature token with flying onto the battlefield. + // 1/1 white Spirit creature token with flying. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); this.getSpellAbility().addEffect(new AfterlifeEffect()); @@ -70,7 +70,7 @@ class AfterlifeEffect extends OneShotEffect { public AfterlifeEffect() { super(Outcome.PutCreatureInPlay); - staticText = "Its controller puts a 1/1 white Spirit creature token with flying onto the battlefield"; + staticText = "Its controller creates a 1/1 white Spirit creature token with flying"; } public AfterlifeEffect(final AfterlifeEffect effect) { diff --git a/Mage.Sets/src/mage/cards/a/AjaniCallerOfThePride.java b/Mage.Sets/src/mage/cards/a/AjaniCallerOfThePride.java index e40fddefe7b..f8a04c565d9 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniCallerOfThePride.java +++ b/Mage.Sets/src/mage/cards/a/AjaniCallerOfThePride.java @@ -75,7 +75,7 @@ public class AjaniCallerOfThePride extends CardImpl { ability = new LoyaltyAbility(effects, -3); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); - // -8: Put X 2/2 white Cat creature tokens onto the battlefield, where X is your life total. + // -8: create X 2/2 white Cat creature tokens, where X is your life total. this.addAbility(new LoyaltyAbility(new CreateTokenEffect(new CatToken(), new ControllerLifeCount()), -8)); } diff --git a/Mage.Sets/src/mage/cards/a/AjaniGoldmane.java b/Mage.Sets/src/mage/cards/a/AjaniGoldmane.java index aa0cdd60dc1..3c1cd0f7775 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniGoldmane.java +++ b/Mage.Sets/src/mage/cards/a/AjaniGoldmane.java @@ -62,7 +62,7 @@ import mage.players.Player; public class AjaniGoldmane extends CardImpl { public AjaniGoldmane(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.PLANESWALKER},"{2}{W}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.PLANESWALKER}, "{2}{W}{W}"); this.subtype.add("Ajani"); this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(4)); @@ -76,7 +76,7 @@ public class AjaniGoldmane extends CardImpl { effects1.add(new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn, new FilterCreaturePermanent())); this.addAbility(new LoyaltyAbility(effects1, -1)); - // -6: Put a white Avatar creature token onto the battlefield. It has "This creature's power and toughness are each equal to your life total." + // -6: Create a white Avatar creature token. It has "This creature's power and toughness are each equal to your life total." this.addAbility(new LoyaltyAbility(new CreateTokenEffect(new AvatarToken()), -6)); } diff --git a/Mage.Sets/src/mage/cards/a/AjanisChosen.java b/Mage.Sets/src/mage/cards/a/AjanisChosen.java index 9ee608de55b..a653b7e5575 100644 --- a/Mage.Sets/src/mage/cards/a/AjanisChosen.java +++ b/Mage.Sets/src/mage/cards/a/AjanisChosen.java @@ -52,17 +52,17 @@ import mage.players.Player; public class AjanisChosen extends CardImpl { public AjanisChosen(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}{W}"); this.subtype.add("Cat"); this.subtype.add("Soldier"); this.power = new MageInt(3); this.toughness = new MageInt(3); - // Whenever an enchantment enters the battlefield under your control, put a 2/2 white Cat creature token onto the battlefield. If that enchantment is an Aura, you may attach it to the token. + // Whenever an enchantment enters the battlefield under your control, create a 2/2 white Cat creature token. If that enchantment is an Aura, you may attach it to the token. this.addAbility(new EntersBattlefieldAllTriggeredAbility( Zone.BATTLEFIELD, new AjanisChosenEffect(), new FilterControlledEnchantmentPermanent(), false, SetTargetPointer.PERMANENT, - "Whenever an enchantment enters the battlefield under your control, put a 2/2 white Cat creature token onto the battlefield. If that enchantment is an Aura, you may attach it to the token")); + "Whenever an enchantment enters the battlefield under your control, create a 2/2 white Cat creature token. If that enchantment is an Aura, you may attach it to the token")); } public AjanisChosen(final AjanisChosen card) { @@ -79,7 +79,7 @@ class AjanisChosenEffect extends OneShotEffect { public AjanisChosenEffect() { super(Outcome.PutCreatureInPlay); - staticText = "put a 2/2 white Cat creature token onto the battlefield. If that enchantment is an Aura, you may attach it to the token"; + staticText = "create a 2/2 white Cat creature token. If that enchantment is an Aura, you may attach it to the token"; } public AjanisChosenEffect(final AjanisChosenEffect effect) { diff --git a/Mage.Sets/src/mage/cards/a/AkoumStonewaker.java b/Mage.Sets/src/mage/cards/a/AkoumStonewaker.java index 969249d23b1..d1132285fea 100644 --- a/Mage.Sets/src/mage/cards/a/AkoumStonewaker.java +++ b/Mage.Sets/src/mage/cards/a/AkoumStonewaker.java @@ -54,13 +54,13 @@ import mage.target.targetpointer.FixedTarget; public class AkoumStonewaker extends CardImpl { public AkoumStonewaker(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}"); this.subtype.add("Human"); this.subtype.add("Shaman"); this.power = new MageInt(2); this.toughness = new MageInt(1); - // Landfall — Whenever a land enters the battlefield under your control, you may pay {2}{R}. If you do, put a 3/1 red Elemental creature token with trample and haste onto the battlefield. + // Landfall — Whenever a land enters the battlefield under your control, you may pay {2}{R}. If you do, create a 3/1 red Elemental creature token with trample and haste. // Exile that token at the beginning of the next end step. this.addAbility(new LandfallAbility(new DoIfCostPaid(new AkoumStonewakerEffect(), new ManaCostsImpl("{2}{R}")), false)); @@ -80,7 +80,7 @@ class AkoumStonewakerEffect extends OneShotEffect { public AkoumStonewakerEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "put a 3/1 red Elemental creature token with trample and haste onto the battlefield. Exile that token at the beginning of the next end step"; + this.staticText = "create a 3/1 red Elemental creature token with trample and haste. Exile that token at the beginning of the next end step"; } public AkoumStonewakerEffect(final AkoumStonewakerEffect effect) { diff --git a/Mage.Sets/src/mage/cards/a/AkroanCrusader.java b/Mage.Sets/src/mage/cards/a/AkroanCrusader.java index a818d341928..b55b66f2b0e 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanCrusader.java +++ b/Mage.Sets/src/mage/cards/a/AkroanCrusader.java @@ -51,7 +51,7 @@ public class AkroanCrusader extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // Heroic Whenever you cast a spell that targets Akroan Crusader, put a 1/1 red Soldier creature token with haste onto the battlefield. + // Heroic Whenever you cast a spell that targets Akroan Crusader, create a 1/1 red Soldier creature token with haste. this.addAbility(new HeroicAbility(new CreateTokenEffect(new SoldierToken()))); } diff --git a/Mage.Sets/src/mage/cards/a/AkroanHorse.java b/Mage.Sets/src/mage/cards/a/AkroanHorse.java index 76a2809e25e..fbf19fdc1d6 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanHorse.java +++ b/Mage.Sets/src/mage/cards/a/AkroanHorse.java @@ -62,7 +62,7 @@ import mage.target.targetpointer.FixedTarget; public class AkroanHorse extends CardImpl { public AkroanHorse(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{4}"); + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{4}"); this.subtype.add("Horse"); this.power = new MageInt(0); this.toughness = new MageInt(4); @@ -71,7 +71,7 @@ public class AkroanHorse extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // When Akroan Horse enters the battlefield, an opponent gains control of it. this.addAbility(new EntersBattlefieldTriggeredAbility(new AkroanHorseChangeControlEffect(), false)); - // At the beginning of your upkeep, each opponent puts a 1/1 white Soldier creature token onto the battlefield. + // At the beginning of your upkeep, each opponent create a 1/1 white Soldier creature token. this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new AkroanHorseCreateTokenEffect(), TargetController.YOU, false)); } @@ -159,7 +159,7 @@ class AkroanHorseCreateTokenEffect extends OneShotEffect { public AkroanHorseCreateTokenEffect() { super(Outcome.Detriment); - this.staticText = "each opponent puts a 1/1 white Soldier creature token onto the battlefield"; + this.staticText = "each opponent creates a 1/1 white Soldier creature token"; } public AkroanHorseCreateTokenEffect(final AkroanHorseCreateTokenEffect effect) { @@ -173,7 +173,7 @@ class AkroanHorseCreateTokenEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - for (UUID opponentId: game.getOpponents(source.getControllerId())) { + for (UUID opponentId : game.getOpponents(source.getControllerId())) { Token token = new SoldierToken(); token.putOntoBattlefield(1, game, source.getSourceId(), opponentId); } diff --git a/Mage.Sets/src/mage/cards/a/AliveWell.java b/Mage.Sets/src/mage/cards/a/AliveWell.java index 667e01a04c5..a6eed04a19c 100644 --- a/Mage.Sets/src/mage/cards/a/AliveWell.java +++ b/Mage.Sets/src/mage/cards/a/AliveWell.java @@ -28,13 +28,13 @@ package mage.cards.a; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardSetInfo; import mage.cards.SplitCard; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; import mage.game.permanent.token.CentaurToken; @@ -47,13 +47,12 @@ import mage.players.Player; public class AliveWell extends SplitCard { public AliveWell(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{G}","{W}",true); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{G}", "{W}", true); // Alive - // Put a 3/3 green Centaur creature token onto the battlefield. + // Create a 3/3 green Centaur creature token. getLeftHalfCard().getSpellAbility().addEffect(new CreateTokenEffect(new CentaurToken())); - // Well // You gain 2 life for each creature you control. getRightHalfCard().getSpellAbility().addEffect(new WellEffect()); diff --git a/Mage.Sets/src/mage/cards/a/AllianceOfArms.java b/Mage.Sets/src/mage/cards/a/AllianceOfArms.java index 86abe414aa8..42dcff4fb93 100644 --- a/Mage.Sets/src/mage/cards/a/AllianceOfArms.java +++ b/Mage.Sets/src/mage/cards/a/AllianceOfArms.java @@ -53,7 +53,7 @@ public class AllianceOfArms extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{W}"); - // Join forces - Starting with you, each player may pay any amount of mana. Each player puts X 1/1 white Soldier creature tokens onto the battlefield, where X is the total amount of mana paid this way. + // Join forces - Starting with you, each player may pay any amount of mana. Each player creates X 1/1 white Soldier creature tokens, where X is the total amount of mana paid this way. this.getSpellAbility().addEffect(new AllianceOfArmsEffect()); } @@ -71,7 +71,7 @@ class AllianceOfArmsEffect extends OneShotEffect { public AllianceOfArmsEffect() { super(Outcome.Detriment); - this.staticText = "Join forces - Starting with you, each player may pay any amount of mana. Each player puts X 1/1 white Soldier creature tokens onto the battlefield, where X is the total amount of mana paid this way"; + this.staticText = "Join forces - Starting with you, each player may pay any amount of mana. Each player creates X 1/1 white Soldier creature tokens, where X is the total amount of mana paid this way"; } public AllianceOfArmsEffect(final AllianceOfArmsEffect effect) { diff --git a/Mage.Sets/src/mage/cards/a/AlliedReinforcements.java b/Mage.Sets/src/mage/cards/a/AlliedReinforcements.java index 3c861bfe215..88b19b0aabd 100644 --- a/Mage.Sets/src/mage/cards/a/AlliedReinforcements.java +++ b/Mage.Sets/src/mage/cards/a/AlliedReinforcements.java @@ -44,7 +44,7 @@ public class AlliedReinforcements extends CardImpl { public AlliedReinforcements(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{W}"); - // Put two 2/2 white Knight Ally creature tokens onto the battlefield. + // Create two 2/2 white Knight Ally creature tokens. this.getSpellAbility().addEffect(new CreateTokenEffect(new KnightAllyToken(), 2)); } diff --git a/Mage.Sets/src/mage/cards/a/AngelicAccord.java b/Mage.Sets/src/mage/cards/a/AngelicAccord.java index b8922cdf652..83d8cf82c42 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicAccord.java +++ b/Mage.Sets/src/mage/cards/a/AngelicAccord.java @@ -51,7 +51,7 @@ public class AngelicAccord extends CardImpl { public AngelicAccord(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); - // At the beginning of each end step, if you gained 4 or more life this turn, put a 4/4 white Angel creature token with flying onto the battlefield. + // At the beginning of each end step, if you gained 4 or more life this turn, create a 4/4 white Angel creature token with flying. this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new AngelToken()), TargetController.ANY, new YouGainedLifeCondition(Condition.ComparisonType.GreaterThan, 3), false), new PlayerGainedLifeWatcher()); } diff --git a/Mage.Sets/src/mage/cards/a/Arachnogenesis.java b/Mage.Sets/src/mage/cards/a/Arachnogenesis.java index 2f384f8998f..549eba2687c 100644 --- a/Mage.Sets/src/mage/cards/a/Arachnogenesis.java +++ b/Mage.Sets/src/mage/cards/a/Arachnogenesis.java @@ -59,9 +59,9 @@ public class Arachnogenesis extends CardImpl { public Arachnogenesis(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{G}"); - // Put X 1/2 green Spider creature tokens with reach onto the battlefield, where X is the number of creatures attacking you. + // create X 1/2 green Spider creature tokens with reach, where X is the number of creatures attacking you. Effect effect = new CreateTokenEffect(new SpiderToken(), new ArachnogenesisCount()); - effect.setText("Put X 1/2 green Spider creature tokens with reach onto the battlefield, where X is the number of creatures attacking you"); + effect.setText("create X 1/2 green Spider creature tokens with reach, where X is the number of creatures attacking you"); this.getSpellAbility().addEffect(effect); // Prevent all combat damage that would be dealt this turn by non-Spider creatures. diff --git a/Mage.Sets/src/mage/cards/a/ArchdemonOfUnx.java b/Mage.Sets/src/mage/cards/a/ArchdemonOfUnx.java index 7132a4dab85..3aad68d13fc 100644 --- a/Mage.Sets/src/mage/cards/a/ArchdemonOfUnx.java +++ b/Mage.Sets/src/mage/cards/a/ArchdemonOfUnx.java @@ -57,7 +57,7 @@ public class ArchdemonOfUnx extends CardImpl { } public ArchdemonOfUnx(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{B}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{B}{B}"); this.subtype.add("Demon"); this.power = new MageInt(6); @@ -67,7 +67,7 @@ public class ArchdemonOfUnx extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Trample this.addAbility(TrampleAbility.getInstance()); - // At the beginning of your upkeep, sacrifice a non-Zombie creature, then put a 2/2 black Zombie creature token onto the battlefield. + // At the beginning of your upkeep, sacrifice a non-Zombie creature, then create a 2/2 black Zombie creature token. Ability ability = new BeginningOfUpkeepTriggeredAbility(new SacrificeControllerEffect(filter, 1, ""), TargetController.YOU, false); ability.addEffect(new CreateTokenEffect(new ZombieToken())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/ArlinnKord.java b/Mage.Sets/src/mage/cards/a/ArlinnKord.java index 772eae769f9..2b16d2c423c 100644 --- a/Mage.Sets/src/mage/cards/a/ArlinnKord.java +++ b/Mage.Sets/src/mage/cards/a/ArlinnKord.java @@ -73,7 +73,7 @@ public class ArlinnKord extends CardImpl { ability.addTarget(new TargetCreaturePermanent(0, 1)); this.addAbility(ability); - // 0: Put a 2/2 green Wolf creature token onto the battlefield. Transform Arlinn Kord. + // 0: Create a 2/2 green Wolf creature token. Transform Arlinn Kord. this.addAbility(new TransformAbility()); ability = new LoyaltyAbility(new CreateTokenEffect(new WolfToken()), 0); ability.addEffect(new TransformSourceEffect(true)); diff --git a/Mage.Sets/src/mage/cards/a/ArmadaWurm.java b/Mage.Sets/src/mage/cards/a/ArmadaWurm.java index b9b28f06fc2..2b2a8b51d96 100644 --- a/Mage.Sets/src/mage/cards/a/ArmadaWurm.java +++ b/Mage.Sets/src/mage/cards/a/ArmadaWurm.java @@ -24,19 +24,17 @@ * The views and conclusions contained in the software and documentation are those of the * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. -*/ - + */ package mage.cards.a; import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.permanent.token.WurmToken2; /** @@ -46,17 +44,16 @@ import mage.game.permanent.token.WurmToken2; public class ArmadaWurm extends CardImpl { public ArmadaWurm(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}{W}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{G}{W}{W}"); this.subtype.add("Wurm"); - this.power = new MageInt(5); this.toughness = new MageInt(5); // Trample this.addAbility(TrampleAbility.getInstance()); - // When Armada Wurm enters the battlefield, put a 5/5 green Wurm creature token with trample onto the battlefield. + // When Armada Wurm enters the battlefield, create a 5/5 green Wurm creature token with trample. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new WurmToken2()), false)); } diff --git a/Mage.Sets/src/mage/cards/a/ArmyOfTheDamned.java b/Mage.Sets/src/mage/cards/a/ArmyOfTheDamned.java index 773dfbc80fc..70a2fb55443 100644 --- a/Mage.Sets/src/mage/cards/a/ArmyOfTheDamned.java +++ b/Mage.Sets/src/mage/cards/a/ArmyOfTheDamned.java @@ -43,9 +43,9 @@ import mage.game.permanent.token.ZombieToken; public class ArmyOfTheDamned extends CardImpl { public ArmyOfTheDamned(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{5}{B}{B}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{5}{B}{B}{B}"); - // Put thirteen 2/2 black Zombie creature tokens onto the battlefield tapped. + // Create thirteen 2/2 black Zombie creature tokens tapped. this.getSpellAbility().addEffect(new CreateTokenEffect(new ZombieToken(), 13, true, false)); // Flashback {7}{B}{B}{B} diff --git a/Mage.Sets/src/mage/cards/a/ArtifactMutation.java b/Mage.Sets/src/mage/cards/a/ArtifactMutation.java index eb58f9b709c..3f5702fa38b 100644 --- a/Mage.Sets/src/mage/cards/a/ArtifactMutation.java +++ b/Mage.Sets/src/mage/cards/a/ArtifactMutation.java @@ -51,7 +51,7 @@ public class ArtifactMutation extends CardImpl { // Destroy target artifact. It can't be regenerated. this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); this.getSpellAbility().addTarget(new TargetPermanent(new FilterArtifactPermanent())); - // Put X 1/1 green Saproling creature tokens onto the battlefield, where X is that artifact's converted mana cost. + // create X 1/1 green Saproling creature tokens, where X is that artifact's converted mana cost. this.getSpellAbility().addEffect(new CreateTokenEffect(new SaprolingToken(), new TargetConvertedManaCost())); } diff --git a/Mage.Sets/src/mage/cards/a/AspiringAeronaut.java b/Mage.Sets/src/mage/cards/a/AspiringAeronaut.java index 85ca2aa0563..33104f50393 100644 --- a/Mage.Sets/src/mage/cards/a/AspiringAeronaut.java +++ b/Mage.Sets/src/mage/cards/a/AspiringAeronaut.java @@ -53,7 +53,7 @@ public class AspiringAeronaut extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // When Aspiring Aeronaut enters the battlefield, put a 1/1 colorless Thopter artifact creature token with flying onto the battlefield. + // When Aspiring Aeronaut enters the battlefield, create a 1/1 colorless Thopter artifact creature token with flying. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new ThopterColorlessToken()))); } diff --git a/Mage.Sets/src/mage/cards/a/AssaultBattery.java b/Mage.Sets/src/mage/cards/a/AssaultBattery.java index ccde33636c7..db659e34837 100644 --- a/Mage.Sets/src/mage/cards/a/AssaultBattery.java +++ b/Mage.Sets/src/mage/cards/a/AssaultBattery.java @@ -57,7 +57,7 @@ public class AssaultBattery extends SplitCard { getLeftHalfCard().getSpellAbility().addTarget(new TargetCreatureOrPlayer()); // Battery - // Put a 3/3 green Elephant creature token onto the battlefield. + // Create a 3/3 green Elephant creature token. getRightHalfCard().getSpellAbility().addEffect(new CreateTokenEffect(new ElephantToken())); } diff --git a/Mage.Sets/src/mage/cards/a/AssembleTheLegion.java b/Mage.Sets/src/mage/cards/a/AssembleTheLegion.java index 36903ed8944..1959da33e47 100644 --- a/Mage.Sets/src/mage/cards/a/AssembleTheLegion.java +++ b/Mage.Sets/src/mage/cards/a/AssembleTheLegion.java @@ -49,7 +49,7 @@ public class AssembleTheLegion extends CardImpl { public AssembleTheLegion(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{R}{W}"); - // At the beginning of your upkeep, put a muster counter on Assemble the Legion. Then put a 1/1 red and white Soldier creature token with haste onto the battlefield for each muster counter on Assemble the Legion. + // At the beginning of your upkeep, put a muster counter on Assemble the Legion. Then create a 1/1 red and white Soldier creature token with haste for each muster counter on Assemble the Legion. Ability ability = new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.MUSTER.createInstance()), TargetController.YOU, false); ability.addEffect(new CreateTokenEffect(new SoldierTokenWithHaste(), new CountersSourceCount(CounterType.MUSTER))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AttendedKnight.java b/Mage.Sets/src/mage/cards/a/AttendedKnight.java index 2ef616c189a..b79b3441165 100644 --- a/Mage.Sets/src/mage/cards/a/AttendedKnight.java +++ b/Mage.Sets/src/mage/cards/a/AttendedKnight.java @@ -28,13 +28,13 @@ package mage.cards.a; import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.permanent.token.SoldierToken; /** @@ -44,7 +44,7 @@ import mage.game.permanent.token.SoldierToken; public class AttendedKnight extends CardImpl { public AttendedKnight(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}"); this.subtype.add("Human"); this.subtype.add("Knight"); @@ -56,7 +56,7 @@ public class AttendedKnight extends CardImpl { public void build() { // First strike this.addAbility(FirstStrikeAbility.getInstance()); - // When Attended Knight enters the battlefield, put a 1/1 white Soldier creature token onto the battlefield. + // When Attended Knight enters the battlefield, create a 1/1 white Soldier creature token. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new SoldierToken()))); } diff --git a/Mage.Sets/src/mage/cards/a/AuraMutation.java b/Mage.Sets/src/mage/cards/a/AuraMutation.java index db52a9b41ec..5ccd33f9c93 100644 --- a/Mage.Sets/src/mage/cards/a/AuraMutation.java +++ b/Mage.Sets/src/mage/cards/a/AuraMutation.java @@ -51,7 +51,7 @@ public class AuraMutation extends CardImpl { // Destroy target enchantment. this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent(new FilterEnchantmentPermanent())); - // Put X 1/1 green Saproling creature tokens onto the battlefield, where X is that enchantment's converted mana cost. + // create X 1/1 green Saproling creature tokens, where X is that enchantment's converted mana cost. this.getSpellAbility().addEffect(new CreateTokenEffect(new SaprolingToken(), new TargetConvertedManaCost())); } diff --git a/Mage.Sets/src/mage/cards/a/AvacynsCollar.java b/Mage.Sets/src/mage/cards/a/AvacynsCollar.java index 39e9360b9bd..64300fa9861 100644 --- a/Mage.Sets/src/mage/cards/a/AvacynsCollar.java +++ b/Mage.Sets/src/mage/cards/a/AvacynsCollar.java @@ -62,7 +62,7 @@ public class AvacynsCollar extends CardImpl { // Equipped creature gets +1/+0 and has vigilance. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 0))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.EQUIPMENT))); - // Whenever equipped creature dies, if it was a Human, put a 1/1 white Spirit creature token with flying onto the battlefield. + // Whenever equipped creature dies, if it was a Human, create a 1/1 white Spirit creature token with flying. this.addAbility(new AvacynsCollarTriggeredAbility()); // Equip {2} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2))); @@ -111,6 +111,6 @@ class AvacynsCollarTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever equipped creature dies, if it was a Human, put a 1/1 white Spirit creature token with flying onto the battlefield."; + return "Whenever equipped creature dies, if it was a Human, create a 1/1 white Spirit creature token with flying."; } } diff --git a/Mage.Sets/src/mage/cards/a/AvengerOfZendikar.java b/Mage.Sets/src/mage/cards/a/AvengerOfZendikar.java index 5d723e96097..8da03b8c9fb 100644 --- a/Mage.Sets/src/mage/cards/a/AvengerOfZendikar.java +++ b/Mage.Sets/src/mage/cards/a/AvengerOfZendikar.java @@ -65,7 +65,7 @@ public class AvengerOfZendikar extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); - // When Avenger of Zendikar enters the battlefield, put a 0/1 green Plant creature token onto the battlefield for each land you control. + // When Avenger of Zendikar enters the battlefield, create a 0/1 green Plant creature token for each land you control. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new PlantToken(), new PermanentsOnBattlefieldCount(filterLand)), false)); // Landfall - Whenever a land enters the battlefield under your control, you may put a +1/+1 counter on each Plant creature you control. diff --git a/Mage.Sets/src/mage/cards/a/AwakenTheSkyTyrant.java b/Mage.Sets/src/mage/cards/a/AwakenTheSkyTyrant.java index d2eadb2bf2f..17bd6d39335 100644 --- a/Mage.Sets/src/mage/cards/a/AwakenTheSkyTyrant.java +++ b/Mage.Sets/src/mage/cards/a/AwakenTheSkyTyrant.java @@ -49,7 +49,7 @@ public class AwakenTheSkyTyrant extends CardImpl { public AwakenTheSkyTyrant(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{R}"); - // When a source an opponent controls deals damage to you, sacrifice Awaken the Sky Tyrant. If you do, put a 5/5 red Dragon creature token with flying onto the battlefield. + // When a source an opponent controls deals damage to you, sacrifice Awaken the Sky Tyrant. If you do, create a 5/5 red Dragon creature token with flying. this.addAbility(new AwakenTheSkyTyrantTriggeredAbility()); } diff --git a/Mage.Sets/src/mage/cards/b/BackFromTheBrink.java b/Mage.Sets/src/mage/cards/b/BackFromTheBrink.java index 8b5a551bdf5..c91caa44ee5 100644 --- a/Mage.Sets/src/mage/cards/b/BackFromTheBrink.java +++ b/Mage.Sets/src/mage/cards/b/BackFromTheBrink.java @@ -54,11 +54,11 @@ import mage.target.targetpointer.FixedTarget; public class BackFromTheBrink extends CardImpl { public BackFromTheBrink(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{4}{U}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{U}{U}"); - // Exile a creature card from your graveyard and pay its mana cost: Put a token onto the battlefield that's a copy of that card. Activate this ability only any time you could cast a sorcery. + // Exile a creature card from your graveyard and pay its mana cost: Create a token that's a copy of that card. Activate this ability only any time you could cast a sorcery. Effect effect = new PutTokenOntoBattlefieldCopyTargetEffect(); - effect.setText("Put a token onto the battlefield that's a copy of that card"); + effect.setText("create a token that's a copy of that card"); this.addAbility(new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, effect, new BackFromTheBrinkCost())); } diff --git a/Mage.Sets/src/mage/cards/b/BakuAltar.java b/Mage.Sets/src/mage/cards/b/BakuAltar.java index c68641e90ef..4af0dc4faa4 100644 --- a/Mage.Sets/src/mage/cards/b/BakuAltar.java +++ b/Mage.Sets/src/mage/cards/b/BakuAltar.java @@ -57,7 +57,7 @@ public class BakuAltar extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // Whenever you cast a Spirit or Arcane spell, you may put a ki counter on Baku Altar. this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.KI.createInstance(1)), filter, true)); - // {2}, {tap}, Remove a ki counter from Baku Altar: Put a 1/1 colorless Spirit creature token onto the battlefield. + // {2}, {tap}, Remove a ki counter from Baku Altar: Create a 1/1 colorless Spirit creature token. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SpiritToken(), 1), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.KI.createInstance(1))); diff --git a/Mage.Sets/src/mage/cards/b/BalduvianDead.java b/Mage.Sets/src/mage/cards/b/BalduvianDead.java index c9ce1e365f4..568883f8ba2 100644 --- a/Mage.Sets/src/mage/cards/b/BalduvianDead.java +++ b/Mage.Sets/src/mage/cards/b/BalduvianDead.java @@ -63,7 +63,7 @@ public class BalduvianDead extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(3); - // {2}{R}, Exile a creature card from your graveyard: Put a 3/1 black and red Graveborn creature token with haste onto the battlefield. Sacrifice it at the beginning of the next end step. + // {2}{R}, Exile a creature card from your graveyard: Create a 3/1 black and red Graveborn creature token with haste. Sacrifice it at the beginning of the next end step. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BalduvianDeadEffect(), new ManaCostsImpl("{2}{R}")); TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(new FilterCreatureCard()); ability.addCost(new ExileFromGraveCost(target)); @@ -85,7 +85,7 @@ class BalduvianDeadEffect extends OneShotEffect { public BalduvianDeadEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Put a 3/1 black and red Graveborn creature token with haste onto the battlefield. Sacrifice it at the beginning of the next end step"; + this.staticText = "Create a 3/1 black and red Graveborn creature token with haste. Sacrifice it at the beginning of the next end step"; } public BalduvianDeadEffect(final BalduvianDeadEffect effect) { diff --git a/Mage.Sets/src/mage/cards/b/BalothCageTrap.java b/Mage.Sets/src/mage/cards/b/BalothCageTrap.java index bba4fe33e09..a5f570f773b 100644 --- a/Mage.Sets/src/mage/cards/b/BalothCageTrap.java +++ b/Mage.Sets/src/mage/cards/b/BalothCageTrap.java @@ -55,7 +55,7 @@ public class BalothCageTrap extends CardImpl { // If an opponent had an artifact enter the battlefield under his or her control this turn, you may pay {1}{G} rather than pay Baloth Cage Trap's mana cost. this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl("{1}{G}"), BalothCageTrapCondition.getInstance()), new PermanentsEnteredBattlefieldWatcher()); - // Put a 4/4 green Beast creature token onto the battlefield. + // Create a 4/4 green Beast creature token. this.getSpellAbility().addEffect(new CreateTokenEffect(new BeastToken2())); } diff --git a/Mage.Sets/src/mage/cards/b/BantSojourners.java b/Mage.Sets/src/mage/cards/b/BantSojourners.java index 6ff9a4cd0e7..81118e7f555 100644 --- a/Mage.Sets/src/mage/cards/b/BantSojourners.java +++ b/Mage.Sets/src/mage/cards/b/BantSojourners.java @@ -57,7 +57,7 @@ public class BantSojourners extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(4); - // When you cycle Bant Sojourners or it dies, you may put a 1/1 white Soldier creature token onto the battlefield. + // When you cycle Bant Sojourners or it dies, you may create a 1/1 white Soldier creature token. Ability ability1 = new CycleTriggeredAbility(new CreateTokenEffect(new SoldierToken()), true); Ability ability2 = new DiesTriggeredAbility(new CreateTokenEffect(new SoldierToken()), true); this.addAbility(ability1); diff --git a/Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java b/Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java index 4afc322f40e..312e9de64cc 100644 --- a/Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java +++ b/Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java @@ -58,9 +58,10 @@ import mage.game.permanent.token.Token; * @author emerald000 */ public class BaruFistOfKrosa extends CardImpl { - + private static final FilterLandPermanent forestFilter = new FilterLandPermanent("Forest"); private static final FilterCreaturePermanent greenCreatureFilter = new FilterCreaturePermanent("green creatures you control"); + static { forestFilter.add(new SubtypePredicate("Forest")); greenCreatureFilter.add(new ControllerPredicate(TargetController.YOU)); @@ -68,7 +69,7 @@ public class BaruFistOfKrosa extends CardImpl { } public BaruFistOfKrosa(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); this.supertype.add("Legendary"); this.subtype.add("Human"); this.subtype.add("Druid"); @@ -79,9 +80,9 @@ public class BaruFistOfKrosa extends CardImpl { // Whenever a Forest enters the battlefield, green creatures you control get +1/+1 and gain trample until end of turn. Ability ability = new EntersBattlefieldAllTriggeredAbility(new BoostControlledEffect(1, 1, Duration.EndOfTurn, greenCreatureFilter), forestFilter, "Whenever a Forest enters the battlefield, green creatures you control get +1/+1 and gain trample until end of turn."); ability.addEffect(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.EndOfTurn, greenCreatureFilter)); - this.addAbility(ability); - - // Grandeur - Discard another card named Baru, Fist of Krosa: Put an X/X green Wurm creature token onto the battlefield, where X is the number of lands you control. + this.addAbility(ability); + + // Grandeur - Discard another card named Baru, Fist of Krosa: Create an X/X green Wurm creature token, where X is the number of lands you control. this.addAbility(new GrandeurAbility(new BaruFistOfKrosaEffect(), "Baru, Fist of Krosa")); } @@ -96,23 +97,23 @@ public class BaruFistOfKrosa extends CardImpl { } class BaruFistOfKrosaEffect extends OneShotEffect { - + final static FilterControlledPermanent filter = new FilterControlledLandPermanent("lands you control"); - + BaruFistOfKrosaEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Put an X/X green Wurm creature token onto the battlefield, where X is the number of lands you control."; + this.staticText = "create an X/X green Wurm creature token, where X is the number of lands you control."; } - + BaruFistOfKrosaEffect(final BaruFistOfKrosaEffect effect) { super(effect); } - + @Override public BaruFistOfKrosaEffect copy() { return new BaruFistOfKrosaEffect(this); } - + @Override public boolean apply(Game game, Ability source) { int xValue = game.getBattlefield().countAll(filter, source.getControllerId(), game); @@ -123,13 +124,13 @@ class BaruFistOfKrosaEffect extends OneShotEffect { } class BaruFistOfKrosaToken extends Token { - + BaruFistOfKrosaToken(int xValue) { - super("Wurm", "a X/X green Wurm creature token onto the battlefield, where X is the number of lands you control"); + super("Wurm", "a X/X green Wurm creature token, where X is the number of lands you control"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add("Wurm"); power = new MageInt(xValue); toughness = new MageInt(xValue); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/b/Batterskull.java b/Mage.Sets/src/mage/cards/b/Batterskull.java index 99e5ecbb872..1ae370c9177 100644 --- a/Mage.Sets/src/mage/cards/b/Batterskull.java +++ b/Mage.Sets/src/mage/cards/b/Batterskull.java @@ -54,7 +54,7 @@ public class Batterskull extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); this.subtype.add("Equipment"); - // Living weapon (When this Equipment enters the battlefield, put a 0/0 black Germ creature token onto the battlefield, then attach this to it.) + // 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 +4/+4 and has vigilance and lifelink. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(4, 4))); diff --git a/Mage.Sets/src/mage/cards/b/BattleScreech.java b/Mage.Sets/src/mage/cards/b/BattleScreech.java index c79e88b3c3e..08de2297ae6 100644 --- a/Mage.Sets/src/mage/cards/b/BattleScreech.java +++ b/Mage.Sets/src/mage/cards/b/BattleScreech.java @@ -60,7 +60,7 @@ public class BattleScreech extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{W}{W}"); - // Put two 1/1 white Bird creature tokens with flying onto the battlefield. + // Create two 1/1 white Bird creature tokens with flying. this.getSpellAbility().addEffect(new CreateTokenEffect(new BirdToken(), 2)); // Flashback-Tap three untapped white creatures you control. diff --git a/Mage.Sets/src/mage/cards/b/BeaconOfCreation.java b/Mage.Sets/src/mage/cards/b/BeaconOfCreation.java index 892546cb4bb..a69f6b25051 100644 --- a/Mage.Sets/src/mage/cards/b/BeaconOfCreation.java +++ b/Mage.Sets/src/mage/cards/b/BeaconOfCreation.java @@ -54,7 +54,7 @@ public class BeaconOfCreation extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{G}"); - // Put a 1/1 green Insect creature token onto the battlefield for each Forest you control. + // Create a 1/1 green Insect creature token for each Forest you control. this.getSpellAbility().addEffect(new CreateTokenEffect(new InsectToken(), new PermanentsOnBattlefieldCount(filter))); // Shuffle Beacon of Creation into its owner's library. this.getSpellAbility().addEffect(ShuffleSpellEffect.getInstance()); diff --git a/Mage.Sets/src/mage/cards/b/BearsCompanion.java b/Mage.Sets/src/mage/cards/b/BearsCompanion.java index 1817cf4b967..e93fd7d5bbc 100644 --- a/Mage.Sets/src/mage/cards/b/BearsCompanion.java +++ b/Mage.Sets/src/mage/cards/b/BearsCompanion.java @@ -50,7 +50,7 @@ public class BearsCompanion extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // When Bear's Companion enters the battlefield, put a 4/4 green Bear creature token onto the battlefield. + // When Bear's Companion enters the battlefield, create a 4/4 green Bear creature token. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new BearsCompanionBearToken()))); } diff --git a/Mage.Sets/src/mage/cards/b/Bearscape.java b/Mage.Sets/src/mage/cards/b/Bearscape.java index 838ca560a7c..1c32c4c27fa 100644 --- a/Mage.Sets/src/mage/cards/b/Bearscape.java +++ b/Mage.Sets/src/mage/cards/b/Bearscape.java @@ -51,7 +51,7 @@ public class Bearscape extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{G}{G}"); - // {1}{G}, Exile two cards from your graveyard: Put a 2/2 green Bear creature token onto the battlefield. + // {1}{G}, Exile two cards from your graveyard: Create a 2/2 green Bear creature token. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new BearToken()), new ManaCostsImpl("{1}{G}")); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(2, new FilterCard("cards from your graveyard")))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BeastAttack.java b/Mage.Sets/src/mage/cards/b/BeastAttack.java index bc4d46117ec..953e8d526f2 100644 --- a/Mage.Sets/src/mage/cards/b/BeastAttack.java +++ b/Mage.Sets/src/mage/cards/b/BeastAttack.java @@ -46,7 +46,7 @@ public class BeastAttack extends CardImpl { public BeastAttack(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{G}{G}{G}"); - // Put a 4/4 green Beast creature token onto the battlefield. + // Create a 4/4 green Beast creature token. this.getSpellAbility().addEffect(new CreateTokenEffect(new BeastToken2())); // Flashback {2}{G}{G}{G} diff --git a/Mage.Sets/src/mage/cards/b/BeastWithin.java b/Mage.Sets/src/mage/cards/b/BeastWithin.java index d034b3ef76a..09e3901cefc 100644 --- a/Mage.Sets/src/mage/cards/b/BeastWithin.java +++ b/Mage.Sets/src/mage/cards/b/BeastWithin.java @@ -47,9 +47,9 @@ import mage.target.TargetPermanent; public class BeastWithin extends CardImpl { public BeastWithin(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{G}"); - // Destroy target permanent. Its controller puts a 3/3 green Beast creature token onto the battlefield. + // Destroy target permanent. Its controller creates a 3/3 green Beast creature token. this.getSpellAbility().addTarget(new TargetPermanent()); this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new BeastWithinEffect()); @@ -69,7 +69,7 @@ class BeastWithinEffect extends OneShotEffect { public BeastWithinEffect() { super(Outcome.PutCreatureInPlay); - staticText = "Its controller puts a 3/3 green Beast creature token onto the battlefield"; + staticText = "Its controller creates a 3/3 green Beast creature token"; } public BeastWithinEffect(final BeastWithinEffect effect) { diff --git a/Mage.Sets/src/mage/cards/b/BeckCall.java b/Mage.Sets/src/mage/cards/b/BeckCall.java index a2eeab69312..e25ff383791 100644 --- a/Mage.Sets/src/mage/cards/b/BeckCall.java +++ b/Mage.Sets/src/mage/cards/b/BeckCall.java @@ -53,7 +53,7 @@ public class BeckCall extends SplitCard { getLeftHalfCard().getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new BeckTriggeredAbility())); // Call - // Put four 1/1 white Bird creature tokens with flying onto the battlefield. + // Create four 1/1 white Bird creature tokens with flying. getRightHalfCard().getSpellAbility().addEffect(new CreateTokenEffect(new BirdToken(), 4)); } diff --git a/Mage.Sets/src/mage/cards/b/BeetlebackChief.java b/Mage.Sets/src/mage/cards/b/BeetlebackChief.java index 836444789ef..a23b2c500c9 100644 --- a/Mage.Sets/src/mage/cards/b/BeetlebackChief.java +++ b/Mage.Sets/src/mage/cards/b/BeetlebackChief.java @@ -50,7 +50,7 @@ public class BeetlebackChief extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // When Beetleback Chief enters the battlefield, put two 1/1 red Goblin creature tokens onto the battlefield. + // When Beetleback Chief enters the battlefield, create two 1/1 red Goblin creature tokens. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new GoblinToken(), 2))); } diff --git a/Mage.Sets/src/mage/cards/b/BelfrySpirit.java b/Mage.Sets/src/mage/cards/b/BelfrySpirit.java index 95e97e1797c..6c8298ca67a 100644 --- a/Mage.Sets/src/mage/cards/b/BelfrySpirit.java +++ b/Mage.Sets/src/mage/cards/b/BelfrySpirit.java @@ -55,7 +55,7 @@ public class BelfrySpirit extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Haunt - // When Belfry Spirit enters the battlefield or the creature it haunts dies, put two 1/1 black Bat creature tokens with flying onto the battlefield. + // When Belfry Spirit enters the battlefield or the creature it haunts dies, create two 1/1 black Bat creature tokens with flying. Ability ability = new HauntAbility(this, new CreateTokenEffect(new BatToken(), 2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BenalishCommander.java b/Mage.Sets/src/mage/cards/b/BenalishCommander.java index 994f8578f52..ec1dedcfa84 100644 --- a/Mage.Sets/src/mage/cards/b/BenalishCommander.java +++ b/Mage.Sets/src/mage/cards/b/BenalishCommander.java @@ -62,7 +62,7 @@ public class BenalishCommander extends CardImpl { } public BenalishCommander(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}"); this.subtype.add("Human"); this.subtype.add("Soldier"); @@ -75,7 +75,7 @@ public class BenalishCommander extends CardImpl { // Suspend X-{X}{W}{W}. X can't be 0. this.addAbility(new SuspendAbility(Integer.MAX_VALUE, new ManaCostsImpl("{W}{W}"), this, true)); - // Whenever a time counter is removed from Benalish Commander while it's exiled, put a 1/1 white Soldier creature token onto the battlefield. + // Whenever a time counter is removed from Benalish Commander while it's exiled, create a 1/1 white Soldier creature token. this.addAbility(new BenalishCommanderTriggeredAbility()); } @@ -119,4 +119,4 @@ class BenalishCommanderTriggeredAbility extends TriggeredAbilityImpl { return "Whenever a time counter is removed from {this} while it's exiled, " + super.getRule(); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/b/BenevolentOffering.java b/Mage.Sets/src/mage/cards/b/BenevolentOffering.java index db635be29b0..0e0c67a0862 100644 --- a/Mage.Sets/src/mage/cards/b/BenevolentOffering.java +++ b/Mage.Sets/src/mage/cards/b/BenevolentOffering.java @@ -55,7 +55,7 @@ public class BenevolentOffering extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{W}"); - // Choose an opponent. You and that player each put three 1/1 white Spirit creature tokens with flying onto the battlefield. + // Choose an opponent. You and that player each create three 1/1 white Spirit creature tokens with flying. this.getSpellAbility().addEffect(new BenevolentOfferingEffect1()); // Choose an opponent. You gain 2 life for each creature you control and that player gains 2 life for each creature he or she controls. @@ -76,7 +76,7 @@ class BenevolentOfferingEffect1 extends OneShotEffect { BenevolentOfferingEffect1() { super(Outcome.Sacrifice); - this.staticText = "Choose an opponent. You and that player each put three 1/1 white Spirit creature tokens with flying onto the battlefield"; + this.staticText = "Choose an opponent. You and that player each create three 1/1 white Spirit creature tokens with flying"; } BenevolentOfferingEffect1(final BenevolentOfferingEffect1 effect) { diff --git a/Mage.Sets/src/mage/cards/b/Benthicore.java b/Mage.Sets/src/mage/cards/b/Benthicore.java index f3226320865..87cab4b8c3c 100644 --- a/Mage.Sets/src/mage/cards/b/Benthicore.java +++ b/Mage.Sets/src/mage/cards/b/Benthicore.java @@ -69,7 +69,7 @@ public class Benthicore extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); - // When Benthicore enters the battlefield, put two 1/1 blue Merfolk Wizard creature tokens onto the battlefield. + // When Benthicore enters the battlefield, create two 1/1 blue Merfolk Wizard creature tokens. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new MerfolkWizardToken(), 2), false)); // Tap two untapped Merfolk you control: Untap Benthicore. It gains shroud until end of turn. diff --git a/Mage.Sets/src/mage/cards/b/BirthingHulk.java b/Mage.Sets/src/mage/cards/b/BirthingHulk.java index aabd93eee72..8de09ea216e 100644 --- a/Mage.Sets/src/mage/cards/b/BirthingHulk.java +++ b/Mage.Sets/src/mage/cards/b/BirthingHulk.java @@ -58,9 +58,9 @@ public class BirthingHulk extends CardImpl { // Devoid this.addAbility(new DevoidAbility(this.color)); - // When Birthing Hulk enters the battlefield, put two 1/1 colorless Eldrazi Scion creature tokens onto the battlefield. They have "Sacrifice this creature: Add {C} to your mana pool." + // When Birthing Hulk enters the battlefield, create two 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool." Effect effect = new CreateTokenEffect(new EldraziScionToken(), 2); - effect.setText("put two 1/1 colorless Eldrazi Scion creature tokens onto the battlefield. They have \"Sacrifice this creature: Add {C} to your mana pool.\""); + effect.setText("create two 1/1 colorless Eldrazi Scion creature tokens. They have \"Sacrifice this creature: Add {C} to your mana pool.\""); this.addAbility(new EntersBattlefieldTriggeredAbility(effect, false)); // {1}{C}: Regenerate Birthing Hulk. diff --git a/Mage.Sets/src/mage/cards/b/Bitterblossom.java b/Mage.Sets/src/mage/cards/b/Bitterblossom.java index ab18053b0cb..791b24ceda6 100644 --- a/Mage.Sets/src/mage/cards/b/Bitterblossom.java +++ b/Mage.Sets/src/mage/cards/b/Bitterblossom.java @@ -48,7 +48,7 @@ public class Bitterblossom extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.ENCHANTMENT},"{1}{B}"); this.subtype.add("Faerie"); - // At the beginning of your upkeep, you lose 1 life and put a 1/1 black Faerie Rogue creature token with flying onto the battlefield. + // At the beginning of your upkeep, you lose 1 life and create a 1/1 black Faerie Rogue creature token with flying. Ability ability = new BeginningOfUpkeepTriggeredAbility(new LoseLifeSourceControllerEffect(1), TargetController.YOU, false); ability.addEffect(new CreateTokenEffect(new FaerieRogueToken(), 1)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BladeSplicer.java b/Mage.Sets/src/mage/cards/b/BladeSplicer.java index fea9cbe6f55..c4ab6162667 100644 --- a/Mage.Sets/src/mage/cards/b/BladeSplicer.java +++ b/Mage.Sets/src/mage/cards/b/BladeSplicer.java @@ -66,7 +66,7 @@ public class BladeSplicer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // When Blade Splicer enters the battlefield, put a 3/3 colorless Golem artifact creature token onto the battlefield. + // When Blade Splicer enters the battlefield, create a 3/3 colorless Golem artifact creature token. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new GolemToken(expansionSetCode)))); // Golem creatures you control have first strike. diff --git a/Mage.Sets/src/mage/cards/b/BlazeCommando.java b/Mage.Sets/src/mage/cards/b/BlazeCommando.java index 877d6f7068b..3dbe026721c 100644 --- a/Mage.Sets/src/mage/cards/b/BlazeCommando.java +++ b/Mage.Sets/src/mage/cards/b/BlazeCommando.java @@ -61,7 +61,7 @@ public class BlazeCommando extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(3); - // Whenever an instant or sorcery spell you control deals damage, put two 1/1 red and white Soldier creature tokens with haste onto the battlefield. + // Whenever an instant or sorcery spell you control deals damage, create two 1/1 red and white Soldier creature tokens with haste. this.addAbility(new BlazeCommandoTriggeredAbility()); } diff --git a/Mage.Sets/src/mage/cards/b/BlightHerder.java b/Mage.Sets/src/mage/cards/b/BlightHerder.java index 5ebe08c357c..7d727400bb7 100644 --- a/Mage.Sets/src/mage/cards/b/BlightHerder.java +++ b/Mage.Sets/src/mage/cards/b/BlightHerder.java @@ -62,7 +62,7 @@ public class BlightHerder extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(5); - // When you cast Blight Herder, you may put two cards your opponents own from exile into their owners' graveyards. If you do, put three 1/1 colorless Eldrazi Scion creature tokens onto the battlefield. They have "Sacrifice this creature: Add {C} to your mana pool." + // When you cast Blight Herder, you may put two cards your opponents own from exile into their owners' graveyards. If you do, create three 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool." this.addAbility(new CastSourceTriggeredAbility(new BlightHerderEffect(), true)); } @@ -86,7 +86,7 @@ class BlightHerderEffect extends OneShotEffect { public BlightHerderEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "you may put two cards your opponents own from exile into their owners' graveyards. If you do, put three 1/1 colorless Eldrazi Scion creature tokens onto the battlefield. They have \"Sacrifice this creature: Add {C} to your mana pool."; + this.staticText = "you may put two cards your opponents own from exile into their owners' graveyards. If you do, create three 1/1 colorless Eldrazi Scion creature tokens. They have \"Sacrifice this creature: Add {C} to your mana pool."; } public BlightHerderEffect(final BlightHerderEffect effect) { diff --git a/Mage.Sets/src/mage/cards/b/Blisterpod.java b/Mage.Sets/src/mage/cards/b/Blisterpod.java index 10411eef2b7..eaae5b653fa 100644 --- a/Mage.Sets/src/mage/cards/b/Blisterpod.java +++ b/Mage.Sets/src/mage/cards/b/Blisterpod.java @@ -45,7 +45,7 @@ import mage.game.permanent.token.EldraziScionToken; public class Blisterpod extends CardImpl { public Blisterpod(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{G}"); this.subtype.add("Eldrazi"); this.subtype.add("Drone"); this.power = new MageInt(1); @@ -53,9 +53,9 @@ public class Blisterpod extends CardImpl { // Devoid this.addAbility(new DevoidAbility(this.color)); - // When Blisterpod dies, put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has "Sacrifice this creature: Add {C} to your mana pool." + // When Blisterpod dies, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool." Effect effect = new CreateTokenEffect(new EldraziScionToken()); - effect.setText("put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has \"Sacrifice this creature: Add {C} to your mana pool.\""); + effect.setText("Create a 1/1 colorless Eldrazi Scion creature token. It has \"Sacrifice this creature: Add {C} to your mana pool.\""); this.addAbility(new DiesTriggeredAbility(effect, false)); } diff --git a/Mage.Sets/src/mage/cards/b/BloodlineKeeper.java b/Mage.Sets/src/mage/cards/b/BloodlineKeeper.java index f57089b99ae..e42922aeae8 100644 --- a/Mage.Sets/src/mage/cards/b/BloodlineKeeper.java +++ b/Mage.Sets/src/mage/cards/b/BloodlineKeeper.java @@ -72,7 +72,7 @@ public class BloodlineKeeper extends CardImpl { this.secondSideCardClazz = LordOfLineage.class; this.addAbility(FlyingAbility.getInstance()); - // {T}: Put a 2/2 black Vampire creature token with flying onto the battlefield. + // {T}: Create a 2/2 black Vampire creature token with flying. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new VampireToken()), new TapSourceCost())); // {B}: Transform Bloodline Keeper. Activate this ability only if you control five or more Vampires. this.addAbility(new TransformAbility()); diff --git a/Mage.Sets/src/mage/cards/b/BoggartMob.java b/Mage.Sets/src/mage/cards/b/BoggartMob.java index c5566ff9d27..384899f394d 100644 --- a/Mage.Sets/src/mage/cards/b/BoggartMob.java +++ b/Mage.Sets/src/mage/cards/b/BoggartMob.java @@ -62,7 +62,7 @@ public class BoggartMob extends CardImpl { // Champion a Goblin this.addAbility(new ChampionAbility(this, "Goblin", false)); - // Whenever a Goblin you control deals combat damage to a player, you may put a 1/1 black Goblin Rogue creature token onto the battlefield. + // Whenever a Goblin you control deals combat damage to a player, you may create a 1/1 black Goblin Rogue creature token. this.addAbility(new DealsDamageToAPlayerAllTriggeredAbility( new CreateTokenEffect(new GoblinRogueToken()), filter, true, SetTargetPointer.NONE, true)); diff --git a/Mage.Sets/src/mage/cards/b/BorisDevilboon.java b/Mage.Sets/src/mage/cards/b/BorisDevilboon.java index 77900ed2e2c..f319e61bf3b 100644 --- a/Mage.Sets/src/mage/cards/b/BorisDevilboon.java +++ b/Mage.Sets/src/mage/cards/b/BorisDevilboon.java @@ -47,14 +47,14 @@ import mage.game.permanent.token.Token; public class BorisDevilboon extends CardImpl { public BorisDevilboon(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}{R}"); this.supertype.add("Legendary"); this.subtype.add("Zombie"); this.subtype.add("Wizard"); this.power = new MageInt(2); this.toughness = new MageInt(2); - // {2}{B}{R}, {tap}: Put a 1/1 black and red Demon creature token named Minor Demon onto the battlefield. + // {2}{B}{R}, {tap}: Create a 1/1 black and red Demon creature token named Minor Demon. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new MinorDemonToken()), new ManaCostsImpl("{2}{B}{R}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BottleOfSuleiman.java b/Mage.Sets/src/mage/cards/b/BottleOfSuleiman.java index 9af47421eb4..c379949865e 100644 --- a/Mage.Sets/src/mage/cards/b/BottleOfSuleiman.java +++ b/Mage.Sets/src/mage/cards/b/BottleOfSuleiman.java @@ -54,7 +54,7 @@ public class BottleOfSuleiman extends CardImpl { public BottleOfSuleiman(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); - // {1}, Sacrifice Bottle of Suleiman: Flip a coin. If you lose the flip, Bottle of Suleiman deals 5 damage to you. If you win the flip, put a 5/5 colorless Djinn artifact creature token with flying onto the battlefield. + // {1}, Sacrifice Bottle of Suleiman: Flip a coin. If you lose the flip, Bottle of Suleiman deals 5 damage to you. If you win the flip, create a 5/5 colorless Djinn artifact creature token with flying. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BottleOfSuleimanEffect(), new GenericManaCost(1)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); @@ -74,7 +74,7 @@ class BottleOfSuleimanEffect extends OneShotEffect { public BottleOfSuleimanEffect() { super(Outcome.PutCreatureInPlay); - staticText = "Flip a coin. If you lose the flip, {this} deals 5 damage to you. If you win the flip, put a 5/5 colorless Djinn artifact creature token with flying onto the battlefield."; + staticText = "Flip a coin. If you lose the flip, {this} deals 5 damage to you. If you win the flip, create a 5/5 colorless Djinn artifact creature token with flying."; } public BottleOfSuleimanEffect(final BottleOfSuleimanEffect effect) { diff --git a/Mage.Sets/src/mage/cards/b/BrambleElemental.java b/Mage.Sets/src/mage/cards/b/BrambleElemental.java index d52f9e31f2d..514507be7c7 100644 --- a/Mage.Sets/src/mage/cards/b/BrambleElemental.java +++ b/Mage.Sets/src/mage/cards/b/BrambleElemental.java @@ -49,7 +49,7 @@ public class BrambleElemental extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); - // Whenever an Aura becomes attached to Bramble Elemental, put two 1/1 green Saproling creature tokens onto the battlefield. + // Whenever an Aura becomes attached to Bramble Elemental, create two 1/1 green Saproling creature tokens. this.addAbility(new AuraAttachedTriggeredAbility(new CreateTokenEffect(new SaprolingToken(),2),false)); } diff --git a/Mage.Sets/src/mage/cards/b/BreedingPit.java b/Mage.Sets/src/mage/cards/b/BreedingPit.java index 0680c35e461..78a23badb70 100644 --- a/Mage.Sets/src/mage/cards/b/BreedingPit.java +++ b/Mage.Sets/src/mage/cards/b/BreedingPit.java @@ -55,7 +55,7 @@ public class BreedingPit extends CardImpl { // At the beginning of your upkeep, sacrifice Breeding Pit unless you pay {B}{B}. this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{B}{B}")), TargetController.YOU, false)); - // At the beginning of your end step, put a 0/1 black Thrull creature token onto the battlefield. + // At the beginning of your end step, create a 0/1 black Thrull creature token. this.addAbility(new BeginningOfYourEndStepTriggeredAbility(new CreateTokenEffect(new ThrullToken()), false)); } diff --git a/Mage.Sets/src/mage/cards/b/BriarbridgePatrol.java b/Mage.Sets/src/mage/cards/b/BriarbridgePatrol.java index 6ac724707fa..a7442751190 100644 --- a/Mage.Sets/src/mage/cards/b/BriarbridgePatrol.java +++ b/Mage.Sets/src/mage/cards/b/BriarbridgePatrol.java @@ -59,7 +59,7 @@ public class BriarbridgePatrol extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - // Whenever Briarbridge Patrol deals damage to one or more creatures, investigate (Put a colorless Clue artifact token onto the battlefield with "2, Sacrifice this artifact: Draw a card."). + // Whenever Briarbridge Patrol deals damage to one or more creatures, investigate (Create a colorless Clue artifact token with "2, Sacrifice this artifact: Draw a card."). this.addAbility(new DealsDamageToOneOrMoreCreaturesTriggeredAbility(new InvestigateEffect(), false, false, false)); // At the beginning of each end step, if you sacrificed three or more Clues this turn, you may put a creature card from your hand onto the battlefield. this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new PutPermanentOnBattlefieldEffect(new FilterCreatureCard("a creature card")), TargetController.ANY, diff --git a/Mage.Sets/src/mage/cards/b/BridgeFromBelow.java b/Mage.Sets/src/mage/cards/b/BridgeFromBelow.java index 2435f680594..8c5dcb5ee01 100644 --- a/Mage.Sets/src/mage/cards/b/BridgeFromBelow.java +++ b/Mage.Sets/src/mage/cards/b/BridgeFromBelow.java @@ -68,7 +68,7 @@ public class BridgeFromBelow extends CardImpl { public BridgeFromBelow(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{B}{B}{B}"); - // Whenever a nontoken creature is put into your graveyard from the battlefield, if Bridge from Below is in your graveyard, put a 2/2 black Zombie creature token onto the battlefield. + // Whenever a nontoken creature is put into your graveyard from the battlefield, if Bridge from Below is in your graveyard, create a 2/2 black Zombie creature token. this.addAbility(new BridgeFromBelowAbility(new CreateTokenEffect(new ZombieToken()), filter1)); // When a creature is put into an opponent's graveyard from the battlefield, if Bridge from Below is in your graveyard, exile Bridge from Below. this.addAbility(new BridgeFromBelowAbility(new ExileSourceEffect(), filter2)); diff --git a/Mage.Sets/src/mage/cards/b/BrimazKingOfOreskos.java b/Mage.Sets/src/mage/cards/b/BrimazKingOfOreskos.java index 336da953645..bec5c8b334f 100644 --- a/Mage.Sets/src/mage/cards/b/BrimazKingOfOreskos.java +++ b/Mage.Sets/src/mage/cards/b/BrimazKingOfOreskos.java @@ -64,10 +64,10 @@ public class BrimazKingOfOreskos extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); - // Whenever Brimaz, King of Oreskos attacks, put a 1/1 white Cat Soldier creature token with vigilance onto the battlefield attacking. + // Whenever Brimaz, King of Oreskos attacks, create a 1/1 white Cat Soldier creature token with vigilance attacking. this.addAbility(new AttacksTriggeredAbility(new CreateTokenEffect(new CatSoldierCreatureToken(), 1, false, true), false)); - // Whenever Brimaz blocks a creature, put a 1/1 white Cat Soldier creature token with vigilance onto the battlefield blocking that creature. + // Whenever Brimaz blocks a creature, create a 1/1 white Cat Soldier creature token with vigilance blocking that creature. this.addAbility(new BlocksCreatureTriggeredAbility(new BrimazKingOfOreskosEffect(), false, true)); } @@ -85,7 +85,7 @@ class BrimazKingOfOreskosEffect extends OneShotEffect { public BrimazKingOfOreskosEffect() { super(Outcome.Benefit); - this.staticText = "put a 1/1 white Cat Soldier creature token with vigilance onto the battlefield blocking that creature"; + this.staticText = "create a 1/1 white Cat Soldier creature token with vigilance blocking that creature"; } public BrimazKingOfOreskosEffect(final BrimazKingOfOreskosEffect effect) { @@ -107,7 +107,7 @@ class BrimazKingOfOreskosEffect extends OneShotEffect { Permanent attackingCreature = game.getPermanent(getTargetPointer().getFirst(game, source)); if (attackingCreature != null && game.getState().getCombat() != null) { // Possible ruling (see Aetherplasm) - // The token you put onto the battlefield is blocking the attacking creature, + // The token you created is blocking the attacking creature, // even if the block couldn't legally be declared (for example, if that creature // enters the battlefield tapped, or it can't block, or the attacking creature // has protection from it) diff --git a/Mage.Sets/src/mage/cards/b/BrindleShoat.java b/Mage.Sets/src/mage/cards/b/BrindleShoat.java index fab45d3e5fc..49eb6c7d42f 100644 --- a/Mage.Sets/src/mage/cards/b/BrindleShoat.java +++ b/Mage.Sets/src/mage/cards/b/BrindleShoat.java @@ -49,7 +49,7 @@ public class BrindleShoat extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // When Brindle Shoat dies, put a 3/3 green Boar creature token onto the battlefield. + // When Brindle Shoat dies, create a 3/3 green Boar creature token. this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new BoarToken()))); } diff --git a/Mage.Sets/src/mage/cards/b/BringerOfTheGreenDawn.java b/Mage.Sets/src/mage/cards/b/BringerOfTheGreenDawn.java index a3a3bcb42ee..8b4eba3e484 100644 --- a/Mage.Sets/src/mage/cards/b/BringerOfTheGreenDawn.java +++ b/Mage.Sets/src/mage/cards/b/BringerOfTheGreenDawn.java @@ -59,7 +59,7 @@ public class BringerOfTheGreenDawn extends CardImpl { this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl("{W}{U}{B}{R}{G}"))); // Trample this.addAbility(TrampleAbility.getInstance()); - // At the beginning of your upkeep,s you may put a 3/3 green Beast creature token onto the battlefield. + // At the beginning of your upkeep,s you may create a 3/3 green Beast creature token. Ability ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new BeastToken()), TargetController.YOU, true); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BroodBirthing.java b/Mage.Sets/src/mage/cards/b/BroodBirthing.java index 19acd2000d1..288ceb9cf65 100644 --- a/Mage.Sets/src/mage/cards/b/BroodBirthing.java +++ b/Mage.Sets/src/mage/cards/b/BroodBirthing.java @@ -66,7 +66,7 @@ class BroodBirthingEffect extends OneShotEffect { public BroodBirthingEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "If you control an Eldrazi Spawn, put three 0/1 colorless Eldrazi Spawn creature tokens onto the battlefield. They have \"Sacrifice this creature: Add {C} to your mana pool.\" Otherwise, put one of those tokens onto the battlefield"; + this.staticText = "If you control an Eldrazi Spawn, create three 0/1 colorless Eldrazi Spawn creature tokens. They have \"Sacrifice this creature: Add {C} to your mana pool.\" Otherwise, create one of those tokens"; } public BroodBirthingEffect(final BroodBirthingEffect effect) { diff --git a/Mage.Sets/src/mage/cards/b/BroodButcher.java b/Mage.Sets/src/mage/cards/b/BroodButcher.java index 9230f9927d0..d9bc0fb310b 100644 --- a/Mage.Sets/src/mage/cards/b/BroodButcher.java +++ b/Mage.Sets/src/mage/cards/b/BroodButcher.java @@ -65,7 +65,7 @@ public class BroodButcher extends CardImpl { // Devoid this.addAbility(new DevoidAbility(this.color)); - // When Brood Butcher enters the battlefield, put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has "Sacrifice this creature: Add {C} to your mana pool." + // When Brood Butcher enters the battlefield, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool." this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new EldraziScionToken()), false)); // {B}{G}, Sacrifice a creature: Target creature gets -2/-2 until end of turn. diff --git a/Mage.Sets/src/mage/cards/b/BroodKeeper.java b/Mage.Sets/src/mage/cards/b/BroodKeeper.java index bbd37fae90d..4aa0e872113 100644 --- a/Mage.Sets/src/mage/cards/b/BroodKeeper.java +++ b/Mage.Sets/src/mage/cards/b/BroodKeeper.java @@ -57,10 +57,10 @@ public class BroodKeeper extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(3); - // Whenever an Aura becomes attached to Brood Keeper, put a 2/2 red Dragon creature token with flying onto the battlefield. + // Whenever an Aura becomes attached to Brood Keeper, create a 2/2 red Dragon creature token with flying. // It has "{R}: This creature gets +1/+0 until end of turn." Effect effect = new CreateTokenEffect(new BroodKeeperDragonToken()); - effect.setText("put a 2/2 red Dragon creature token with flying onto the battlefield. It has \"{R}: This creature gets +1/+0 until end of turn.\""); + effect.setText("create a 2/2 red Dragon creature token with flying. It has \"{R}: This creature gets +1/+0 until end of turn.\""); this.addAbility(new AuraAttachedTriggeredAbility(effect, false)); } diff --git a/Mage.Sets/src/mage/cards/b/BroodMonitor.java b/Mage.Sets/src/mage/cards/b/BroodMonitor.java index fe9213aa30d..21e9c0afb03 100644 --- a/Mage.Sets/src/mage/cards/b/BroodMonitor.java +++ b/Mage.Sets/src/mage/cards/b/BroodMonitor.java @@ -53,9 +53,9 @@ public class BroodMonitor extends CardImpl { // Devoid this.addAbility(new DevoidAbility(this.color)); - // When Brood Monitor enters the battlefield, put three 1/1 colorless Eldrazi Scion creature tokens onto the battlefield. They have "Sacrifice this creature: Add {C} to your mana pool." + // When Brood Monitor enters the battlefield, create three 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool." Effect effect = new CreateTokenEffect(new EldraziScionToken(), 3); - effect.setText("put three 1/1 colorless Eldrazi Scion creature tokens onto the battlefield. They have \"Sacrifice this creature: Add {C} to your mana pool.\""); + effect.setText("create three 1/1 colorless Eldrazi Scion creature tokens. They have \"Sacrifice this creature: Add {C} to your mana pool.\""); this.addAbility(new EntersBattlefieldTriggeredAbility(effect, false)); } diff --git a/Mage.Sets/src/mage/cards/b/BroodSliver.java b/Mage.Sets/src/mage/cards/b/BroodSliver.java index 0933546136e..034c65de114 100644 --- a/Mage.Sets/src/mage/cards/b/BroodSliver.java +++ b/Mage.Sets/src/mage/cards/b/BroodSliver.java @@ -49,13 +49,13 @@ import mage.players.Player; public class BroodSliver extends CardImpl { public BroodSliver(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{G}"); this.subtype.add("Sliver"); this.power = new MageInt(3); this.toughness = new MageInt(3); - // Whenever a Sliver deals combat damage to a player, its controller may put a 1/1 colorless Sliver creature token onto the battlefield. + // Whenever a Sliver deals combat damage to a player, its controller may create a 1/1 colorless Sliver creature token. this.addAbility(new DealsDamageToAPlayerAllTriggeredAbility(new BroodSliverEffect(), new FilterCreaturePermanent("Sliver", "a Sliver"), false, SetTargetPointer.PLAYER, true)); } @@ -74,7 +74,7 @@ class BroodSliverEffect extends OneShotEffect { public BroodSliverEffect() { super(Outcome.PutCardInPlay); - this.staticText = "its controller may put a 1/1 colorless Sliver creature token onto the battlefield"; + this.staticText = "its controller may create a 1/1 colorless Sliver creature token"; } public BroodSliverEffect(final BroodSliverEffect effect) { @@ -90,7 +90,7 @@ class BroodSliverEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player permanentController = game.getPlayer(getTargetPointer().getFirst(game, source)); if (permanentController != null) { - if (permanentController.chooseUse(outcome, "put a 1/1 colorless Sliver creature token onto the battlefield", source, game)) { + if (permanentController.chooseUse(outcome, "create a 1/1 colorless Sliver creature token", source, game)) { return new SliverToken().putOntoBattlefield(1, game, source.getSourceId(), permanentController.getId()); } return true; diff --git a/Mage.Sets/src/mage/cards/b/BroodhatchNantuko.java b/Mage.Sets/src/mage/cards/b/BroodhatchNantuko.java index 0b9b4332fe0..468c61fd0fd 100644 --- a/Mage.Sets/src/mage/cards/b/BroodhatchNantuko.java +++ b/Mage.Sets/src/mage/cards/b/BroodhatchNantuko.java @@ -57,7 +57,7 @@ public class BroodhatchNantuko extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // Whenever Broodhatch Nantuko is dealt damage, you may put that many 1/1 green Insect creature tokens onto the battlefield. + // Whenever Broodhatch Nantuko is dealt damage, you may create that many 1/1 green Insect creature tokens. this.addAbility(new DealtDamageToSourceTriggeredAbility(Zone.BATTLEFIELD, new BroodhatchNantukoDealDamageEffect(), true)); // Morph {2}{G} this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{G}"))); @@ -77,7 +77,7 @@ class BroodhatchNantukoDealDamageEffect extends OneShotEffect { public BroodhatchNantukoDealDamageEffect() { super(Outcome.Damage); - this.staticText = "put that many 1/1 green Insect creature tokens onto the battlefield"; + this.staticText = "create that many 1/1 green Insect creature tokens"; } public BroodhatchNantukoDealDamageEffect(final BroodhatchNantukoDealDamageEffect effect) { diff --git a/Mage.Sets/src/mage/cards/b/BudokaGardener.java b/Mage.Sets/src/mage/cards/b/BudokaGardener.java index 70bc3229517..856048d3bd7 100644 --- a/Mage.Sets/src/mage/cards/b/BudokaGardener.java +++ b/Mage.Sets/src/mage/cards/b/BudokaGardener.java @@ -59,7 +59,7 @@ import mage.players.Player; public class BudokaGardener extends CardImpl { public BudokaGardener(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{G}"); this.subtype.add("Human"); this.subtype.add("Monk"); @@ -113,7 +113,7 @@ class BudokaGardenerEffect extends OneShotEffect { return new BudokaGardenerEffect(this); } - } +} class DokaiWeaverofLife extends Token { @@ -127,7 +127,7 @@ class DokaiWeaverofLife extends Token { power = new MageInt(3); toughness = new MageInt(3); - // {4}{G}{G}, {T}: Put an X/X green Elemental creature token onto the battlefield, where X is the number of lands you control. + // {4}{G}{G}, {T}: Create an X/X green Elemental creature token, where X is the number of lands you control. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new DokaiWeaverofLifeToken()), new ManaCostsImpl("{4}{G}{G}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); @@ -135,11 +135,11 @@ class DokaiWeaverofLife extends Token { } class DokaiWeaverofLifeToken extends Token { - + final static FilterControlledPermanent filterLands = new FilterControlledLandPermanent("lands you control"); DokaiWeaverofLifeToken() { - super("Elemental", "a X/X green Elemental creature token onto the battlefield, where X is the number of lands you control"); + super("Elemental", "a X/X green Elemental creature token, where X is the number of lands you control"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add("Elemental"); diff --git a/Mage.Sets/src/mage/cards/c/CacklingCounterpart.java b/Mage.Sets/src/mage/cards/c/CacklingCounterpart.java index b01b4e50a85..22c7c059e95 100644 --- a/Mage.Sets/src/mage/cards/c/CacklingCounterpart.java +++ b/Mage.Sets/src/mage/cards/c/CacklingCounterpart.java @@ -45,7 +45,7 @@ public class CacklingCounterpart extends CardImpl { public CacklingCounterpart(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{U}{U}"); - // Put a token onto the battlefield that's a copy of target creature you control. + // Create a token that's a copy of target creature you control. this.getSpellAbility().addEffect(new PutTokenOntoBattlefieldCopyTargetEffect()); this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/c/CallOfTheConclave.java b/Mage.Sets/src/mage/cards/c/CallOfTheConclave.java index 88914ad93d0..c91cfd05ae9 100644 --- a/Mage.Sets/src/mage/cards/c/CallOfTheConclave.java +++ b/Mage.Sets/src/mage/cards/c/CallOfTheConclave.java @@ -44,7 +44,7 @@ public class CallOfTheConclave extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{G}{W}"); - // Put a 3/3 green Centaur creature token onto the battlefield. + // Create a 3/3 green Centaur creature token. this.getSpellAbility().addEffect(new CreateTokenEffect(new CentaurToken())); } diff --git a/Mage.Sets/src/mage/cards/c/CallOfTheHerd.java b/Mage.Sets/src/mage/cards/c/CallOfTheHerd.java index 31341165cec..d60fdbfe279 100644 --- a/Mage.Sets/src/mage/cards/c/CallOfTheHerd.java +++ b/Mage.Sets/src/mage/cards/c/CallOfTheHerd.java @@ -48,7 +48,7 @@ public class CallOfTheHerd extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{G}"); - // Put a 3/3 green Elephant creature token onto the battlefield. + // Create a 3/3 green Elephant creature token. this.getSpellAbility().addEffect(new CreateTokenEffect(new ElephantToken())); // Flashback {3}{G} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{3}{G}"), TimingRule.SORCERY)); diff --git a/Mage.Sets/src/mage/cards/c/CallOfTheNightwing.java b/Mage.Sets/src/mage/cards/c/CallOfTheNightwing.java index f6686ec91ba..8956264dfe1 100644 --- a/Mage.Sets/src/mage/cards/c/CallOfTheNightwing.java +++ b/Mage.Sets/src/mage/cards/c/CallOfTheNightwing.java @@ -47,7 +47,7 @@ public class CallOfTheNightwing extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{U}{B}"); - // Put a 1/1/ blue and black Horror creature token with flying onto the battlefield. + // Create a 1/1/ blue and black Horror creature token with flying. this.getSpellAbility().addEffect(new CreateTokenEffect(new NightwingHorrorToken(),1)); // Cipher (Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.) diff --git a/Mage.Sets/src/mage/cards/c/CallTheBloodline.java b/Mage.Sets/src/mage/cards/c/CallTheBloodline.java index 18f56ddbfae..1a5fd001673 100644 --- a/Mage.Sets/src/mage/cards/c/CallTheBloodline.java +++ b/Mage.Sets/src/mage/cards/c/CallTheBloodline.java @@ -48,7 +48,7 @@ public class CallTheBloodline extends CardImpl { public CallTheBloodline(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{B}"); - // {1}, Discard a card: Put a 1/1 black Vampire Knight token with lifelink onto the battlefield. Activate this ability only once each turn. + // {1}, Discard a card: Create a 1/1 black Vampire Knight token with lifelink. Activate this ability only once each turn. Ability ability = new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new VampireKnightToken()), new GenericManaCost(1)); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CallTheScions.java b/Mage.Sets/src/mage/cards/c/CallTheScions.java index 5e939877e55..1801eae114e 100644 --- a/Mage.Sets/src/mage/cards/c/CallTheScions.java +++ b/Mage.Sets/src/mage/cards/c/CallTheScions.java @@ -50,9 +50,9 @@ public class CallTheScions extends CardImpl { Ability ability = new DevoidAbility(this.color); ability.setRuleAtTheTop(true); this.addAbility(ability); - // Put two 1/1 colorless Eldrazi Scion creature tokens onto the battlefield. They have "Sacrifice this creature: add {C} to your mana pool." + // Create two 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: add {C} to your mana pool." Effect effect = new CreateTokenEffect(new EldraziScionToken(), 2); - effect.setText("put two 1/1 colorless Eldrazi Scion creature tokens onto the battlefield. They have \"Sacrifice this creature: Add {C} to your mana pool.\""); + effect.setText("create two 1/1 colorless Eldrazi Scion creature tokens. They have \"Sacrifice this creature: Add {C} to your mana pool.\""); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/cards/c/CallTheSkybreaker.java b/Mage.Sets/src/mage/cards/c/CallTheSkybreaker.java index 7aabb1fbc17..ebfe77eb382 100644 --- a/Mage.Sets/src/mage/cards/c/CallTheSkybreaker.java +++ b/Mage.Sets/src/mage/cards/c/CallTheSkybreaker.java @@ -47,7 +47,7 @@ public class CallTheSkybreaker extends CardImpl { public CallTheSkybreaker(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{5}{U/R}{U/R}"); - // Put a 5/5 blue and red Elemental creature token with flying onto the battlefield. + // Create a 5/5 blue and red Elemental creature token with flying. this.getSpellAbility().addEffect(new CreateTokenEffect(new ElementalToken())); // Retrace diff --git a/Mage.Sets/src/mage/cards/c/CallerOfTheClaw.java b/Mage.Sets/src/mage/cards/c/CallerOfTheClaw.java index 9bb919d784b..63032c8be5d 100644 --- a/Mage.Sets/src/mage/cards/c/CallerOfTheClaw.java +++ b/Mage.Sets/src/mage/cards/c/CallerOfTheClaw.java @@ -64,7 +64,7 @@ public class CallerOfTheClaw extends CardImpl { // Flash this.addAbility(FlashAbility.getInstance()); - // When Caller of the Claw enters the battlefield, put a 2/2 green Bear creature token onto the battlefield for each nontoken creature put into your graveyard from the battlefield this turn. + // When Caller of the Claw enters the battlefield, create a 2/2 green Bear creature token for each nontoken creature put into your graveyard from the battlefield this turn. this.getSpellAbility().addWatcher(new CallerOfTheClawWatcher()); Effect effect = new CreateTokenEffect(new BearToken(), new CallerOfTheClawDynamicValue()); this.addAbility(new EntersBattlefieldTriggeredAbility(effect)); diff --git a/Mage.Sets/src/mage/cards/c/CallerOfThePack.java b/Mage.Sets/src/mage/cards/c/CallerOfThePack.java index 23a4ec55c56..a3da11668f4 100644 --- a/Mage.Sets/src/mage/cards/c/CallerOfThePack.java +++ b/Mage.Sets/src/mage/cards/c/CallerOfThePack.java @@ -50,7 +50,7 @@ public class CallerOfThePack extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); - // Myriad (Whenever this creature attacks, for each opponent other than the defending player, put a token that's a copy of this creature onto the battlefield tapped and attacking that player or a planeswalker he or she controls. Exile those tokens at the end of combat.) + // Myriad (Whenever this creature attacks, for each opponent other than the defending player, create a token that's a copy of this creature tapped and attacking that player or a planeswalker he or she controls. Exile those tokens at the end of combat.) this.addAbility(new MyriadAbility()); } diff --git a/Mage.Sets/src/mage/cards/c/CaptainsCall.java b/Mage.Sets/src/mage/cards/c/CaptainsCall.java index c3e86671fb2..448341fe6f1 100644 --- a/Mage.Sets/src/mage/cards/c/CaptainsCall.java +++ b/Mage.Sets/src/mage/cards/c/CaptainsCall.java @@ -47,7 +47,7 @@ public class CaptainsCall extends CardImpl { @Override public void build() { - // Put three 1/1 white Soldier creature tokens onto the battlefield. + // Create three 1/1 white Soldier creature tokens. this.getSpellAbility().addEffect(new CreateTokenEffect(new SoldierToken(), 3)); } diff --git a/Mage.Sets/src/mage/cards/c/CaptainsClaws.java b/Mage.Sets/src/mage/cards/c/CaptainsClaws.java index 99f4e3b8915..69c974aeb6d 100644 --- a/Mage.Sets/src/mage/cards/c/CaptainsClaws.java +++ b/Mage.Sets/src/mage/cards/c/CaptainsClaws.java @@ -54,7 +54,7 @@ public class CaptainsClaws extends CardImpl { // Equipped creature gets +1/+0. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 0))); - // Whenever equipped creature attacks, put a 1/1 white Kor Ally creature token onto the battlefield tapped and attacking. + // Whenever equipped creature attacks, create a 1/1 white Kor Ally creature token tapped and attacking. this.addAbility(new AttacksAttachedTriggeredAbility(new CreateTokenEffect(new KorAllyToken(), 1, true, true))); // Equip {1} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(1))); diff --git a/Mage.Sets/src/mage/cards/c/CaribouRange.java b/Mage.Sets/src/mage/cards/c/CaribouRange.java index 67fe34853ac..da0daec4f05 100644 --- a/Mage.Sets/src/mage/cards/c/CaribouRange.java +++ b/Mage.Sets/src/mage/cards/c/CaribouRange.java @@ -70,7 +70,7 @@ public class CaribouRange extends CardImpl { } public CaribouRange(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{W}"); this.subtype.add("Aura"); // Enchant land you control @@ -79,15 +79,15 @@ public class CaribouRange extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // Enchanted land has "{W}{W}, {T}: Put a 0/1 white Caribou creature token onto the battlefield." + // Enchanted land has "{W}{W}, {T}: Create a 0/1 white Caribou creature token." ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CaribouToken()), new ManaCostsImpl("{W}{W}")); ability.addCost(new TapSourceCost()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); - effect.setText("Enchanted land has \"{W}{W}, {T}: Put a 0/1 white Caribou creature token onto the battlefield.\""); + effect.setText("Enchanted land has \"{W}{W}, {T}: Create a 0/1 white Caribou creature token.\""); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); // Sacrifice a Caribou token: You gain 1 life. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), - new SacrificeTargetCost(new TargetControlledCreaturePermanent(filter)))); + new SacrificeTargetCost(new TargetControlledCreaturePermanent(filter)))); } public CaribouRange(final CaribouRange card) { diff --git a/Mage.Sets/src/mage/cards/c/CarrierThrall.java b/Mage.Sets/src/mage/cards/c/CarrierThrall.java index dd37f8cf644..6a2f82f2ddf 100644 --- a/Mage.Sets/src/mage/cards/c/CarrierThrall.java +++ b/Mage.Sets/src/mage/cards/c/CarrierThrall.java @@ -44,14 +44,14 @@ import mage.game.permanent.token.EldraziScionToken; public class CarrierThrall extends CardImpl { public CarrierThrall(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B}"); this.subtype.add("Vampire"); this.power = new MageInt(2); this.toughness = new MageInt(1); - // When Carrier Thrall dies, put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has "Sacrifice this creature. Add {C} to your mana pool." + // When Carrier Thrall dies, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature. Add {C} to your mana pool." Effect effect = new CreateTokenEffect(new EldraziScionToken()); - effect.setText("put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has \"Sacrifice this creature: Add {C} to your mana pool.\""); + effect.setText("create a 1/1 colorless Eldrazi Scion creature token. It has \"Sacrifice this creature: Add {C} to your mana pool.\""); this.addAbility(new DiesTriggeredAbility(effect, false)); } diff --git a/Mage.Sets/src/mage/cards/c/CarrionCall.java b/Mage.Sets/src/mage/cards/c/CarrionCall.java index c440a8d773e..a025c6e16ca 100644 --- a/Mage.Sets/src/mage/cards/c/CarrionCall.java +++ b/Mage.Sets/src/mage/cards/c/CarrionCall.java @@ -44,7 +44,7 @@ public class CarrionCall extends CardImpl { public CarrionCall (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{G}"); - // Put two 1/1 green Insect creature tokens with infect onto the battlefield. (They deal damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.) + // Create two 1/1 green Insect creature tokens with lifelink. (They deal damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.) this.getSpellAbility().addEffect(new CreateTokenEffect(new InsectInfectToken(), 2)); } diff --git a/Mage.Sets/src/mage/cards/c/CatacombSifter.java b/Mage.Sets/src/mage/cards/c/CatacombSifter.java index 6c739f80d1a..d2ac32347e4 100644 --- a/Mage.Sets/src/mage/cards/c/CatacombSifter.java +++ b/Mage.Sets/src/mage/cards/c/CatacombSifter.java @@ -65,7 +65,7 @@ public class CatacombSifter extends CardImpl { // Devoid this.addAbility(new DevoidAbility(this.color)); - // When Catacomb Sifter enters the battlefield, put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has "Sacrifice this creature: Add {C} to your mana pool." + // When Catacomb Sifter enters the battlefield, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool." this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new EldraziScionToken()))); // Whenever another creature you control dies, scry 1 diff --git a/Mage.Sets/src/mage/cards/c/CellarDoor.java b/Mage.Sets/src/mage/cards/c/CellarDoor.java index 1fa7c74041a..d07787870e9 100644 --- a/Mage.Sets/src/mage/cards/c/CellarDoor.java +++ b/Mage.Sets/src/mage/cards/c/CellarDoor.java @@ -51,9 +51,9 @@ import mage.target.TargetPlayer; public class CellarDoor extends CardImpl { public CellarDoor(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); - // {3}, {tap}: Target player puts the bottom card of his or her library into his or her graveyard. If it's a creature card, you put a 2/2 black Zombie creature token onto the battlefield. + // {3}, {tap}: Target player puts the bottom card of his or her library into his or her graveyard. If it's a creature card, you create a 2/2 black Zombie creature token. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CellarDoorEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); @@ -74,7 +74,7 @@ class CellarDoorEffect extends OneShotEffect { public CellarDoorEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Target player puts the bottom card of his or her library into his or her graveyard. If it's a creature card, you put a 2/2 black Zombie creature token onto the battlefield"; + this.staticText = "Target player puts the bottom card of his or her library into his or her graveyard. If it's a creature card, you create a 2/2 black Zombie creature token"; } public CellarDoorEffect(final CellarDoorEffect effect) { diff --git a/Mage.Sets/src/mage/cards/c/CemeteryReaper.java b/Mage.Sets/src/mage/cards/c/CemeteryReaper.java index 7af04b04b63..dd567a9a7a4 100644 --- a/Mage.Sets/src/mage/cards/c/CemeteryReaper.java +++ b/Mage.Sets/src/mage/cards/c/CemeteryReaper.java @@ -68,7 +68,7 @@ public class CemeteryReaper extends CardImpl { // Other Zombie creatures you control get +1/+1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); - // {2}{B}, {T} : Exile target creature card from a graveyard. Put a 2/2 black Zombie creature token onto the battlefield. + // {2}{B}, {T} : Exile target creature card from a graveyard. Create a 2/2 black Zombie creature token. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl("{2}{B}")); ability.addCost(new TapSourceCost()); ability.addEffect(new CreateTokenEffect(new ZombieToken())); diff --git a/Mage.Sets/src/mage/cards/c/CennsEnlistment.java b/Mage.Sets/src/mage/cards/c/CennsEnlistment.java index 6353db7d754..ce7cd03a5e7 100644 --- a/Mage.Sets/src/mage/cards/c/CennsEnlistment.java +++ b/Mage.Sets/src/mage/cards/c/CennsEnlistment.java @@ -44,7 +44,7 @@ public class CennsEnlistment extends CardImpl { public CennsEnlistment(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{W}"); - // Put two 1/1 white Kithkin Soldier creature tokens onto the battlefield. + // Create two 1/1 white Kithkin Soldier creature tokens. this.getSpellAbility().addEffect(new CreateTokenEffect(new KithkinToken(), 2)); // Retrace diff --git a/Mage.Sets/src/mage/cards/c/CentaurGlade.java b/Mage.Sets/src/mage/cards/c/CentaurGlade.java index 4e8288b906c..e17adfb2be6 100644 --- a/Mage.Sets/src/mage/cards/c/CentaurGlade.java +++ b/Mage.Sets/src/mage/cards/c/CentaurGlade.java @@ -46,7 +46,7 @@ public class CentaurGlade extends CardImpl { public CentaurGlade(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{G}{G}"); - // {2}{G}{G}: Put a 3/3 green Centaur creature token onto the battlefield. + // {2}{G}{G}: Create a 3/3 green Centaur creature token. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CentaurToken(), 1), new ManaCostsImpl("{2}{G}{G}"))); } diff --git a/Mage.Sets/src/mage/cards/c/CentaursHerald.java b/Mage.Sets/src/mage/cards/c/CentaursHerald.java index e240b256479..d2b64c8dc9b 100644 --- a/Mage.Sets/src/mage/cards/c/CentaursHerald.java +++ b/Mage.Sets/src/mage/cards/c/CentaursHerald.java @@ -55,7 +55,7 @@ public class CentaursHerald extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(1); - // {2}{G}, Sacrifice Centaur's Herald: Put a 3/3 green Centaur creature token onto the battlefield. + // {2}{G}, Sacrifice Centaur's Herald: Create a 3/3 green Centaur creature token. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CentaurToken()), new ManaCostsImpl("{2}{G}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/ChancellorOfTheForge.java b/Mage.Sets/src/mage/cards/c/ChancellorOfTheForge.java index 0680e69ebf0..9f57b3b41d2 100644 --- a/Mage.Sets/src/mage/cards/c/ChancellorOfTheForge.java +++ b/Mage.Sets/src/mage/cards/c/ChancellorOfTheForge.java @@ -52,7 +52,7 @@ import mage.game.permanent.token.GoblinTokenWithHaste; */ public class ChancellorOfTheForge extends CardImpl { - private static String abilityText = "at the beginning of the first upkeep, put a 1/1 red Goblin creature token with haste onto the battlefield"; + private static String abilityText = "at the beginning of the first upkeep, create a 1/1 red Goblin creature token with haste"; private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures you control"); static { @@ -66,10 +66,10 @@ public class ChancellorOfTheForge extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); - // You may reveal this card from your opening hand. If you do, at the beginning of the first upkeep, put a 1/1 red Goblin creature token with haste onto the battlefield. + // You may reveal this card from your opening hand. If you do, at the beginning of the first upkeep, create a 1/1 red Goblin creature token with haste. this.addAbility(new ChancellorAbility(new ChancellorOfTheForgeDelayedTriggeredAbility(), abilityText)); - // When Chancellor of the Forge enters the battlefield, put X 1/1 red Goblin creature tokens with haste onto the battlefield, where X is the number of creatures you control. + // When Chancellor of the Forge enters the battlefield, create X 1/1 red Goblin creature tokens with haste, where X is the number of creatures you control. DynamicValue value = new PermanentsOnBattlefieldCount(filter); this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new GoblinTokenWithHaste(), value), false)); } diff --git a/Mage.Sets/src/mage/cards/c/ChandraFlamecaller.java b/Mage.Sets/src/mage/cards/c/ChandraFlamecaller.java index 4ed1977fb87..3a59ff65eb6 100644 --- a/Mage.Sets/src/mage/cards/c/ChandraFlamecaller.java +++ b/Mage.Sets/src/mage/cards/c/ChandraFlamecaller.java @@ -68,7 +68,7 @@ public class ChandraFlamecaller extends CardImpl { this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(4)); - // +1: Put two 3/1 red Elemental creature tokens with haste onto the battlefield. Exile them at the beginning of the next end step. + // +1: Create two 3/1 red Elemental creature tokens with haste. Exile them at the beginning of the next end step. this.addAbility(new LoyaltyAbility(new ChandraElementalEffect(), 1)); // 0: Discard all the cards in your hand, then draw that many cards plus one. @@ -92,7 +92,7 @@ class ChandraElementalEffect extends OneShotEffect { public ChandraElementalEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Put two 3/1 red Elemental creature tokens with haste onto the battlefield. Exile them at the beginning of the next end step"; + this.staticText = "Create two 3/1 red Elemental creature tokens with haste. Exile them at the beginning of the next end step"; } public ChandraElementalEffect(final ChandraElementalEffect effect) { diff --git a/Mage.Sets/src/mage/cards/c/ChasmSkulker.java b/Mage.Sets/src/mage/cards/c/ChasmSkulker.java index 67d20893036..7cd76f4f28b 100644 --- a/Mage.Sets/src/mage/cards/c/ChasmSkulker.java +++ b/Mage.Sets/src/mage/cards/c/ChasmSkulker.java @@ -64,7 +64,7 @@ public class ChasmSkulker extends CardImpl { // Whenever you draw a card, put a +1/+1 counter on Chasm Skulker. this.addAbility(new DrawCardControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false)); - // When Chasm Skulker dies, put X 1/1 blue Squid creature tokens with islandwalk onto the battlefield, where X is the number of +1/+1 counters on Chasm Skulker. + // When Chasm Skulker dies, create X 1/1 blue Squid creature tokens with islandwalk, where X is the number of +1/+1 counters on Chasm Skulker. this.addAbility(new DiesTriggeredAbility(new ChasmSkulkerEffect(), false)); } @@ -82,7 +82,7 @@ class ChasmSkulkerEffect extends OneShotEffect { public ChasmSkulkerEffect() { super(Outcome.Benefit); - this.staticText = "put X 1/1 blue Squid creature tokens with islandwalk onto the battlefield, where X is the number of +1/+1 counters on Chasm Skulker"; + this.staticText = "create X 1/1 blue Squid creature tokens with islandwalk, where X is the number of +1/+1 counters on Chasm Skulker"; } public ChasmSkulkerEffect(final ChasmSkulkerEffect effect) { diff --git a/Mage.Sets/src/mage/cards/c/ChatterOfTheSquirrel.java b/Mage.Sets/src/mage/cards/c/ChatterOfTheSquirrel.java index 59fced9e031..32e2cca8dd8 100644 --- a/Mage.Sets/src/mage/cards/c/ChatterOfTheSquirrel.java +++ b/Mage.Sets/src/mage/cards/c/ChatterOfTheSquirrel.java @@ -47,7 +47,7 @@ public class ChatterOfTheSquirrel extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{G}"); - // Put a 1/1 green Squirrel creature token onto the battlefield. + // Create a 1/1 green Squirrel creature token. this.getSpellAbility().addEffect(new CreateTokenEffect(new SquirrelToken())); // Flashback {1}{G} diff --git a/Mage.Sets/src/mage/cards/c/Chronozoa.java b/Mage.Sets/src/mage/cards/c/Chronozoa.java index 7b9f310215d..f863ad679e5 100644 --- a/Mage.Sets/src/mage/cards/c/Chronozoa.java +++ b/Mage.Sets/src/mage/cards/c/Chronozoa.java @@ -53,7 +53,7 @@ import mage.counters.CounterType; public class Chronozoa extends CardImpl { public Chronozoa(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}"); this.subtype.add("Illusion"); this.power = new MageInt(3); this.toughness = new MageInt(3); @@ -66,12 +66,12 @@ public class Chronozoa extends CardImpl { this.addAbility(ability); this.addAbility(new VanishingUpkeepAbility(3)); this.addAbility(new VanishingSacrificeAbility()); - // When Chronozoa is put into a graveyard from play, if it had no time counters on it, put two tokens into play that are copies of it. + // When Chronozoa is put into a graveyard from play, if it had no time counters on it, create two tokens that are copies of it. Effect effect = new PutTokenOntoBattlefieldCopySourceEffect(2); - effect.setText("put two tokens into play that are copies of it"); + effect.setText("create two tokens that are copies of it"); this.addAbility(new ConditionalTriggeredAbility(new DiesCreatureTriggeredAbility(effect, false), new LastTimeCounterRemovedCondition(), - "When {this} dies, if it had no time counters on it, put two tokens that are copies of it onto the battlefield.")); + "When {this} dies, if it had no time counters on it, create two tokens that are copies of it.")); } public Chronozoa(final Chronozoa card) { diff --git a/Mage.Sets/src/mage/cards/c/CloneLegion.java b/Mage.Sets/src/mage/cards/c/CloneLegion.java index 3944702b788..6b7f0433ee3 100644 --- a/Mage.Sets/src/mage/cards/c/CloneLegion.java +++ b/Mage.Sets/src/mage/cards/c/CloneLegion.java @@ -51,7 +51,7 @@ public class CloneLegion extends CardImpl { public CloneLegion(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{7}{U}{U}"); - // For each creature target player controls, put a token onto the the battlefield that's a copy of that creature. + // For each creature target player controls, create a token that's a copy of that creature. this.getSpellAbility().addEffect(new CloneLegionEffect()); this.getSpellAbility().addTarget(new TargetPlayer()); @@ -71,7 +71,7 @@ class CloneLegionEffect extends OneShotEffect { public CloneLegionEffect() { super(Outcome.Benefit); - this.staticText = "For each creature target player controls, put a token onto the the battlefield that's a copy of that creature"; + this.staticText = "For each creature target player controls, create a token that's a copy of that creature"; } public CloneLegionEffect(final CloneLegionEffect effect) { diff --git a/Mage.Sets/src/mage/cards/c/CloudgoatRanger.java b/Mage.Sets/src/mage/cards/c/CloudgoatRanger.java index 76519716031..17405decbfc 100644 --- a/Mage.Sets/src/mage/cards/c/CloudgoatRanger.java +++ b/Mage.Sets/src/mage/cards/c/CloudgoatRanger.java @@ -71,7 +71,7 @@ public class CloudgoatRanger extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - // When Cloudgoat Ranger enters the battlefield, put three 1/1 white Kithkin Soldier creature tokens onto the battlefield. + // When Cloudgoat Ranger enters the battlefield, create three 1/1 white Kithkin Soldier creature tokens. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new KithkinToken(), 3), false)); //Tap three untapped Kithkin you control: Cloudgoat Ranger gets +2/+0 and gains flying until end of turn. Effect effect = new BoostSourceEffect(2, 0, Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/cards/c/Cloudseeder.java b/Mage.Sets/src/mage/cards/c/Cloudseeder.java index f3f7d8ad9b7..076bc73c29c 100644 --- a/Mage.Sets/src/mage/cards/c/Cloudseeder.java +++ b/Mage.Sets/src/mage/cards/c/Cloudseeder.java @@ -50,7 +50,7 @@ import mage.game.permanent.token.Token; public class Cloudseeder extends CardImpl { public Cloudseeder(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}"); this.subtype.add("Faerie"); this.subtype.add("Spellshaper"); this.power = new MageInt(1); @@ -58,7 +58,7 @@ public class Cloudseeder extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // {U}, {tap}, Discard a card: Put a 1/1 blue Faerie creature token named Cloud Sprite onto the battlefield. It has flying and "Cloud Sprite can block only creatures with flying." + // {U}, {tap}, Discard a card: Create a 1/1 blue Faerie creature token named Cloud Sprite. It has flying and "Cloud Sprite can block only creatures with flying." Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CloudSpriteToken()), new ManaCostsImpl("{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); diff --git a/Mage.Sets/src/mage/cards/c/CobraTrap.java b/Mage.Sets/src/mage/cards/c/CobraTrap.java index 5456f2e7523..08ca3436f70 100644 --- a/Mage.Sets/src/mage/cards/c/CobraTrap.java +++ b/Mage.Sets/src/mage/cards/c/CobraTrap.java @@ -60,7 +60,7 @@ public class CobraTrap extends CardImpl { // If a noncreature permanent under your control was destroyed this turn by a spell or ability an opponent controlled, you may pay {G} rather than pay Cobra Trap's mana cost. this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl("{G}"), CobraTrapCondition.getInstance()), new CobraTrapWatcher()); - // Put four 1/1 green Snake creature tokens onto the battlefield. + // Create four 1/1 green Snake creature tokens. this.getSpellAbility().addEffect(new CreateTokenEffect(new SnakeToken(), 4)); } diff --git a/Mage.Sets/src/mage/cards/c/CommandersAuthority.java b/Mage.Sets/src/mage/cards/c/CommandersAuthority.java index eabcd30eca2..71e99db802a 100644 --- a/Mage.Sets/src/mage/cards/c/CommandersAuthority.java +++ b/Mage.Sets/src/mage/cards/c/CommandersAuthority.java @@ -63,7 +63,7 @@ public class CommandersAuthority extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // Enchanted creature has "At the beginning of your upkeep, put a 1/1 white Human creature token onto the battlefield." + // Enchanted creature has "At the beginning of your upkeep, create a 1/1 white Human creature token." ability = new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new HumanToken()), TargetController.YOU, false); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/c/ConfrontTheUnknown.java b/Mage.Sets/src/mage/cards/c/ConfrontTheUnknown.java index 8ba1abc2e2a..722ac02f00c 100644 --- a/Mage.Sets/src/mage/cards/c/ConfrontTheUnknown.java +++ b/Mage.Sets/src/mage/cards/c/ConfrontTheUnknown.java @@ -61,7 +61,7 @@ public class ConfrontTheUnknown extends CardImpl { getSpellAbility().addEffect(effect); effect = new BoostTargetEffect(new PermanentsOnBattlefieldCount(filter), new PermanentsOnBattlefieldCount(filter), Duration.EndOfTurn, true); effect.setText(", then target creature gets +1/+1 until end of turn for each Clue you control. (To investigate, " - + "put a colorless Clue artifact token onto the battlefield with \"{2}, Sacrifice this artifact: Draw a card.\")"); + + "create a colorless Clue artifact token with \"{2}, Sacrifice this artifact: Draw a card.\")"); getSpellAbility().addEffect(effect); getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/cards/c/ConquerorsPledge.java b/Mage.Sets/src/mage/cards/c/ConquerorsPledge.java index f521c5d27ce..aab64c68800 100644 --- a/Mage.Sets/src/mage/cards/c/ConquerorsPledge.java +++ b/Mage.Sets/src/mage/cards/c/ConquerorsPledge.java @@ -24,18 +24,17 @@ * The views and conclusions contained in the software and documentation are those of the * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. -*/ - + */ package mage.cards.c; import java.util.UUID; -import mage.constants.CardType; import mage.abilities.condition.common.KickedCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.KickerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.permanent.token.KorSoldierToken; /** @@ -45,14 +44,13 @@ import mage.game.permanent.token.KorSoldierToken; public class ConquerorsPledge extends CardImpl { public ConquerorsPledge(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{W}{W}{W}"); - + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{W}{W}{W}"); this.addAbility(new KickerAbility("{6}")); this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new CreateTokenEffect(new KorSoldierToken(), 12), new CreateTokenEffect(new KorSoldierToken(), 6), KickedCondition.getInstance(), - "Put six 1/1 white Kor Soldier creature tokens onto the battlefield. If {this} was kicked, put twelve of those tokens onto the battlefield instead")); + "Create six 1/1 white Kor Soldier creature tokens. If {this} was kicked, create twelve of those tokens instead")); } public ConquerorsPledge(final ConquerorsPledge card) { diff --git a/Mage.Sets/src/mage/cards/c/ConversionChamber.java b/Mage.Sets/src/mage/cards/c/ConversionChamber.java index 9e3e841109c..5a47b6a1a13 100644 --- a/Mage.Sets/src/mage/cards/c/ConversionChamber.java +++ b/Mage.Sets/src/mage/cards/c/ConversionChamber.java @@ -60,7 +60,7 @@ public class ConversionChamber extends CardImpl { ability.addTarget(new TargetCardInGraveyard(new FilterArtifactCard("artifact card from a graveyard"))); ability.addCost(new TapSourceCost()); this.addAbility(ability); - // {2}, {T}, Remove a charge counter from Conversion Chamber: Put a 3/3 colorless Golem artifact creature token onto the battlefield. + // {2}, {T}, Remove a charge counter from Conversion Chamber: Create a 3/3 colorless Golem artifact creature token. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GolemToken(expansionSetCode)), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance())); diff --git a/Mage.Sets/src/mage/cards/c/CoralBarrier.java b/Mage.Sets/src/mage/cards/c/CoralBarrier.java index 1e8c31954b1..5086083a041 100644 --- a/Mage.Sets/src/mage/cards/c/CoralBarrier.java +++ b/Mage.Sets/src/mage/cards/c/CoralBarrier.java @@ -53,7 +53,7 @@ public class CoralBarrier extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); - // When Coral Barrier enters the battlefield, put a 1/1 blue Squid creature token with islandwalk onto the battlefield. + // When Coral Barrier enters the battlefield, create a 1/1 blue Squid creature token with islandwalk. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new CoralBarrierSquidToken()), false)); } diff --git a/Mage.Sets/src/mage/cards/c/Corpseweft.java b/Mage.Sets/src/mage/cards/c/Corpseweft.java index 9971b5ca316..77b18e90c70 100644 --- a/Mage.Sets/src/mage/cards/c/Corpseweft.java +++ b/Mage.Sets/src/mage/cards/c/Corpseweft.java @@ -54,9 +54,9 @@ import mage.target.common.TargetCardInYourGraveyard; public class Corpseweft extends CardImpl { public Corpseweft(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); - // {1}{B}, Exile one or more creature cards from your graveyard: Put an X/X black Zombie Horror creature token onto the battlefield tapped, where X is twice the number of cards exiled this way. + // {1}{B}, Exile one or more creature cards from your graveyard: Create an X/X black Zombie Horror creature token tapped, where X is twice the number of cards exiled this way. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CorpseweftEffect(), new ManaCostsImpl("{1}{B}")); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(1, Integer.MAX_VALUE, new FilterCreatureCard("creature cards from your graveyard")))); this.addAbility(ability); @@ -76,7 +76,7 @@ class CorpseweftEffect extends OneShotEffect { public CorpseweftEffect() { super(Outcome.Benefit); - this.staticText = "Put an X/X black Zombie Horror creature token onto the battlefield tapped, where X is twice the number of cards exiled this way"; + this.staticText = "create an X/X black Zombie Horror creature token tapped, where X is twice the number of cards exiled this way"; } public CorpseweftEffect(final CorpseweftEffect effect) { @@ -110,7 +110,7 @@ class CorpseweftEffect extends OneShotEffect { class CorpseweftZombieToken extends Token { public CorpseweftZombieToken(int power, int toughness) { - super("Zombie Horror", "an X/X black Zombie Horror creature token onto the battlefield tapped, where X is twice the number of cards exiled this way"); + super("Zombie Horror", "an X/X black Zombie Horror creature token tapped, where X is twice the number of cards exiled this way"); cardType.add(CardType.CREATURE); subtype.add("Zombie"); subtype.add("Horror"); diff --git a/Mage.Sets/src/mage/cards/c/CoursersAccord.java b/Mage.Sets/src/mage/cards/c/CoursersAccord.java index 43db6d24b5a..dcc38ae3d02 100644 --- a/Mage.Sets/src/mage/cards/c/CoursersAccord.java +++ b/Mage.Sets/src/mage/cards/c/CoursersAccord.java @@ -45,8 +45,8 @@ public class CoursersAccord extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{G}{W}"); - // Put a 3/3 green Centaur creature token onto the battlefield, then populate. - // (Put a token onto the battlefield that's a copy of a creature token you control.) + // Create a 3/3 green Centaur creature token, then populate. + // (Create a token that's a copy of a creature token you control.) this.getSpellAbility().addEffect(new CreateTokenEffect(new CentaurToken())); this.getSpellAbility().addEffect(new PopulateEffect("then")); } diff --git a/Mage.Sets/src/mage/cards/c/CrawlingSensation.java b/Mage.Sets/src/mage/cards/c/CrawlingSensation.java index 6472ad4fd9e..c5cb281f85c 100644 --- a/Mage.Sets/src/mage/cards/c/CrawlingSensation.java +++ b/Mage.Sets/src/mage/cards/c/CrawlingSensation.java @@ -50,12 +50,12 @@ import mage.game.permanent.token.InsectToken; public class CrawlingSensation extends CardImpl { public CrawlingSensation(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); // At the beginning of your upkeep, you may put the top two cards of your library into your graveyard. this.addAbility(new OnEventTriggeredAbility(GameEvent.EventType.UPKEEP_STEP_PRE, "beginning of your upkeep", new PutTopCardOfLibraryIntoGraveControllerEffect(2), true)); - // Whenever one or more land cards are put into your graveyard from anywhere for the first time each turn, put a 1/1 green Insect creature token onto the battlefield. + // Whenever one or more land cards are put into your graveyard from anywhere for the first time each turn, create a 1/1 green Insect creature token. this.addAbility(new CrawlingSensationTriggeredAbility()); } @@ -90,13 +90,13 @@ class CrawlingSensationTriggeredAbility extends TriggeredAbilityImpl { if (zEvent != null && Zone.GRAVEYARD == zEvent.getToZone() && zEvent.getCards() != null) { Integer usedOnTurn = (Integer) game.getState().getValue("usedOnTurn" + getOriginalId()); if (usedOnTurn == null || usedOnTurn < game.getTurnNum()) { - for (Card card : zEvent.getCards()) { + for (Card card : zEvent.getCards()) { if (card != null) { UUID cardOwnerId = card.getOwnerId(); List cardType = card.getCardType(); - if (cardOwnerId != null - && card.getOwnerId().equals(getControllerId()) + if (cardOwnerId != null + && card.getOwnerId().equals(getControllerId()) && cardType != null && card.getCardType().contains(CardType.LAND)) { game.getState().setValue("usedOnTurn" + getOriginalId(), game.getTurnNum()); @@ -116,6 +116,6 @@ class CrawlingSensationTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever one or more land cards are put into your graveyard from anywhere for the first time each turn, put a 1/1 green Insect creature token onto the battlefield."; + return "Whenever one or more land cards are put into your graveyard from anywhere for the first time each turn, create a 1/1 green Insect creature token."; } } diff --git a/Mage.Sets/src/mage/cards/c/CreakwoodLiege.java b/Mage.Sets/src/mage/cards/c/CreakwoodLiege.java index 55ab32c33db..6c88f923b4e 100644 --- a/Mage.Sets/src/mage/cards/c/CreakwoodLiege.java +++ b/Mage.Sets/src/mage/cards/c/CreakwoodLiege.java @@ -71,7 +71,7 @@ public class CreakwoodLiege extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBlackCreature, true))); // Other green creatures you control get +1/+1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterGreenCreature, true))); - // At the beginning of your upkeep, you may put a 1/1 black and green Worm creature token onto the battlefield. + // At the beginning of your upkeep, you may create a 1/1 black and green Worm creature token. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new CreakwoodLiegeToken(), 1), TargetController.YOU, true)); } diff --git a/Mage.Sets/src/mage/cards/c/CribSwap.java b/Mage.Sets/src/mage/cards/c/CribSwap.java index 6992e88ed36..6369da8e1ca 100644 --- a/Mage.Sets/src/mage/cards/c/CribSwap.java +++ b/Mage.Sets/src/mage/cards/c/CribSwap.java @@ -55,7 +55,7 @@ public class CribSwap extends CardImpl { // Changeling this.addAbility(ChangelingAbility.getInstance()); - // Exile target creature. Its controller puts a 1/1 colorless Shapeshifter creature token with changeling onto the battlefield. + // Exile target creature. Its controller creates a 1/1 colorless Shapeshifter creature token with changeling. this.getSpellAbility().addEffect(new ExileTargetEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new CribSwapEffect()); @@ -76,7 +76,7 @@ class CribSwapEffect extends OneShotEffect { public CribSwapEffect() { super(Outcome.Benefit); - this.staticText = "Its controller puts a 1/1 colorless Shapeshifter creature token with changeling onto the battlefield"; + this.staticText = "Its controller creates a 1/1 colorless Shapeshifter creature token with changeling"; } public CribSwapEffect(final CribSwapEffect effect) { diff --git a/Mage.Sets/src/mage/cards/c/CrushOfTentacles.java b/Mage.Sets/src/mage/cards/c/CrushOfTentacles.java index 2f8ef3eae2e..8e6c16fdf53 100644 --- a/Mage.Sets/src/mage/cards/c/CrushOfTentacles.java +++ b/Mage.Sets/src/mage/cards/c/CrushOfTentacles.java @@ -48,12 +48,12 @@ import mage.game.permanent.token.Token; public class CrushOfTentacles extends CardImpl { public CrushOfTentacles(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{U}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{4}{U}{U}"); - // Return all nonland permanents to their owners' hands. If Crush of Tentacles surge cost was paid, put an 8/8 blue Octopus creature token onto the battlefield. + // Return all nonland permanents to their owners' hands. If Crush of Tentacles surge cost was paid, create an 8/8 blue Octopus creature token. getSpellAbility().addEffect(new ReturnToHandFromBattlefieldAllEffect(new FilterNonlandPermanent("nonland permanents"))); Effect effect = new ConditionalOneShotEffect(new CreateTokenEffect(new CrushOfTentaclesToken()), SurgedCondition.getInstance()); - effect.setText("If {this} surge cost was paid, put an 8/8 blue Octopus creature token onto the battlefield"); + effect.setText("If {this} surge cost was paid, create an 8/8 blue Octopus creature token"); getSpellAbility().addEffect(effect); // Surge {3}{U}{U} (You may cast this spell for its surge cost if you or a teammate has cast another spell this turn) diff --git a/Mage.Sets/src/mage/cards/c/Cryptbreaker.java b/Mage.Sets/src/mage/cards/c/Cryptbreaker.java index 149a1ed3dae..e568b0bbe3a 100644 --- a/Mage.Sets/src/mage/cards/c/Cryptbreaker.java +++ b/Mage.Sets/src/mage/cards/c/Cryptbreaker.java @@ -69,7 +69,7 @@ public class Cryptbreaker extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // {1}{B}, {T}, Discard a card: Put a 2/2 black Zombie creature token onto the battlefield. + // {1}{B}, {T}, Discard a card: Create a 2/2 black Zombie creature token. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ZombieToken()), new ManaCostsImpl("{1}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); diff --git a/Mage.Sets/src/mage/cards/c/CultOfTheWaxingMoon.java b/Mage.Sets/src/mage/cards/c/CultOfTheWaxingMoon.java index d233a4865ab..c208ff6d366 100644 --- a/Mage.Sets/src/mage/cards/c/CultOfTheWaxingMoon.java +++ b/Mage.Sets/src/mage/cards/c/CultOfTheWaxingMoon.java @@ -56,7 +56,7 @@ public class CultOfTheWaxingMoon extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(4); - // Whenever a permanent you control transforms into a non-Human creature, put a 2/2 green Wolf creature token onto the battlefield. + // Whenever a permanent you control transforms into a non-Human creature, create a 2/2 green Wolf creature token. this.addAbility(new CultOfTheWaxingMoonAbility()); } diff --git a/Mage.Sets/src/mage/cards/c/CurseOfShallowGraves.java b/Mage.Sets/src/mage/cards/c/CurseOfShallowGraves.java index 406b6f57d47..ca3b7c62789 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfShallowGraves.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfShallowGraves.java @@ -57,7 +57,7 @@ import mage.target.targetpointer.FixedTarget; public class CurseOfShallowGraves extends CardImpl { public CurseOfShallowGraves(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); this.subtype.add("Aura"); this.subtype.add("Curse"); @@ -67,7 +67,7 @@ public class CurseOfShallowGraves extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(auraTarget.getTargetName())); - // Whenever a player attacks enchanted player with one or more creatures, that attacking player may put a 2/2 black Zombie creature token onto the battlefield tapped. + // Whenever a player attacks enchanted player with one or more creatures, that attacking player may create a 2/2 black Zombie creature token tapped. this.addAbility(new CurseOfShallowTriggeredAbility()); } @@ -116,7 +116,7 @@ class CurseOfShallowTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever a player attacks enchanted player with one or more creatures, that attacking player may put a 2/2 black Zombie creature token onto the battlefield tapped."; + return "Whenever a player attacks enchanted player with one or more creatures, that attacking player may create a 2/2 black Zombie creature token tapped."; } @Override @@ -130,7 +130,7 @@ class CurseOfShallowEffect extends OneShotEffect { public CurseOfShallowEffect() { super(Outcome.Benefit); - this.staticText = "that attacking player may put a 2/2 black Zombie creature token onto the battlefield tapped"; + this.staticText = "that attacking player may create a 2/2 black Zombie creature token tapped"; } public CurseOfShallowEffect(final CurseOfShallowEffect effect) { @@ -145,7 +145,7 @@ class CurseOfShallowEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player attacker = game.getPlayer(this.getTargetPointer().getFirst(game, source)); - if (attacker != null && attacker.chooseUse(outcome, "Put a 2/2 black Zombie creature token onto the battlefield tapped?", source, game)) { + if (attacker != null && attacker.chooseUse(outcome, "create a 2/2 black Zombie creature token tapped?", source, game)) { Effect effect = new CreateTokenTargetEffect(new ZombieToken(), new StaticValue(1), true, false); effect.setTargetPointer(targetPointer); return effect.apply(game, source); diff --git a/Mage.Sets/src/mage/cards/c/CurseOfTheSwine.java b/Mage.Sets/src/mage/cards/c/CurseOfTheSwine.java index 1890769b9f5..3e74fed5fe4 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfTheSwine.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfTheSwine.java @@ -48,11 +48,10 @@ import mage.target.common.TargetCreaturePermanent; public class CurseOfTheSwine extends CardImpl { public CurseOfTheSwine(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{X}{U}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{X}{U}{U}"); - - // Exile X target creatures. For each creature exiled this way, its controller puts a 2/2 green Boar creature token onto the battlefield. - this.getSpellAbility().addEffect(new CurseOfTheSwineEffect()); + // Exile X target creatures. For each creature exiled this way, its controller creates a 2/2 green Boar creature token. + this.getSpellAbility().addEffect(new CurseOfTheSwineEffect()); // Correct number of targets will be set in adjustTargets this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } @@ -79,7 +78,7 @@ class CurseOfTheSwineEffect extends OneShotEffect { public CurseOfTheSwineEffect() { super(Outcome.Exile); - this.staticText = "Exile X target creatures. For each creature exiled this way, its controller puts a 2/2 green Boar creature token onto the battlefield"; + this.staticText = "Exile X target creatures. For each creature exiled this way, its controller creates a 2/2 green Boar creature token"; } public CurseOfTheSwineEffect(final CurseOfTheSwineEffect effect) { @@ -93,7 +92,7 @@ class CurseOfTheSwineEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - for(UUID targetId : this.getTargetPointer().getTargets(game, source)) { + for (UUID targetId : this.getTargetPointer().getTargets(game, source)) { Permanent creature = game.getPermanent(targetId); if (creature != null) { if (creature.moveToExile(null, null, source.getSourceId(), game)) { @@ -107,6 +106,7 @@ class CurseOfTheSwineEffect extends OneShotEffect { } class CurseOfTheSwineBoarToken extends Token { + CurseOfTheSwineBoarToken() { super("Boar", "2/2 green Boar creature token"); cardType.add(CardType.CREATURE); diff --git a/Mage.Sets/src/mage/cards/c/CustodiSoulbinders.java b/Mage.Sets/src/mage/cards/c/CustodiSoulbinders.java index 35945b2f7e8..b2098d86d6c 100644 --- a/Mage.Sets/src/mage/cards/c/CustodiSoulbinders.java +++ b/Mage.Sets/src/mage/cards/c/CustodiSoulbinders.java @@ -73,7 +73,7 @@ public class CustodiSoulbinders extends CardImpl { "with X +1/+1 counters on it, where X is the number of other creatures on the battlefield")); - // {2}{W}, Remove a +1/+1 counter from Custodi Soulbinders: Put a 1/1 white Spirit creature token with flying onto the battlefield. + // {2}{W}, Remove a +1/+1 counter from Custodi Soulbinders: Create a 1/1 white Spirit creature token with flying. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SpiritWhiteToken("CNS")), new ManaCostsImpl<>("{2}{W}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DanceOfMany.java b/Mage.Sets/src/mage/cards/d/DanceOfMany.java index 418c9267d83..290a089ecbe 100644 --- a/Mage.Sets/src/mage/cards/d/DanceOfMany.java +++ b/Mage.Sets/src/mage/cards/d/DanceOfMany.java @@ -75,7 +75,7 @@ public class DanceOfMany extends CardImpl { public DanceOfMany(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{U}{U}"); - // When Dance of Many enters the battlefield, put a token that's a copy of target nontoken creature onto the battlefield. + // When Dance of Many enters the battlefield, create a token that's a copy of target nontoken creature. Ability ability = new EntersBattlefieldTriggeredAbility(new DanceOfManyCreateTokenCopyEffect(), false); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); @@ -105,7 +105,7 @@ class DanceOfManyCreateTokenCopyEffect extends OneShotEffect { public DanceOfManyCreateTokenCopyEffect() { super(Outcome.PutCreatureInPlay); - staticText = "put a token that's a copy of target nontoken creature onto the battlefield"; + staticText = "create a token that's a copy of target nontoken creature"; } public DanceOfManyCreateTokenCopyEffect(final DanceOfManyCreateTokenCopyEffect effect) { diff --git a/Mage.Sets/src/mage/cards/d/DanceWithDevils.java b/Mage.Sets/src/mage/cards/d/DanceWithDevils.java index 35f95f9205b..4516331d3e7 100644 --- a/Mage.Sets/src/mage/cards/d/DanceWithDevils.java +++ b/Mage.Sets/src/mage/cards/d/DanceWithDevils.java @@ -44,9 +44,9 @@ public class DanceWithDevils extends CardImpl { public DanceWithDevils(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{R}"); - // Put two 1/1 red Devil creature tokens onto the battlefield. 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 target creature or player." Effect effect = new CreateTokenEffect(new DevilToken(), 2); - effect.setText("Put two 1/1 red Devil creature tokens onto the battlefield. 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 target creature or player.\""); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/cards/d/DarettiIngeniousIconoclast.java b/Mage.Sets/src/mage/cards/d/DarettiIngeniousIconoclast.java index 343a8157b20..d2f7d43d995 100644 --- a/Mage.Sets/src/mage/cards/d/DarettiIngeniousIconoclast.java +++ b/Mage.Sets/src/mage/cards/d/DarettiIngeniousIconoclast.java @@ -69,12 +69,12 @@ public class DarettiIngeniousIconoclast extends CardImpl { } public DarettiIngeniousIconoclast(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.PLANESWALKER},"{1}{B}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.PLANESWALKER}, "{1}{B}{R}"); this.subtype.add("Daretti"); this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(3)); - // +1: Put a 1/1 colorless Construct artifact creature token with defender onto the battlefield. + // +1: Create a 1/1 colorless Construct artifact creature token with defender. LoyaltyAbility ability = new LoyaltyAbility(new CreateTokenEffect(new DarettiConstructToken()), 1); this.addAbility(ability); @@ -85,7 +85,7 @@ public class DarettiIngeniousIconoclast extends CardImpl { ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); - // -6: Choose target artifact card in a graveyard or artifact on the battlefield. Put three tokens that are copies of it onto the battlefield. + // -6: Choose target artifact card in a graveyard or artifact on the battlefield. Create three tokens that are copies of it. ability = new LoyaltyAbility( new PutTokenOntoBattlefieldCopyTargetEffect(null, null, false, 3), -6); @@ -108,7 +108,7 @@ class DarettiIngeniousIconoclastEffect extends OneShotEffect { public DarettiIngeniousIconoclastEffect() { super(Outcome.Benefit); - this.staticText = "Choose target artifact card in a graveyard or artifact on the battlefield. Put three tokens that are copies of it onto the battlefield"; + this.staticText = "Choose target artifact card in a graveyard or artifact on the battlefield. Create three tokens that are copies of it"; } public DarettiIngeniousIconoclastEffect(final DarettiIngeniousIconoclastEffect effect) { diff --git a/Mage.Sets/src/mage/cards/d/DarienKingOfKjeldor.java b/Mage.Sets/src/mage/cards/d/DarienKingOfKjeldor.java index f96de8c5b6e..89e9abf7066 100644 --- a/Mage.Sets/src/mage/cards/d/DarienKingOfKjeldor.java +++ b/Mage.Sets/src/mage/cards/d/DarienKingOfKjeldor.java @@ -59,7 +59,7 @@ public class DarienKingOfKjeldor extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - // Whenever you're dealt damage, you may put that many 1/1 white Soldier creature tokens onto the battlefield. + // Whenever you're dealt damage, you may create that many 1/1 white Soldier creature tokens. this.addAbility(new DarienKingOfKjeldorTriggeredAbility()); } @@ -103,7 +103,7 @@ class DarienKingOfKjeldorTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever you are dealt damage, you may put that many 1/1 white Soldier creature tokens onto the battlefield."; + return "Whenever you are dealt damage, you may create that many 1/1 white Soldier creature tokens."; } } diff --git a/Mage.Sets/src/mage/cards/d/DarkDepths.java b/Mage.Sets/src/mage/cards/d/DarkDepths.java index 370f8bc9592..b53e1a351b2 100644 --- a/Mage.Sets/src/mage/cards/d/DarkDepths.java +++ b/Mage.Sets/src/mage/cards/d/DarkDepths.java @@ -28,10 +28,8 @@ package mage.cards.d; import java.util.UUID; - -import mage.abilities.Ability; -import mage.constants.CardType; import mage.MageInt; +import mage.abilities.Ability; import mage.abilities.StateTriggeredAbility; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +42,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; @@ -58,7 +57,7 @@ import mage.game.permanent.token.Token; public class DarkDepths extends CardImpl { public DarkDepths(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.LAND},""); + super(ownerId, setInfo, new CardType[]{CardType.LAND}, ""); this.supertype.add("Legendary"); this.supertype.add("Snow"); @@ -66,7 +65,7 @@ public class DarkDepths extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.ICE.createInstance(10)), "with ten ice counters on it")); // {3}: Remove an ice counter from Dark Depths. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RemoveCounterSourceEffect(CounterType.ICE.createInstance(1)), new ManaCostsImpl("{3}"))); - // When Dark Depths has no ice counters on it, sacrifice it. If you do, put a legendary 20/20 black Avatar creature token with flying and "This creature is indestructible" named Marit Lage onto the battlefield. + // When Dark Depths has no ice counters on it, sacrifice it. If you do, create a legendary 20/20 black Avatar creature token with flying and "This creature is indestructible" named Marit Lage. this.addAbility(new DarkDepthsAbility()); } @@ -84,7 +83,7 @@ class DarkDepthsSacrificeEffect extends SacrificeSourceEffect { private boolean sacrificed = false; - public DarkDepthsSacrificeEffect(){ + public DarkDepthsSacrificeEffect() { super(); } @@ -135,12 +134,11 @@ class DarkDepthsAbility extends StateTriggeredAbility { @Override public String getRule() { - return "When {this} has no ice counters on it, sacrifice it. If you do, put a legendary 20/20 black Avatar creature token with flying and indestructible named Marit Lage onto the battlefield."; + return "When {this} has no ice counters on it, sacrifice it. If you do, create a legendary 20/20 black Avatar creature token with flying and indestructible named Marit Lage."; } } - class MaritLageToken extends Token { public MaritLageToken() { @@ -153,7 +151,7 @@ class MaritLageToken extends Token { color.setBlack(true); power = new MageInt(20); toughness = new MageInt(20); - + this.addAbility(FlyingAbility.getInstance()); this.addAbility(IndestructibleAbility.getInstance()); diff --git a/Mage.Sets/src/mage/cards/d/DarkSalvation.java b/Mage.Sets/src/mage/cards/d/DarkSalvation.java index df40cf76fbc..6b5189a12f4 100644 --- a/Mage.Sets/src/mage/cards/d/DarkSalvation.java +++ b/Mage.Sets/src/mage/cards/d/DarkSalvation.java @@ -56,10 +56,10 @@ public class DarkSalvation extends CardImpl { public DarkSalvation(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{X}{X}{B}"); - // Target player puts X 2/2 black Zombie creature tokens onto the battlefield, then up to one target creature gets -1/-1 until end of turn for each Zombie that player controls. + // Target player creates X 2/2 black Zombie creature tokens, then up to one target creature gets -1/-1 until end of turn for each Zombie that player controls. this.getSpellAbility().addTarget(new TargetPlayer()); Effect effect = new CreateTokenTargetEffect(new ZombieToken(), new ManacostVariableValue()); - effect.setText("Target player puts X 2/2 black Zombie creature tokens onto the battlefield"); + effect.setText("Target player creates X 2/2 black Zombie creature tokens"); this.getSpellAbility().addEffect(effect); DynamicValue value = new ZombiesControlledByTargetPlayerCount(); diff --git a/Mage.Sets/src/mage/cards/d/DauntlessCathar.java b/Mage.Sets/src/mage/cards/d/DauntlessCathar.java index b34479cbf11..ee27c4519dd 100644 --- a/Mage.Sets/src/mage/cards/d/DauntlessCathar.java +++ b/Mage.Sets/src/mage/cards/d/DauntlessCathar.java @@ -53,7 +53,7 @@ public class DauntlessCathar extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(2); - // {1}{W}, Exile Dauntless Cathar from your graveyard: Put a 1/1 white Spirit creature token with flying onto the battlefield. Activate this ability only any time you could cast a sorcery. + // {1}{W}, Exile Dauntless Cathar from your graveyard: Create a 1/1 white Spirit creature token with flying. Activate this ability only any time you could cast a sorcery. Ability ability = new ActivateAsSorceryActivatedAbility(Zone.GRAVEYARD, new CreateTokenEffect(new SpiritWhiteToken()), new ManaCostsImpl("{1}{W}")); ability.addCost(new ExileSourceFromGraveCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DaxosTheReturned.java b/Mage.Sets/src/mage/cards/d/DaxosTheReturned.java index 9d56f80576c..f5f4bd10c7c 100644 --- a/Mage.Sets/src/mage/cards/d/DaxosTheReturned.java +++ b/Mage.Sets/src/mage/cards/d/DaxosTheReturned.java @@ -81,7 +81,7 @@ public class DaxosTheReturned extends CardImpl { Ability ability = new SpellCastControllerTriggeredAbility(effect, filter, false); this.addAbility(ability); - // {1}{W}{B}: Put a white and black Spirit enchantment creature token onto the battlefield. It has + // {1}{W}{B}: Create a white and black Spirit enchantment creature token. It has // "This creature's power and toughness are each equal to the number of experience counters you have." this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new DaxosSpiritToken(), 1), new ManaCostsImpl("{1}{W}{B}"))); } diff --git a/Mage.Sets/src/mage/cards/d/DayOfTheDragons.java b/Mage.Sets/src/mage/cards/d/DayOfTheDragons.java index a492b5e7bb8..f787ff146de 100644 --- a/Mage.Sets/src/mage/cards/d/DayOfTheDragons.java +++ b/Mage.Sets/src/mage/cards/d/DayOfTheDragons.java @@ -63,7 +63,7 @@ public class DayOfTheDragons extends CardImpl { public DayOfTheDragons(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{4}{U}{U}{U}"); - // When Day of the Dragons enters the battlefield, exile all creatures you control. Then put that many 5/5 red Dragon creature tokens with flying onto the battlefield. + // When Day of the Dragons enters the battlefield, exile all creatures you control. Then create that many 5/5 red Dragon creature tokens with flying. this.addAbility(new EntersBattlefieldTriggeredAbility(new DayOfTheDragonsEntersEffect(), false)); // When Day of the Dragons leaves the battlefield, sacrifice all Dragons you control. Then return the exiled cards to the battlefield under your control. @@ -91,7 +91,7 @@ class DayOfTheDragonsEntersEffect extends OneShotEffect { public DayOfTheDragonsEntersEffect() { super(Outcome.Benefit); - staticText = "exile all creatures you control. Then put that many 5/5 red Dragon creature tokens with flying onto the battlefield"; + staticText = "exile all creatures you control. Then create that many 5/5 red Dragon creature tokens with flying"; } public DayOfTheDragonsEntersEffect(final DayOfTheDragonsEntersEffect effect) { diff --git a/Mage.Sets/src/mage/cards/d/DeadlyGrub.java b/Mage.Sets/src/mage/cards/d/DeadlyGrub.java index 6424bc99db1..3b84c9388aa 100644 --- a/Mage.Sets/src/mage/cards/d/DeadlyGrub.java +++ b/Mage.Sets/src/mage/cards/d/DeadlyGrub.java @@ -63,9 +63,9 @@ public class DeadlyGrub extends CardImpl { this.addAbility(ability); this.addAbility(new VanishingUpkeepAbility(3)); this.addAbility(new VanishingSacrificeAbility()); - // When Deadly Grub dies, if it had no time counters on it, put a 6/1 green Insect creature token with shroud onto the battlefield. + // When Deadly Grub dies, if it had no time counters on it, create a 6/1 green Insect creature token with shroud. this.addAbility(new ConditionalTriggeredAbility(new DiesTriggeredAbility(new CreateTokenEffect(new DeadlyGrubToken(), 1)), - new LastTimeCounterRemovedCondition(), "When {this} dies, if it had no time counters on it, put a 6/1 green Insect creature token with shroud onto the battlefield.")); + new LastTimeCounterRemovedCondition(), "When {this} dies, if it had no time counters on it, create a 6/1 green Insect creature token with shroud.")); } public DeadlyGrub(final DeadlyGrub card) { diff --git a/Mage.Sets/src/mage/cards/d/DeathByDragons.java b/Mage.Sets/src/mage/cards/d/DeathByDragons.java index bcfa6c548db..793f6bea106 100644 --- a/Mage.Sets/src/mage/cards/d/DeathByDragons.java +++ b/Mage.Sets/src/mage/cards/d/DeathByDragons.java @@ -50,7 +50,7 @@ public class DeathByDragons extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{R}{R}"); - // Each player other than target player puts a 5/5 red Dragon creature token with flying onto the battlefield. + // Each player other than target player creates a 5/5 red Dragon creature token with flying. this.getSpellAbility().addEffect(new DeathByDragonsEffect()); this.getSpellAbility().addTarget(new TargetPlayer()); } @@ -69,7 +69,7 @@ class DeathByDragonsEffect extends OneShotEffect { public DeathByDragonsEffect() { super(Outcome.Detriment); - this.staticText = "Each player other than target player puts a 5/5 red Dragon creature token with flying onto the battlefield"; + this.staticText = "Each player other than target player creates a 5/5 red Dragon creature token with flying"; } public DeathByDragonsEffect(final DeathByDragonsEffect effect) { diff --git a/Mage.Sets/src/mage/cards/d/DeathMutation.java b/Mage.Sets/src/mage/cards/d/DeathMutation.java index e55e82d6de2..bc7cc0f1d3d 100644 --- a/Mage.Sets/src/mage/cards/d/DeathMutation.java +++ b/Mage.Sets/src/mage/cards/d/DeathMutation.java @@ -60,7 +60,7 @@ public class DeathMutation extends CardImpl { // Destroy target nonblack creature. It can't be regenerated. this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); this.getSpellAbility().addTarget(new TargetPermanent(filter)); - // Put X 1/1 green Saproling creature tokens onto the battlefield, where X is that creature's converted mana cost. + // create X 1/1 green Saproling creature tokens, where X is that creature's converted mana cost. this.getSpellAbility().addEffect(new CreateTokenEffect(new SaprolingToken(), new TargetConvertedManaCost())); } diff --git a/Mage.Sets/src/mage/cards/d/DeathpactAngel.java b/Mage.Sets/src/mage/cards/d/DeathpactAngel.java index 1f275432fff..f2425c7d5ba 100644 --- a/Mage.Sets/src/mage/cards/d/DeathpactAngel.java +++ b/Mage.Sets/src/mage/cards/d/DeathpactAngel.java @@ -29,8 +29,6 @@ package mage.cards.d; import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -43,6 +41,7 @@ import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffec import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.NamePredicate; @@ -56,7 +55,7 @@ import mage.target.common.TargetCardInYourGraveyard; public class DeathpactAngel extends CardImpl { public DeathpactAngel(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{B}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}{B}{B}"); this.subtype.add("Angel"); this.power = new MageInt(5); @@ -64,7 +63,7 @@ public class DeathpactAngel extends CardImpl { //Flying this.addAbility(FlyingAbility.getInstance()); - //When Deathpact Angel dies, put a 1/1 white and black Cleric creature token onto the battlefield. It has "{3}{W}{B}{B}, {T}, Sacrifice this creature: Return a card named Deathpact Angel from your graveyard to the battlefield." + //When Deathpact Angel dies, create a 1/1 white and black Cleric creature token. It has "{3}{W}{B}{B}, {T}, Sacrifice this creature: Return a card named Deathpact Angel from your graveyard to the battlefield." this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new DeathpactAngelToken()))); } @@ -78,25 +77,26 @@ public class DeathpactAngel extends CardImpl { } } - class DeathpactAngelToken extends Token { private static final FilterCreatureCard filter = new FilterCreatureCard("card named Deathpact Angel from your graveyard"); + static { filter.add(new NamePredicate("Deathpact Angel")); } + public DeathpactAngelToken() { - super("Cleric", "1/1 white and black Cleric creature token onto the battlefield. It has \"{3}{W}{B}{B}, {T}, Sacrifice this creature: Return a card named Deathpact Angel from your graveyard to the battlefield.\""); + super("Cleric", "1/1 white and black Cleric creature token. It has \"{3}{W}{B}{B}, {T}, Sacrifice this creature: Return a card named Deathpact Angel from your graveyard to the battlefield.\""); cardType.add(CardType.CREATURE); color.setWhite(true); color.setBlack(true); - + subtype.add("Cleric"); - + power = new MageInt(1); toughness = new MageInt(1); - + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl("{3}{W}{B}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); @@ -104,4 +104,4 @@ class DeathpactAngelToken extends Token { this.addAbility(ability); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/d/DeathsporeThallid.java b/Mage.Sets/src/mage/cards/d/DeathsporeThallid.java index a20f5a7de8c..923b6188f92 100644 --- a/Mage.Sets/src/mage/cards/d/DeathsporeThallid.java +++ b/Mage.Sets/src/mage/cards/d/DeathsporeThallid.java @@ -70,7 +70,7 @@ public class DeathsporeThallid extends CardImpl { // At the beginning of your upkeep, put a spore counter on Deathspore Thallid. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()), TargetController.YOU, false)); - // Remove three spore counters from Deathspore Thallid: Put a 1/1 green Saproling creature token onto the battlefield. + // Remove three spore counters from Deathspore Thallid: Create a 1/1 green Saproling creature token. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); diff --git a/Mage.Sets/src/mage/cards/d/DecreeOfJustice.java b/Mage.Sets/src/mage/cards/d/DecreeOfJustice.java index d9fb085f0dc..a812b8ff22b 100644 --- a/Mage.Sets/src/mage/cards/d/DecreeOfJustice.java +++ b/Mage.Sets/src/mage/cards/d/DecreeOfJustice.java @@ -58,13 +58,13 @@ public class DecreeOfJustice extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{X}{X}{2}{W}{W}"); - // Put X 4/4 white Angel creature tokens with flying onto the battlefield. + // create X 4/4 white Angel creature tokens with flying. this.getSpellAbility().addEffect(new CreateTokenEffect(new AngelToken(), new ManacostVariableValue())); // Cycling {2}{W} this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}{W}"))); - // When you cycle Decree of Justice, you may pay {X}. If you do, put X 1/1 white Soldier creature tokens onto the battlefield. + // When you cycle Decree of Justice, you may pay {X}. If you do, create X 1/1 white Soldier creature tokens. Ability ability = new CycleTriggeredAbility(new DecreeOfJusticeCycleEffect(), true); this.addAbility(ability); } @@ -83,7 +83,7 @@ class DecreeOfJusticeCycleEffect extends OneShotEffect { DecreeOfJusticeCycleEffect() { super(Outcome.Benefit); - this.staticText = "you may pay {X}. If you do, put X 1/1 white Soldier creature tokens onto the battlefield"; + this.staticText = "you may pay {X}. If you do, create X 1/1 white Soldier creature tokens"; } DecreeOfJusticeCycleEffect(final DecreeOfJusticeCycleEffect effect) { diff --git a/Mage.Sets/src/mage/cards/d/DemonicRising.java b/Mage.Sets/src/mage/cards/d/DemonicRising.java index 240359f3755..248d7660577 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicRising.java +++ b/Mage.Sets/src/mage/cards/d/DemonicRising.java @@ -44,12 +44,12 @@ import mage.constants.TargetController; */ public class DemonicRising extends CardImpl { - private static final String ruleText = "At the beginning of your end step, if you control exactly one creature, put a 5/5 black Demon creature token with flying onto the battlefield"; + private static final String ruleText = "At the beginning of your end step, if you control exactly one creature, create a 5/5 black Demon creature token with flying"; public DemonicRising(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{B}{B}"); - // At the beginning of your end step, if you control exactly one creature, put a 5/5 black Demon creature token with flying onto the battlefield. + // At the beginning of your end step, if you control exactly one creature, create a 5/5 black Demon creature token with flying. TriggeredAbility ability = new BeginningOfYourEndStepTriggeredAbility(new CreateTokenEffect(new DemonToken()), false); this.addAbility(new ConditionalTriggeredAbility(ability, new CreatureCountCondition(1, TargetController.YOU), ruleText)); } diff --git a/Mage.Sets/src/mage/cards/d/DeployToTheFront.java b/Mage.Sets/src/mage/cards/d/DeployToTheFront.java index 2ad3a9e7984..89aa7a72b46 100644 --- a/Mage.Sets/src/mage/cards/d/DeployToTheFront.java +++ b/Mage.Sets/src/mage/cards/d/DeployToTheFront.java @@ -46,9 +46,9 @@ public class DeployToTheFront extends CardImpl { public DeployToTheFront(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{5}{W}{W}"); - // Put X 1/1 white Soldier creature tokens onto the battlefield, where X is the number of creatures on the battlefield. + // create X 1/1 white Soldier creature tokens, where X is the number of creatures on the battlefield. Effect effect = new CreateTokenEffect(new SoldierToken(), new PermanentsOnBattlefieldCount(new FilterCreaturePermanent("the number of creatures on the battlefield"))); - effect.setText("Put X 1/1 white Soldier creature tokens onto the battlefield, where X is the number of creatures on the battlefield"); + effect.setText("create X 1/1 white Soldier creature tokens, where X is the number of creatures on the battlefield"); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/cards/d/DerangedHermit.java b/Mage.Sets/src/mage/cards/d/DerangedHermit.java index 3225c6b98c4..b3c087b880e 100644 --- a/Mage.Sets/src/mage/cards/d/DerangedHermit.java +++ b/Mage.Sets/src/mage/cards/d/DerangedHermit.java @@ -64,7 +64,7 @@ public class DerangedHermit extends CardImpl { // Echo {3}{G}{G} this.addAbility(new EchoAbility("{3}{G}{G}")); - // When Deranged Hermit enters the battlefield, put four 1/1 green Squirrel creature tokens onto the battlefield. + // When Deranged Hermit enters the battlefield, create four 1/1 green Squirrel creature tokens. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new SquirrelToken(), 4))); // Squirrel creatures get +1/+1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); diff --git a/Mage.Sets/src/mage/cards/d/DescendUponTheSinful.java b/Mage.Sets/src/mage/cards/d/DescendUponTheSinful.java index 2f65d6bdb3a..939fa14e80d 100644 --- a/Mage.Sets/src/mage/cards/d/DescendUponTheSinful.java +++ b/Mage.Sets/src/mage/cards/d/DescendUponTheSinful.java @@ -51,9 +51,9 @@ public class DescendUponTheSinful extends CardImpl { // Exile all creatures this.getSpellAbility().addEffect(new ExileAllEffect(new FilterCreaturePermanent())); - // Delirium — Put a 4/4 white Angel creature token with flying onto the battlefield if there are four or more card types among cards in your graveyard. + // Delirium — Create a 4/4 white Angel creature token with flying if there are four or more card types among cards in your graveyard. Effect effect = new ConditionalOneShotEffect(new CreateTokenEffect(new AngelToken()), DeliriumCondition.getInstance()); - effect.setText("
Delirium — Put a 4/4 white Angel creature token with flying onto the battlefield if there are four or more card types among cards in your graveyard"); + effect.setText("
Delirium — Create a 4/4 white Angel creature token with flying if there are four or more card types among cards in your graveyard"); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/cards/d/DescentOfTheDragons.java b/Mage.Sets/src/mage/cards/d/DescentOfTheDragons.java index 40fab4e1c33..62042d90468 100644 --- a/Mage.Sets/src/mage/cards/d/DescentOfTheDragons.java +++ b/Mage.Sets/src/mage/cards/d/DescentOfTheDragons.java @@ -51,7 +51,7 @@ public class DescentOfTheDragons extends CardImpl { public DescentOfTheDragons(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{R}{R}"); - // Destroy any number of target creatures. For each creature destroyed this way, its controller puts a 4/4 red Dragon creature token with flying onto the battlefield. + // Destroy any number of target creatures. For each creature destroyed this way, its controller creates a 4/4 red Dragon creature token with flying. this.getSpellAbility().addEffect(new DescentOfTheDragonsEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent(0, Integer.MAX_VALUE)); @@ -71,7 +71,7 @@ class DescentOfTheDragonsEffect extends OneShotEffect { public DescentOfTheDragonsEffect() { super(Outcome.Benefit); - staticText = "Destroy any number of target creatures. For each creature destroyed this way, its controller puts a 4/4 red Dragon creature token with flying onto the battlefield"; + staticText = "Destroy any number of target creatures. For each creature destroyed this way, its controller creates a 4/4 red Dragon creature token with flying"; } public DescentOfTheDragonsEffect(final DescentOfTheDragonsEffect effect) { diff --git a/Mage.Sets/src/mage/cards/d/DesolationTwin.java b/Mage.Sets/src/mage/cards/d/DesolationTwin.java index 484f8757e97..a29fd4fb902 100644 --- a/Mage.Sets/src/mage/cards/d/DesolationTwin.java +++ b/Mage.Sets/src/mage/cards/d/DesolationTwin.java @@ -53,7 +53,7 @@ public class DesolationTwin extends CardImpl { this.power = new MageInt(10); this.toughness = new MageInt(10); - // When you cast Desolation Twin, put a 10/10 colorless Eldrazi creature token onto the battlefield. + // When you cast Desolation Twin, create a 10/10 colorless Eldrazi creature token. this.addAbility(new DesolationTwinOnCastAbility()); } diff --git a/Mage.Sets/src/mage/cards/d/DesperateSentry.java b/Mage.Sets/src/mage/cards/d/DesperateSentry.java index f71c6056a42..eaba1653432 100644 --- a/Mage.Sets/src/mage/cards/d/DesperateSentry.java +++ b/Mage.Sets/src/mage/cards/d/DesperateSentry.java @@ -56,7 +56,7 @@ public class DesperateSentry extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - // When Desperate Sentry dies, put a 3/2 colorless Eldrazi Horror creature token onto the battlefield. + // When Desperate Sentry dies, create a 3/2 colorless Eldrazi Horror creature token. this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new EldraziHorrorToken()), false)); // Delirium — Desperate Sentry gets +3/+0 as long as there are four or more card types among cards in your graveyard. diff --git a/Mage.Sets/src/mage/cards/d/DevastatingSummons.java b/Mage.Sets/src/mage/cards/d/DevastatingSummons.java index a75a70381a0..8ebba44850b 100644 --- a/Mage.Sets/src/mage/cards/d/DevastatingSummons.java +++ b/Mage.Sets/src/mage/cards/d/DevastatingSummons.java @@ -53,7 +53,7 @@ public class DevastatingSummons extends CardImpl { // As an additional cost to cast Devastating Summons, sacrifice X lands. this.getSpellAbility().addCost(new SacrificeXTargetCost(new FilterControlledLandPermanent("lands"), true)); - // Put two X/X red Elemental creature tokens onto the battlefield. + // Create two X/X red Elemental creature tokens. this.getSpellAbility().addEffect(new DevastatingSummonsEffect()); } @@ -71,7 +71,7 @@ class DevastatingSummonsEffect extends OneShotEffect { public DevastatingSummonsEffect() { super(Outcome.PutCreatureInPlay); - staticText = "Put two X/X red Elemental creature tokens onto the battlefield"; + staticText = "Create two X/X red Elemental creature tokens"; } public DevastatingSummonsEffect(final DevastatingSummonsEffect effect) { diff --git a/Mage.Sets/src/mage/cards/d/DevilsPlayground.java b/Mage.Sets/src/mage/cards/d/DevilsPlayground.java index 0387b114475..aba8268be22 100644 --- a/Mage.Sets/src/mage/cards/d/DevilsPlayground.java +++ b/Mage.Sets/src/mage/cards/d/DevilsPlayground.java @@ -44,9 +44,9 @@ public class DevilsPlayground extends CardImpl { public DevilsPlayground(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{R}{R}"); - // Put four 1/1 red Devil creature tokens onto the battlefield. 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 target creature or player." Effect effect = new CreateTokenEffect(new DevilToken(), 4); - effect.setText("Put four 1/1 red Devil creature tokens onto the battlefield. 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 target creature or player.\""); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/cards/d/DevoutInvocation.java b/Mage.Sets/src/mage/cards/d/DevoutInvocation.java index dd42a6ff0af..d1453073970 100644 --- a/Mage.Sets/src/mage/cards/d/DevoutInvocation.java +++ b/Mage.Sets/src/mage/cards/d/DevoutInvocation.java @@ -54,7 +54,7 @@ public class DevoutInvocation extends CardImpl { public DevoutInvocation(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{6}{W}"); - // Tap any number of untapped creatures you control. Put a 4/4 white Angel creature token with flying onto the battlefield for each creature tapped this way. + // Tap any number of untapped creatures you control. Create a 4/4 white Angel creature token with flying for each creature tapped this way. this.getSpellAbility().addEffect(new DevoutInvocationEffect()); } @@ -79,7 +79,7 @@ class DevoutInvocationEffect extends OneShotEffect { public DevoutInvocationEffect() { super(Outcome.PutCreatureInPlay); - staticText = "Tap any number of untapped creatures you control. Put a 4/4 white Angel creature token with flying onto the battlefield for each creature tapped this way"; + staticText = "Tap any number of untapped creatures you control. Create a 4/4 white Angel creature token with flying for each creature tapped this way"; } public DevoutInvocationEffect(DevoutInvocationEffect effect) { diff --git a/Mage.Sets/src/mage/cards/d/DiamondKaleidoscope.java b/Mage.Sets/src/mage/cards/d/DiamondKaleidoscope.java index 5c0e4d924ab..2ad5e1e9317 100644 --- a/Mage.Sets/src/mage/cards/d/DiamondKaleidoscope.java +++ b/Mage.Sets/src/mage/cards/d/DiamondKaleidoscope.java @@ -61,7 +61,7 @@ public class DiamondKaleidoscope extends CardImpl { public DiamondKaleidoscope(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); - // {3}, {tap}: Put a 0/1 colorless Prism artifact creature token onto the battlefield. + // {3}, {tap}: Create a 0/1 colorless Prism artifact creature token. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new PrismToken(), 1), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DinOfTheFireherd.java b/Mage.Sets/src/mage/cards/d/DinOfTheFireherd.java index 853d57d2734..1350cb42340 100644 --- a/Mage.Sets/src/mage/cards/d/DinOfTheFireherd.java +++ b/Mage.Sets/src/mage/cards/d/DinOfTheFireherd.java @@ -54,9 +54,9 @@ import mage.target.targetpointer.FixedTarget; public class DinOfTheFireherd extends CardImpl { public DinOfTheFireherd(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{5}{B/R}{B/R}{B/R}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{5}{B/R}{B/R}{B/R}"); - // Put a 5/5 black and red Elemental creature token onto the battlefield. Target opponent sacrifices a creature for each black creature you control, then sacrifices a land for each red creature you control. + // Create a 5/5 black and red Elemental creature token. Target opponent sacrifices a creature for each black creature you control, then sacrifices a land for each red creature you control. this.getSpellAbility().addEffect(new DinOfTheFireherdEffect()); this.getSpellAbility().addTarget(new TargetOpponent()); } @@ -83,7 +83,7 @@ class DinOfTheFireherdEffect extends OneShotEffect { public DinOfTheFireherdEffect() { super(Outcome.Neutral); - this.staticText = "Put a 5/5 black and red Elemental creature token onto the battlefield. Target opponent sacrifices a creature for each black creature you control, then sacrifices a land for each red creature you control"; + this.staticText = "create a 5/5 black and red Elemental creature token. Target opponent sacrifices a creature for each black creature you control, then sacrifices a land for each red creature you control"; } public DinOfTheFireherdEffect(final DinOfTheFireherdEffect effect) { diff --git a/Mage.Sets/src/mage/cards/d/DiregrafColossus.java b/Mage.Sets/src/mage/cards/d/DiregrafColossus.java index a1c289635f7..1a50401ffd1 100644 --- a/Mage.Sets/src/mage/cards/d/DiregrafColossus.java +++ b/Mage.Sets/src/mage/cards/d/DiregrafColossus.java @@ -69,7 +69,7 @@ public class DiregrafColossus extends CardImpl { // Diregraf Colossus enters the battlefield with a +1/+1 counter on it for each Zombie card in your graveyard. this.addAbility(new EntersBattlefieldAbility(new DiregrafColossusEffect(), "with a +1/+1 counter on it for each Zombie card in your graveyard")); - // Whenever you cast a Zombie spell, put a 2/2 black Zombie creature token onto the battlefield tapped. + // Whenever you cast a Zombie spell, create a 2/2 black Zombie creature token tapped. this.addAbility(new SpellCastControllerTriggeredAbility(new CreateTokenEffect(new ZombieToken(), 1, true, false), filter, false)); } diff --git a/Mage.Sets/src/mage/cards/d/DocentOfPerfection.java b/Mage.Sets/src/mage/cards/d/DocentOfPerfection.java index a91e122e4ca..37e4f74dabb 100644 --- a/Mage.Sets/src/mage/cards/d/DocentOfPerfection.java +++ b/Mage.Sets/src/mage/cards/d/DocentOfPerfection.java @@ -80,7 +80,7 @@ public class DocentOfPerfection extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // Whenever you cast an instant or sorcery spell, put a 1/1 blue Human Wizard creature token onto the battlefield. + // Whenever you cast an instant or sorcery spell, create a 1/1 blue Human Wizard creature token. // Then if you control three or more Wizards, transform Docent of Perfection. this.addAbility(new TransformAbility()); Effect effect = new DocentOfPerfectionEffect(); diff --git a/Mage.Sets/src/mage/cards/d/DoomedTraveler.java b/Mage.Sets/src/mage/cards/d/DoomedTraveler.java index c859e09cded..ad5b971ff02 100644 --- a/Mage.Sets/src/mage/cards/d/DoomedTraveler.java +++ b/Mage.Sets/src/mage/cards/d/DoomedTraveler.java @@ -50,7 +50,7 @@ public class DoomedTraveler extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // When Doomed Traveler dies, put a 1/1 white Spirit creature token with flying onto the battlefield. + // When Doomed Traveler dies, create a 1/1 white Spirit creature token with flying. this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new SpiritWhiteToken()))); } diff --git a/Mage.Sets/src/mage/cards/d/DoublingSeason.java b/Mage.Sets/src/mage/cards/d/DoublingSeason.java index 7e9f3671232..47da3761361 100644 --- a/Mage.Sets/src/mage/cards/d/DoublingSeason.java +++ b/Mage.Sets/src/mage/cards/d/DoublingSeason.java @@ -51,7 +51,7 @@ public class DoublingSeason extends CardImpl { public DoublingSeason(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{G}"); - // If an effect would put one or more tokens onto the battlefield under your control, it puts twice that many of those tokens onto the battlefield instead. + // If an effect would create one or more tokens under your control, it creates twice that many of those tokens instead. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DoublingSeasonTokenEffect())); // If an effect would place one or more counters on a permanent you control, it places twice that many of those counters on that permanent instead. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DoublingSeasonCounterEffect())); @@ -72,7 +72,7 @@ class DoublingSeasonTokenEffect extends ReplacementEffectImpl { public DoublingSeasonTokenEffect() { super(Duration.WhileOnBattlefield, Outcome.Copy); - staticText = "If an effect would put one or more tokens onto the battlefield under your control, it puts twice that many of those tokens onto the battlefield instead"; + staticText = "If an effect would create one or more tokens under your control, it creates twice that many of those tokens instead"; } public DoublingSeasonTokenEffect(final DoublingSeasonTokenEffect effect) { diff --git a/Mage.Sets/src/mage/cards/d/Dovescape.java b/Mage.Sets/src/mage/cards/d/Dovescape.java index 97fd5000cff..1ca4b64ed80 100644 --- a/Mage.Sets/src/mage/cards/d/Dovescape.java +++ b/Mage.Sets/src/mage/cards/d/Dovescape.java @@ -60,7 +60,7 @@ public class Dovescape extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{W/U}{W/U}{W/U}"); - // Whenever a player casts a noncreature spell, counter that spell. That player puts X 1/1 white and blue Bird creature tokens with flying onto the battlefield, where X is the spell's converted mana cost. + // Whenever a player casts a noncreature spell, counter that spell. That player creates X 1/1 white and blue Bird creature tokens with flying, where X is the spell's converted mana cost. this.addAbility(new SpellCastAllTriggeredAbility(new DovescapeEffect(), filter, false, SetTargetPointer.SPELL)); } @@ -78,7 +78,7 @@ class DovescapeEffect extends OneShotEffect { DovescapeEffect() { super(Outcome.Benefit); - this.staticText = "counter that spell. That player puts X 1/1 white and blue Bird creature tokens with flying onto the battlefield, where X is the spell's converted mana cost"; + this.staticText = "counter that spell. That player creates X 1/1 white and blue Bird creature tokens with flying, where X is the spell's converted mana cost"; } DovescapeEffect(final DovescapeEffect effect) { diff --git a/Mage.Sets/src/mage/cards/d/DragonBroodmother.java b/Mage.Sets/src/mage/cards/d/DragonBroodmother.java index f793c003e7e..f1977ced4c7 100644 --- a/Mage.Sets/src/mage/cards/d/DragonBroodmother.java +++ b/Mage.Sets/src/mage/cards/d/DragonBroodmother.java @@ -28,8 +28,6 @@ package mage.cards.d; import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -38,6 +36,7 @@ import mage.abilities.keyword.DevourAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TargetController; import mage.game.permanent.token.Token; @@ -48,17 +47,16 @@ import mage.game.permanent.token.Token; public class DragonBroodmother extends CardImpl { public DragonBroodmother(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}{R}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}{R}{R}{G}"); this.subtype.add("Dragon"); - this.power = new MageInt(4); this.toughness = new MageInt(4); // Flying this.addAbility(FlyingAbility.getInstance()); - // At the beginning of each upkeep, put a 1/1 red and green Dragon creature token with flying and devour 2 onto the battlefield. (As the token enters the battlefield, you may sacrifice any number of creatures. It enters the battlefield with twice that many +1/+1 counters on it.) + // At the beginning of each upkeep, create a 1/1 red and green Dragon creature token with flying and devour 2. (As the token enters the battlefield, you may sacrifice any number of creatures. It enters the battlefield with twice that many +1/+1 counters on it.) this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new DragonToken()), TargetController.ANY, false)); } @@ -72,6 +70,7 @@ public class DragonBroodmother extends CardImpl { } class DragonToken extends Token { + DragonToken() { super("Dragon", "1/1 red and green Dragon creature token with flying and devour 2"); cardType.add(CardType.CREATURE); diff --git a/Mage.Sets/src/mage/cards/d/DragonEgg.java b/Mage.Sets/src/mage/cards/d/DragonEgg.java index d0dc9acc729..c73a9b9246e 100644 --- a/Mage.Sets/src/mage/cards/d/DragonEgg.java +++ b/Mage.Sets/src/mage/cards/d/DragonEgg.java @@ -59,7 +59,7 @@ public class DragonEgg extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); - // When Dragon Egg dies, put a 2/2 red Dragon creature token with flying onto the battlefield. It has "{R}: This creature gets +1/+0 until end of turn". + // When Dragon Egg dies, create a 2/2 red Dragon creature token with flying. It has "{R}: This creature gets +1/+0 until end of turn". this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new DragonToken()), false)); } diff --git a/Mage.Sets/src/mage/cards/d/DragonFodder.java b/Mage.Sets/src/mage/cards/d/DragonFodder.java index 9137fa7f708..04f743bc7f1 100644 --- a/Mage.Sets/src/mage/cards/d/DragonFodder.java +++ b/Mage.Sets/src/mage/cards/d/DragonFodder.java @@ -43,7 +43,7 @@ public class DragonFodder extends CardImpl { public DragonFodder(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{R}"); - // Put two 1/1 red Goblin creature tokens onto the battlefield. + // Create two 1/1 red Goblin creature tokens. this.getSpellAbility().addEffect(new CreateTokenEffect(new GoblinToken(), 2)); } diff --git a/Mage.Sets/src/mage/cards/d/DragonWhisperer.java b/Mage.Sets/src/mage/cards/d/DragonWhisperer.java index 6fdc35a4a65..437df52af85 100644 --- a/Mage.Sets/src/mage/cards/d/DragonWhisperer.java +++ b/Mage.Sets/src/mage/cards/d/DragonWhisperer.java @@ -69,7 +69,7 @@ public class DragonWhisperer extends CardImpl { new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}{R}"))); - // - {4}{R}{R}: Put a 4/4 red Dragon creature token with flying onto the battlefield. Activate this ability only if creatures you control have total power 8 or greater. + // - {4}{R}{R}: Create a 4/4 red Dragon creature token with flying. Activate this ability only if creatures you control have total power 8 or greater. Ability ability = new ActivateIfConditionActivatedAbility( Zone.BATTLEFIELD, new CreateTokenEffect(new DragonToken()), diff --git a/Mage.Sets/src/mage/cards/d/DragonlairSpider.java b/Mage.Sets/src/mage/cards/d/DragonlairSpider.java index 3f30a7a83bc..dd917237657 100644 --- a/Mage.Sets/src/mage/cards/d/DragonlairSpider.java +++ b/Mage.Sets/src/mage/cards/d/DragonlairSpider.java @@ -54,7 +54,7 @@ public class DragonlairSpider extends CardImpl { // Reach this.addAbility(ReachAbility.getInstance()); - // Whenever an opponent casts a spell, put a 1/1 green Insect creature token onto the battlefield. + // Whenever an opponent casts a spell, create a 1/1 green Insect creature token. this.addAbility(new SpellCastOpponentTriggeredAbility(new CreateTokenEffect(new InsectToken()), false)); diff --git a/Mage.Sets/src/mage/cards/d/DragonmasterOutcast.java b/Mage.Sets/src/mage/cards/d/DragonmasterOutcast.java index cfc63279a56..7e848ba82cd 100644 --- a/Mage.Sets/src/mage/cards/d/DragonmasterOutcast.java +++ b/Mage.Sets/src/mage/cards/d/DragonmasterOutcast.java @@ -63,9 +63,9 @@ public class DragonmasterOutcast extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // At the beginning of your upkeep, if you control six or more lands, put a 5/5 red Dragon creature token with flying onto the battlefield. + // At the beginning of your upkeep, if you control six or more lands, create a 5/5 red Dragon creature token with flying. TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new DragonToken2(), 1), TargetController.YOU, false); - this.addAbility(new ConditionalTriggeredAbility(ability, new PermanentsOnTheBattlefieldCondition(filter, PermanentsOnTheBattlefieldCondition.CountType.MORE_THAN, 5), "At the beginning of your upkeep, if you control six or more lands, put a 5/5 red Dragon creature token with flying onto the battlefield.")); + this.addAbility(new ConditionalTriggeredAbility(ability, new PermanentsOnTheBattlefieldCondition(filter, PermanentsOnTheBattlefieldCondition.CountType.MORE_THAN, 5), "At the beginning of your upkeep, if you control six or more lands, create a 5/5 red Dragon creature token with flying.")); } public DragonmasterOutcast(final DragonmasterOutcast card) { diff --git a/Mage.Sets/src/mage/cards/d/DranasChosen.java b/Mage.Sets/src/mage/cards/d/DranasChosen.java index a1ed4683dd9..b182d7d67e3 100644 --- a/Mage.Sets/src/mage/cards/d/DranasChosen.java +++ b/Mage.Sets/src/mage/cards/d/DranasChosen.java @@ -67,7 +67,7 @@ public class DranasChosen extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // Cohort — {T}, Tap an untapped Ally you control: Put a 2/2 black Zombie creature token onto the battlefield tapped. + // Cohort — {T}, Tap an untapped Ally you control: Create a 2/2 black Zombie creature token tapped. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ZombieToken(), 1, true, false), new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledPermanent(filter))); ability.setAbilityWord(AbilityWord.COHORT); diff --git a/Mage.Sets/src/mage/cards/d/DreadSummons.java b/Mage.Sets/src/mage/cards/d/DreadSummons.java index a0110bddd19..be8ace38f5d 100644 --- a/Mage.Sets/src/mage/cards/d/DreadSummons.java +++ b/Mage.Sets/src/mage/cards/d/DreadSummons.java @@ -49,9 +49,9 @@ import mage.players.Player; public class DreadSummons extends CardImpl { public DreadSummons(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{X}{B}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{X}{B}{B}"); - // Each player puts the top X cards of his or her library into his or her graveyard. For each creature card put into a graveyard this way, you put a 2/2 black Zombie creature token onto the battlefield tapped. + // Each player puts the top X cards of his or her library into his or her graveyard. For each creature card put into a graveyard this way, you create a 2/2 black Zombie creature token tapped. getSpellAbility().addEffect(new DreadSummonsEffect()); } @@ -69,7 +69,7 @@ class DreadSummonsEffect extends OneShotEffect { public DreadSummonsEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Each player puts the top X cards of his or her library into his or her graveyard. For each creature card put into a graveyard this way, you put a 2/2 black Zombie creature token onto the battlefield tapped"; + this.staticText = "Each player puts the top X cards of his or her library into his or her graveyard. For each creature card put into a graveyard this way, you create a 2/2 black Zombie creature token tapped"; } public DreadSummonsEffect(final DreadSummonsEffect effect) { diff --git a/Mage.Sets/src/mage/cards/d/DreampodDruid.java b/Mage.Sets/src/mage/cards/d/DreampodDruid.java index ea2472ef6e1..5dc74b143ab 100644 --- a/Mage.Sets/src/mage/cards/d/DreampodDruid.java +++ b/Mage.Sets/src/mage/cards/d/DreampodDruid.java @@ -28,8 +28,6 @@ package mage.cards.d; import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.condition.common.EnchantedSourceCondition; @@ -37,6 +35,7 @@ import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; import mage.game.permanent.token.SaprolingToken; @@ -48,18 +47,18 @@ import mage.game.permanent.token.SaprolingToken; public class DreampodDruid extends CardImpl { public DreampodDruid(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{G}"); this.subtype.add("Human"); this.subtype.add("Druid"); this.power = new MageInt(2); this.toughness = new MageInt(2); - // At the beginning of each upkeep, if Dreampod Druid is enchanted, put a 1/1 green Saproling creature token onto the battlefield. + // At the beginning of each upkeep, if Dreampod Druid is enchanted, create a 1/1 green Saproling creature token. this.addAbility(new ConditionalTriggeredAbility( - new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken(),1), TargetController.ANY, false, false), + new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken(), 1), TargetController.ANY, false, false), new EnchantedSourceCondition(), - "At the beginning of each upkeep, if Dreampod Druid is enchanted, put a 1/1 green Saproling creature token onto the battlefield.")); + "At the beginning of each upkeep, if Dreampod Druid is enchanted, create a 1/1 green Saproling creature token.")); } public DreampodDruid(final DreampodDruid card) { diff --git a/Mage.Sets/src/mage/cards/d/DrogskolCavalry.java b/Mage.Sets/src/mage/cards/d/DrogskolCavalry.java index f29778573cb..58c8eb82246 100644 --- a/Mage.Sets/src/mage/cards/d/DrogskolCavalry.java +++ b/Mage.Sets/src/mage/cards/d/DrogskolCavalry.java @@ -70,7 +70,7 @@ public class DrogskolCavalry extends CardImpl { // Whenever another Spirit enters the battlefield under your control, you gain 2 life. this.addAbility(new EntersBattlefieldControlledTriggeredAbility(new GainLifeEffect(2), filter)); - // {3}{W}: Put a 1/1 white Spirit creature token with flying onto the battlefield. + // {3}{W}: Create a 1/1 white Spirit creature token with flying. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SpiritWhiteToken()), new ManaCostsImpl("{3}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/d/DrownerOfHope.java b/Mage.Sets/src/mage/cards/d/DrownerOfHope.java index f2e8e1ae0e1..33ed8aff565 100644 --- a/Mage.Sets/src/mage/cards/d/DrownerOfHope.java +++ b/Mage.Sets/src/mage/cards/d/DrownerOfHope.java @@ -71,9 +71,9 @@ public class DrownerOfHope extends CardImpl { // Devoid this.addAbility(new DevoidAbility(this.color)); - // When Drowner of Hope enters the battlefield, put two 1/1 colorless Eldrazi Scion creature tokens onto the battlefield. They have "Sacrifice this creature: Add {C} to your mana pool." + // When Drowner of Hope enters the battlefield, create two 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool." Effect effect = new CreateTokenEffect(new EldraziScionToken(), 2); - effect.setText("put two 1/1 colorless Eldrazi Scion creature tokens onto the battlefield. They have \"Sacrifice this creature: Add {C} to your mana pool"); + effect.setText("create two 1/1 colorless Eldrazi Scion creature tokens. They have \"Sacrifice this creature: Add {C} to your mana pool"); this.addAbility(new EntersBattlefieldTriggeredAbility(effect, false)); // Sacrifice an Eldrazi Scion: Tap target creature. diff --git a/Mage.Sets/src/mage/cards/d/DrudgeSpell.java b/Mage.Sets/src/mage/cards/d/DrudgeSpell.java index faf14599326..0abeb15866a 100644 --- a/Mage.Sets/src/mage/cards/d/DrudgeSpell.java +++ b/Mage.Sets/src/mage/cards/d/DrudgeSpell.java @@ -27,6 +27,7 @@ */ package mage.cards.d; +import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.LeavesBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -46,31 +47,29 @@ import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.SkeletonToken; import mage.target.common.TargetCardInYourGraveyard; -import java.util.UUID; - /** * * @author fireshoes */ public class DrudgeSpell extends CardImpl { - + private static final FilterPermanent filter = new FilterPermanent("Skeleton tokens"); - + static { filter.add(new SubtypePredicate("Skeleton")); filter.add(new TokenPredicate()); } public DrudgeSpell(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{B}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{B}{B}"); - // {B}, Exile two creature cards from your graveyard: Put a 1/1 black Skeleton creature token onto the battlefield. It has "{B}: Regenerate this creature." + // {B}, Exile two creature cards from your graveyard: Create a 1/1 black Skeleton creature token. It has "{B}: Regenerate this creature." Effect effect = new CreateTokenEffect(new SkeletonToken()); - effect.setText("Put a 1/1 black Skeleton creature token onto the battlefield. It has \"{B}: Regenerate this creature.\""); + effect.setText("create a 1/1 black Skeleton creature token. It has \"{B}: Regenerate this creature.\""); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{B}")); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(2, 2, new FilterCreatureCard("creature cards from your graveyard")))); this.addAbility(ability); - + // When Drudge Spell leaves the battlefield, destroy all Skeleton tokens. They can't be regenerated. this.addAbility(new LeavesBattlefieldTriggeredAbility(new DestroyAllEffect(filter, true), false)); } diff --git a/Mage.Sets/src/mage/cards/d/DruidicSatchel.java b/Mage.Sets/src/mage/cards/d/DruidicSatchel.java index b057e8cdd99..c6721d06b36 100644 --- a/Mage.Sets/src/mage/cards/d/DruidicSatchel.java +++ b/Mage.Sets/src/mage/cards/d/DruidicSatchel.java @@ -28,9 +28,6 @@ package mage.cards.d; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -41,6 +38,9 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.token.SaprolingToken; import mage.game.permanent.token.Token; @@ -53,7 +53,7 @@ import mage.players.Player; public class DruidicSatchel extends CardImpl { public DruidicSatchel(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DruidicSatchelEffect(), new ManaCostsImpl("{2}")); ability.addCost(new TapSourceCost()); @@ -74,7 +74,7 @@ class DruidicSatchelEffect extends OneShotEffect { public DruidicSatchelEffect() { super(Outcome.Benefit); - staticText = "Reveal the top card of your library. If it's a creature card, put a 1/1 green Saproling creature token onto the battlefield. If it's a land card, put that card onto the battlefield under your control. If it's a noncreature, nonland card, you gain 2 life"; + staticText = "Reveal the top card of your library. If it's a creature card, create a 1/1 green Saproling creature token. If it's a land card, put that card onto the battlefield under your control. If it's a noncreature, nonland card, you gain 2 life"; } public DruidicSatchelEffect(final DruidicSatchelEffect effect) { diff --git a/Mage.Sets/src/mage/cards/d/DruidsCall.java b/Mage.Sets/src/mage/cards/d/DruidsCall.java index 8e939529de0..4b64b5dba0c 100644 --- a/Mage.Sets/src/mage/cards/d/DruidsCall.java +++ b/Mage.Sets/src/mage/cards/d/DruidsCall.java @@ -63,9 +63,9 @@ public class DruidsCall extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // Whenever enchanted creature is dealt damage, its controller puts that many 1/1 green Squirrel creature tokens onto the battlefield. + // Whenever enchanted creature is dealt damage, its controller creates that many 1/1 green Squirrel creature tokens. Effect effect = new CreateTokenTargetEffect(new SquirrelToken(), new NumericSetToEffectValues("that much", "damage")); - effect.setText("its controller puts that many 1/1 green Squirrel creature tokens onto the battlefield"); + effect.setText("its controller creates that many 1/1 green Squirrel creature tokens"); this.addAbility(new DamageDealtToAttachedTriggeredAbility(Zone.BATTLEFIELD, effect, false, SetTargetPointer.PLAYER)); } diff --git a/Mage.Sets/src/mage/cards/d/DruidsDeliverance.java b/Mage.Sets/src/mage/cards/d/DruidsDeliverance.java index 79604f21068..1ff726690db 100644 --- a/Mage.Sets/src/mage/cards/d/DruidsDeliverance.java +++ b/Mage.Sets/src/mage/cards/d/DruidsDeliverance.java @@ -50,7 +50,7 @@ public class DruidsDeliverance extends CardImpl { // Prevent all combat damage that would be dealt to you this turn. Populate. - // (Put a token onto the battlefield that's a copy of a creature token you control.) + // (Create a token that's a copy of a creature token you control.) this.getSpellAbility().addEffect(new DruidsDeliverancePreventCombatDamageEffect()); this.getSpellAbility().addEffect(new PopulateEffect()); } diff --git a/Mage.Sets/src/mage/cards/d/DrunauCorpseTrawler.java b/Mage.Sets/src/mage/cards/d/DrunauCorpseTrawler.java index 530886c778f..102e6842555 100644 --- a/Mage.Sets/src/mage/cards/d/DrunauCorpseTrawler.java +++ b/Mage.Sets/src/mage/cards/d/DrunauCorpseTrawler.java @@ -57,7 +57,7 @@ public class DrunauCorpseTrawler extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // When Drunau Corpse Trawler enters the battlefield, put a 2/2 black Zombie creature token onto the battlefield. + // When Drunau Corpse Trawler enters the battlefield, create a 2/2 black Zombie creature token. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new ZombieToken()))); // {2}{B}: Target Zombie gains deathtouch until end of turn. diff --git a/Mage.Sets/src/mage/cards/d/DuneBroodNephilim.java b/Mage.Sets/src/mage/cards/d/DuneBroodNephilim.java index a222603b25d..42adfc50a65 100644 --- a/Mage.Sets/src/mage/cards/d/DuneBroodNephilim.java +++ b/Mage.Sets/src/mage/cards/d/DuneBroodNephilim.java @@ -54,7 +54,7 @@ public class DuneBroodNephilim extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - // Whenever Dune-Brood Nephilim deals combat damage to a player, put a 1/1 colorless Sand creature token onto the battlefield for each land you control. + // Whenever Dune-Brood Nephilim deals combat damage to a player, create a 1/1 colorless Sand creature token for each land you control. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new CreateTokenEffect(new DuneBroodNephilimToken(), new PermanentsOnBattlefieldCount(filterLands)), false)); } diff --git a/Mage.Sets/src/mage/cards/d/DwynensElite.java b/Mage.Sets/src/mage/cards/d/DwynensElite.java index f088d5fac3f..0955e1a533d 100644 --- a/Mage.Sets/src/mage/cards/d/DwynensElite.java +++ b/Mage.Sets/src/mage/cards/d/DwynensElite.java @@ -57,18 +57,18 @@ public class DwynensElite extends CardImpl { } public DwynensElite(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{G}"); this.subtype.add("Elf"); this.subtype.add("Warrior"); this.power = new MageInt(2); this.toughness = new MageInt(2); - // When Dwynen's Elite enters the battlefield, if you control another Elf, put a 1/1 green Elf Warrior creature token onto the battlefield. + // When Dwynen's Elite enters the battlefield, if you control another Elf, create a 1/1 green Elf Warrior creature token. TriggeredAbility triggeredAbility = new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new ElfToken())); this.addAbility(new ConditionalTriggeredAbility( triggeredAbility, new PermanentsOnTheBattlefieldCondition(filter, CountType.MORE_THAN, 0), - "When {this} enters the battlefield, if you control another Elf, put a 1/1 green Elf Warrior creature token onto the battlefield.")); + "When {this} enters the battlefield, if you control another Elf, create a 1/1 green Elf Warrior creature token.")); } public DwynensElite(final DwynensElite card) { diff --git a/Mage.Sets/src/mage/cards/e/EldraziSkyspawner.java b/Mage.Sets/src/mage/cards/e/EldraziSkyspawner.java index 5c331561b71..cd63ed45807 100644 --- a/Mage.Sets/src/mage/cards/e/EldraziSkyspawner.java +++ b/Mage.Sets/src/mage/cards/e/EldraziSkyspawner.java @@ -46,7 +46,7 @@ import mage.game.permanent.token.EldraziScionToken; public class EldraziSkyspawner extends CardImpl { public EldraziSkyspawner(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}"); this.subtype.add("Eldrazi"); this.subtype.add("Drone"); this.power = new MageInt(2); @@ -56,9 +56,9 @@ public class EldraziSkyspawner extends CardImpl { this.addAbility(new DevoidAbility(this.color)); // Flying this.addAbility(FlyingAbility.getInstance()); - // When Eldrazi Skyspawner enters the battlefield, put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has "Sacrifice this creature: Add {C} to your mana pool." + // When Eldrazi Skyspawner enters the battlefield, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool." Effect effect = new CreateTokenEffect(new EldraziScionToken()); - effect.setText("put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has \"Sacrifice this creature: Add {C} to your mana pool.\""); + effect.setText("create a 1/1 colorless Eldrazi Scion creature token. It has \"Sacrifice this creature: Add {C} to your mana pool.\""); this.addAbility(new EntersBattlefieldTriggeredAbility(effect, false)); } diff --git a/Mage.Sets/src/mage/cards/e/ElementalAppeal.java b/Mage.Sets/src/mage/cards/e/ElementalAppeal.java index a45bee65d66..a24643e3b49 100644 --- a/Mage.Sets/src/mage/cards/e/ElementalAppeal.java +++ b/Mage.Sets/src/mage/cards/e/ElementalAppeal.java @@ -63,7 +63,7 @@ public class ElementalAppeal extends CardImpl { // Kicker {5} this.addAbility(new KickerAbility("{5}")); - // Put a 7/1 red Elemental creature token with trample and haste onto the battlefield. Exile it at the beginning of the next end step. + // Create a 7/1 red Elemental creature token with trample and haste. Exile it at the beginning of the next end step. this.getSpellAbility().addEffect(new ElementalAppealEffect()); // If Elemental Appeal was kicked, that creature gets +7/+0 until end of turn. this.getSpellAbility().addEffect(new ConditionalContinuousEffect( @@ -86,7 +86,7 @@ class ElementalAppealEffect extends OneShotEffect { public ElementalAppealEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Put a 7/1 red Elemental creature token with trample and haste onto the battlefield. Exile it at the beginning of the next end step"; + this.staticText = "Create a 7/1 red Elemental creature token with trample and haste. Exile it at the beginning of the next end step"; } public ElementalAppealEffect(final ElementalAppealEffect effect) { diff --git a/Mage.Sets/src/mage/cards/e/ElementalMastery.java b/Mage.Sets/src/mage/cards/e/ElementalMastery.java index d52f780f908..76a92b7d97e 100644 --- a/Mage.Sets/src/mage/cards/e/ElementalMastery.java +++ b/Mage.Sets/src/mage/cards/e/ElementalMastery.java @@ -70,7 +70,7 @@ public class ElementalMastery extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // Enchanted creature has "{tap}: Put X 1/1 red Elemental creature tokens with haste onto the battlefield, where X is this creature's power. Exile them at the beginning of the next end step." + // Enchanted creature has "{tap}: create X 1/1 red Elemental creature tokens with haste, where X is this creature's power. Exile them at the beginning of the next end step." Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ElementalMasteryEffect(), new TapSourceCost()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability2, AttachmentType.AURA))); @@ -90,7 +90,7 @@ class ElementalMasteryEffect extends OneShotEffect { public ElementalMasteryEffect() { super(Outcome.Benefit); - staticText = "Put X 1/1 red Elemental creature tokens with haste onto the battlefield, where X is this creature's power. Exile them at the beginning of the next end step"; + staticText = "create X 1/1 red Elemental creature tokens with haste, where X is this creature's power. Exile them at the beginning of the next end step"; } public ElementalMasteryEffect(final ElementalMasteryEffect effect) { diff --git a/Mage.Sets/src/mage/cards/e/ElephantAmbush.java b/Mage.Sets/src/mage/cards/e/ElephantAmbush.java index 95a927d56e6..9f9eaad7d41 100644 --- a/Mage.Sets/src/mage/cards/e/ElephantAmbush.java +++ b/Mage.Sets/src/mage/cards/e/ElephantAmbush.java @@ -47,7 +47,7 @@ public class ElephantAmbush extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{G}{G}"); - // Put a 3/3 green Elephant creature token onto the battlefield. + // Create a 3/3 green Elephant creature token. this.getSpellAbility().addEffect(new CreateTokenEffect(new ElephantToken())); // Flashback {6}{G}{G} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{6}{G}{G}"), TimingRule.INSTANT)); diff --git a/Mage.Sets/src/mage/cards/e/ElephantGuide.java b/Mage.Sets/src/mage/cards/e/ElephantGuide.java index 8705b6a8970..13c09d0df0c 100644 --- a/Mage.Sets/src/mage/cards/e/ElephantGuide.java +++ b/Mage.Sets/src/mage/cards/e/ElephantGuide.java @@ -65,7 +65,7 @@ public class ElephantGuide extends CardImpl { // Enchanted creature gets +3/+3. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3,3, Duration.WhileOnBattlefield))); - // When enchanted creature dies, put a 3/3 green Elephant creature token onto the battlefield. + // When enchanted creature dies, create a 3/3 green Elephant creature token. this.addAbility(new DiesAttachedTriggeredAbility(new CreateTokenEffect(new ElephantToken()),"enchanted creature")); } diff --git a/Mage.Sets/src/mage/cards/e/ElgaudInquisitor.java b/Mage.Sets/src/mage/cards/e/ElgaudInquisitor.java index d2395e240f2..531ff5d6ebd 100644 --- a/Mage.Sets/src/mage/cards/e/ElgaudInquisitor.java +++ b/Mage.Sets/src/mage/cards/e/ElgaudInquisitor.java @@ -52,7 +52,7 @@ public class ElgaudInquisitor extends CardImpl { this.toughness = new MageInt(2); this.addAbility(LifelinkAbility.getInstance()); - // When Elgaud Inquisitor dies, put a 1/1 white Spirit creature token with flying onto the battlefield. + // When Elgaud Inquisitor dies, create a 1/1 white Spirit creature token with flying. this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new SpiritWhiteToken()))); } diff --git a/Mage.Sets/src/mage/cards/e/ElspethKnightErrant.java b/Mage.Sets/src/mage/cards/e/ElspethKnightErrant.java index 8a454669af6..3379988d341 100644 --- a/Mage.Sets/src/mage/cards/e/ElspethKnightErrant.java +++ b/Mage.Sets/src/mage/cards/e/ElspethKnightErrant.java @@ -65,7 +65,7 @@ public class ElspethKnightErrant extends CardImpl { this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(4)); - // +1: Put a 1/1 white Soldier creature token onto the battlefield. + // +1: Create a 1/1 white Soldier creature token. Token token = new SoldierToken(); token.setOriginalExpansionSetCode("ALA"); // to get the right image this.addAbility(new LoyaltyAbility(new CreateTokenEffect(token), 1)); diff --git a/Mage.Sets/src/mage/cards/e/ElspethSunsChampion.java b/Mage.Sets/src/mage/cards/e/ElspethSunsChampion.java index 75083620bf6..e926146b8a8 100644 --- a/Mage.Sets/src/mage/cards/e/ElspethSunsChampion.java +++ b/Mage.Sets/src/mage/cards/e/ElspethSunsChampion.java @@ -67,7 +67,7 @@ public class ElspethSunsChampion extends CardImpl { this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(4)); - // +1: Put three 1/1 white Soldier creature tokens onto the battlefield. + // +1: Create three 1/1 white Soldier creature tokens. this.addAbility(new LoyaltyAbility(new CreateTokenEffect(new SoldierToken(), 3), 1)); // -3: Destroy all creatures with power 4 or greater. this.addAbility(new LoyaltyAbility(new DestroyAllEffect(filter), -3)); diff --git a/Mage.Sets/src/mage/cards/e/ElvishFarmer.java b/Mage.Sets/src/mage/cards/e/ElvishFarmer.java index 797bb53f98b..d18ee4fe538 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishFarmer.java +++ b/Mage.Sets/src/mage/cards/e/ElvishFarmer.java @@ -67,7 +67,7 @@ public class ElvishFarmer extends CardImpl { // At the beginning of your upkeep, put a spore counter on Elvish Farmer. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()), TargetController.YOU, false)); - // Remove three spore counters from Elvish Farmer: Put a 1/1 green Saproling creature token onto the battlefield. + // Remove three spore counters from Elvish Farmer: Create a 1/1 green Saproling creature token. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); // Sacrifice a Saproling: You gain 2 life. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(2), diff --git a/Mage.Sets/src/mage/cards/e/EmissaryOfTheSleepless.java b/Mage.Sets/src/mage/cards/e/EmissaryOfTheSleepless.java index b06be1903b5..b296b567ed0 100644 --- a/Mage.Sets/src/mage/cards/e/EmissaryOfTheSleepless.java +++ b/Mage.Sets/src/mage/cards/e/EmissaryOfTheSleepless.java @@ -55,9 +55,9 @@ public class EmissaryOfTheSleepless extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // When Emissary of the Sleepless enters the battlefield, if a creature died this turn, put a 1/1 white Spirit creature token with flying onto the battlefield. + // When Emissary of the Sleepless enters the battlefield, if a creature died this turn, create a 1/1 white Spirit creature token with flying. TriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new SpiritWhiteToken())); - this.addAbility(new ConditionalTriggeredAbility(ability, MorbidCondition.getInstance(), "When {this} enters the battlefield, if a creature died this turn, put a 1/1 white Spirit creature token with flying onto the battlefield.")); + this.addAbility(new ConditionalTriggeredAbility(ability, MorbidCondition.getInstance(), "When {this} enters the battlefield, if a creature died this turn, create a 1/1 white Spirit creature token with flying.")); } public EmissaryOfTheSleepless(final EmissaryOfTheSleepless card) { diff --git a/Mage.Sets/src/mage/cards/e/EmptyThePits.java b/Mage.Sets/src/mage/cards/e/EmptyThePits.java index 3c0ad99aabf..0b5e1484e1f 100644 --- a/Mage.Sets/src/mage/cards/e/EmptyThePits.java +++ b/Mage.Sets/src/mage/cards/e/EmptyThePits.java @@ -49,7 +49,7 @@ public class EmptyThePits extends CardImpl { // Delve this.addAbility(new DelveAbility()); - // Put X 2/2 black Zombie creature tokens onto the battlefield tapped. + // create X 2/2 black Zombie creature tokens tapped. this.getSpellAbility().addEffect(new CreateTokenEffect(new ZombieToken(), new ManacostVariableValue(), true, false)); } diff --git a/Mage.Sets/src/mage/cards/e/EmptyTheWarrens.java b/Mage.Sets/src/mage/cards/e/EmptyTheWarrens.java index 7d285c9a624..d3a75df5c75 100644 --- a/Mage.Sets/src/mage/cards/e/EmptyTheWarrens.java +++ b/Mage.Sets/src/mage/cards/e/EmptyTheWarrens.java @@ -44,7 +44,7 @@ public class EmptyTheWarrens extends CardImpl { public EmptyTheWarrens(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{R}"); - // Put two 1/1 red Goblin creature tokens onto the battlefield. + // Create two 1/1 red Goblin creature tokens. this.getSpellAbility().addEffect(new CreateTokenEffect(new GoblinToken(), 2)); // Storm this.addAbility(new StormAbility()); diff --git a/Mage.Sets/src/mage/cards/e/EmrakulsEvangel.java b/Mage.Sets/src/mage/cards/e/EmrakulsEvangel.java index 7497bdafccb..faa9c1ec9a8 100644 --- a/Mage.Sets/src/mage/cards/e/EmrakulsEvangel.java +++ b/Mage.Sets/src/mage/cards/e/EmrakulsEvangel.java @@ -65,7 +65,7 @@ public class EmrakulsEvangel extends CardImpl { this.toughness = new MageInt(2); // {T}, Sacrifice Emrakul's Evangel and any number of other non-Eldrazi creatures: - // Put a 3/2 colorless Eldrazi Horror creature token onto the battlefield for each creature sacrificed this way. + // Create a 3/2 colorless Eldrazi Horror creature token for each creature sacrificed this way. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new EmrakulsEvangelEffect(), new TapSourceCost()); ability.addCost(new EmrakulsEvangelCost()); this.addAbility(ability); @@ -142,7 +142,7 @@ class EmrakulsEvangelEffect extends OneShotEffect { EmrakulsEvangelEffect() { super(Outcome.Sacrifice); - this.staticText = "Put a 3/2 colorless Eldrazi Horror creature token onto the battlefield for each creature sacrificed this way."; + this.staticText = "Create a 3/2 colorless Eldrazi Horror creature token for each creature sacrificed this way."; } EmrakulsEvangelEffect(final EmrakulsEvangelEffect effect) { diff --git a/Mage.Sets/src/mage/cards/e/EndlessRanksOfTheDead.java b/Mage.Sets/src/mage/cards/e/EndlessRanksOfTheDead.java index f3893c8414e..f8f82c882a2 100644 --- a/Mage.Sets/src/mage/cards/e/EndlessRanksOfTheDead.java +++ b/Mage.Sets/src/mage/cards/e/EndlessRanksOfTheDead.java @@ -51,7 +51,7 @@ public class EndlessRanksOfTheDead extends CardImpl { public EndlessRanksOfTheDead(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{B}{B}"); - // At the beginning of your upkeep, put X 2/2 black Zombie creature tokens onto the battlefield, + // At the beginning of your upkeep, create X 2/2 black Zombie creature tokens, // where X is half the number of Zombies you control, rounded down. this.addAbility(new OnEventTriggeredAbility(EventType.UPKEEP_STEP_PRE, "beginning of your upkeep", new CreateTokenEffect(new ZombieToken(), new HalfZombiesCount()))); diff --git a/Mage.Sets/src/mage/cards/e/EndlessSwarm.java b/Mage.Sets/src/mage/cards/e/EndlessSwarm.java index 2bb82e84c01..3ba6c8748e8 100644 --- a/Mage.Sets/src/mage/cards/e/EndlessSwarm.java +++ b/Mage.Sets/src/mage/cards/e/EndlessSwarm.java @@ -47,7 +47,7 @@ public class EndlessSwarm extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{5}{G}{G}{G}"); - // Put a 1/1 green Snake creature token onto the battlefield for each card in your hand. + // Create a 1/1 green Snake creature token for each card in your hand. this.getSpellAbility().addEffect(new CreateTokenEffect(new SnakeToken(), new CardsInControllerHandCount())); // Epic diff --git a/Mage.Sets/src/mage/cards/e/EndrekSahrMasterBreeder.java b/Mage.Sets/src/mage/cards/e/EndrekSahrMasterBreeder.java index a0473f0ef95..0485d62e785 100644 --- a/Mage.Sets/src/mage/cards/e/EndrekSahrMasterBreeder.java +++ b/Mage.Sets/src/mage/cards/e/EndrekSahrMasterBreeder.java @@ -70,7 +70,7 @@ public class EndrekSahrMasterBreeder extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // Whenever you cast a creature spell, put X 1/1 black Thrull creature tokens onto the battlefield, where X is that spell's converted mana cost. + // Whenever you cast a creature spell, create X 1/1 black Thrull creature tokens, where X is that spell's converted mana cost. this.addAbility(new SpellCastControllerTriggeredAbility(new EndrekSahrMasterBreederEffect(), filter, false, true)); // When you control seven or more Thrulls, sacrifice Endrek Sahr, Master Breeder. this.addAbility(new ControlsPermanentsControllerTriggeredAbility( @@ -92,7 +92,7 @@ class EndrekSahrMasterBreederEffect extends OneShotEffect { public EndrekSahrMasterBreederEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "put X 1/1 black Thrull creature tokens onto the battlefield, where X is that spell's converted mana cost"; + this.staticText = "create X 1/1 black Thrull creature tokens, where X is that spell's converted mana cost"; } public EndrekSahrMasterBreederEffect(final EndrekSahrMasterBreederEffect effect) { diff --git a/Mage.Sets/src/mage/cards/e/EnlightenedManiac.java b/Mage.Sets/src/mage/cards/e/EnlightenedManiac.java index 33c4ba4e26b..6b3db45e71d 100644 --- a/Mage.Sets/src/mage/cards/e/EnlightenedManiac.java +++ b/Mage.Sets/src/mage/cards/e/EnlightenedManiac.java @@ -48,7 +48,7 @@ public class EnlightenedManiac extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(2); - // When Enlightened Maniac enters the battlefield, put a 3/2 colorless Eldrazi Horror creature token onto the battlefield. + // When Enlightened Maniac enters the battlefield, create a 3/2 colorless Eldrazi Horror creature token. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new EldraziHorrorToken()), false)); } diff --git a/Mage.Sets/src/mage/cards/e/EntreatTheAngels.java b/Mage.Sets/src/mage/cards/e/EntreatTheAngels.java index a78985f833a..9196a39dd5c 100644 --- a/Mage.Sets/src/mage/cards/e/EntreatTheAngels.java +++ b/Mage.Sets/src/mage/cards/e/EntreatTheAngels.java @@ -49,7 +49,7 @@ public class EntreatTheAngels extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{X}{X}{W}{W}{W}"); - // Put X 4/4 white Angel creature tokens with flying onto the battlefield. + // create X 4/4 white Angel creature tokens with flying. this.getSpellAbility().addEffect(new CreateTokenEffect(new AngelToken(), new ManacostVariableValue())); // Miracle {X}{W}{W} diff --git a/Mage.Sets/src/mage/cards/e/EvangelOfHeliod.java b/Mage.Sets/src/mage/cards/e/EvangelOfHeliod.java index cca53630b20..792863e31d2 100644 --- a/Mage.Sets/src/mage/cards/e/EvangelOfHeliod.java +++ b/Mage.Sets/src/mage/cards/e/EvangelOfHeliod.java @@ -52,7 +52,7 @@ public class EvangelOfHeliod extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(3); - // When Evangel of Heliod enters the battlefield, put a number of 1/1 white Soldier creature tokens onto the battlefield equal to your devotion to white. + // When Evangel of Heliod enters the battlefield, create a number of 1/1 white Soldier creature tokens equal to your devotion to white. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new SoldierToken(), new DevotionCount(ColoredManaSymbol.W)))); } diff --git a/Mage.Sets/src/mage/cards/e/ExposeEvil.java b/Mage.Sets/src/mage/cards/e/ExposeEvil.java index 4f08b35f5bc..4f91e406953 100644 --- a/Mage.Sets/src/mage/cards/e/ExposeEvil.java +++ b/Mage.Sets/src/mage/cards/e/ExposeEvil.java @@ -48,7 +48,7 @@ public class ExposeEvil extends CardImpl { this.getSpellAbility().addEffect(new TapTargetEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent(0, 2)); - // Investigate (Put a colorless Clue artifact token onto the battlefield with \"{2}, Sacrifice this artifact: Draw a card.\") + // Investigate (Create a colorless Clue artifact token with \"{2}, Sacrifice this artifact: Draw a card.\") this.getSpellAbility().addEffect(new InvestigateEffect()); } diff --git a/Mage.Sets/src/mage/cards/e/ExtricatorOfFlesh.java b/Mage.Sets/src/mage/cards/e/ExtricatorOfFlesh.java index a9f3aa3db72..bc573a9c0dc 100644 --- a/Mage.Sets/src/mage/cards/e/ExtricatorOfFlesh.java +++ b/Mage.Sets/src/mage/cards/e/ExtricatorOfFlesh.java @@ -75,7 +75,7 @@ public class ExtricatorOfFlesh extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect( VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Eldrazi", "Eldrazi you control ")))); - // {2}, {T}, Sacrifice a non-Eldrazi creature: Put a 3/2 colorless Eldrazi Horror creature token onto the battlefield. + // {2}, {T}, Sacrifice a non-Eldrazi creature: Create a 3/2 colorless Eldrazi Horror creature token. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new EldraziHorrorToken()), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true))); diff --git a/Mage.Sets/src/mage/cards/e/ExtricatorOfSin.java b/Mage.Sets/src/mage/cards/e/ExtricatorOfSin.java index 5563d2ceccc..15fae037c3c 100644 --- a/Mage.Sets/src/mage/cards/e/ExtricatorOfSin.java +++ b/Mage.Sets/src/mage/cards/e/ExtricatorOfSin.java @@ -70,7 +70,7 @@ public class ExtricatorOfSin extends CardImpl { this.transformable = true; this.secondSideCardClazz = ExtricatorOfFlesh.class; - // When Extricator of Sin enters the battlefield, you may sacrifice another permanent. If you do, put a 3/2 colorless Eldrazi Horror creature token onto the battlefield. + // When Extricator of Sin enters the battlefield, you may sacrifice another permanent. If you do, create a 3/2 colorless Eldrazi Horror creature token. this.addAbility(new EntersBattlefieldTriggeredAbility(new DoIfCostPaid(new CreateTokenEffect(new EldraziHorrorToken()), new SacrificeTargetCost(new TargetControlledPermanent(filter))), false)); diff --git a/Mage.Sets/src/mage/cards/e/EyelessWatcher.java b/Mage.Sets/src/mage/cards/e/EyelessWatcher.java index 965971bc4ca..d7f1ea1d626 100644 --- a/Mage.Sets/src/mage/cards/e/EyelessWatcher.java +++ b/Mage.Sets/src/mage/cards/e/EyelessWatcher.java @@ -53,9 +53,9 @@ public class EyelessWatcher extends CardImpl { // Devoid this.addAbility(new DevoidAbility(this.color)); - // When Eyeless Watcher enters the battlefield, put two 1/1 colorless Eldrazi Scion creature tokens onto the battlefield. They have "Sacrifice this creature: Add {C} to your mana pool." + // When Eyeless Watcher enters the battlefield, create two 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool." Effect effect = new CreateTokenEffect(new EldraziScionToken(), 2); - effect.setText("put two 1/1 colorless Eldrazi Scion creature tokens onto the battlefield. They have \"Sacrifice this creature: Add {C} to your mana pool.\""); + effect.setText("create two 1/1 colorless Eldrazi Scion creature tokens. They have \"Sacrifice this creature: Add {C} to your mana pool.\""); this.addAbility(new EntersBattlefieldTriggeredAbility(effect, false)); } diff --git a/Mage.Sets/src/mage/cards/e/EyesInTheSkies.java b/Mage.Sets/src/mage/cards/e/EyesInTheSkies.java index 06e0c0b4124..9911a3f6bec 100644 --- a/Mage.Sets/src/mage/cards/e/EyesInTheSkies.java +++ b/Mage.Sets/src/mage/cards/e/EyesInTheSkies.java @@ -44,8 +44,8 @@ public class EyesInTheSkies extends CardImpl { public EyesInTheSkies(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{W}"); - // Put a 1/1 white Bird creature token with flying onto the battlefield, then populate. - // (Put a token onto the battlefield that's a copy of a creature token you control.) + // Create a 1/1 white Bird creature token with flying, then populate. + // (Create a token that's a copy of a creature token you control.) this.getSpellAbility().addEffect(new CreateTokenEffect(new BirdToken())); this.getSpellAbility().addEffect(new PopulateEffect("then")); } diff --git a/Mage.Sets/src/mage/cards/e/EyesOfTheWisent.java b/Mage.Sets/src/mage/cards/e/EyesOfTheWisent.java index 8818dec7cdb..c9c43801f2f 100644 --- a/Mage.Sets/src/mage/cards/e/EyesOfTheWisent.java +++ b/Mage.Sets/src/mage/cards/e/EyesOfTheWisent.java @@ -57,11 +57,11 @@ public class EyesOfTheWisent extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.ENCHANTMENT},"{1}{G}"); this.subtype.add("Elemental"); - // Whenever an opponent casts a blue spell during your turn, you may put a 4/4 green Elemental creature token onto the battlefield. + // Whenever an opponent casts a blue spell during your turn, you may create a 4/4 green Elemental creature token. this.addAbility(new ConditionalTriggeredAbility( new SpellCastOpponentTriggeredAbility(new CreateTokenEffect(new EyesOfTheWisentElementalToken()), filter, true), new MyTurnCondition(), - "Whenever an opponent casts a blue spell during your turn, you may put a 4/4 green Elemental creature token onto the battlefield." + "Whenever an opponent casts a blue spell during your turn, you may create a 4/4 green Elemental creature token." )); } diff --git a/Mage.Sets/src/mage/cards/e/EzurisPredation.java b/Mage.Sets/src/mage/cards/e/EzurisPredation.java index 821bd5a9c08..511a65d27e2 100644 --- a/Mage.Sets/src/mage/cards/e/EzurisPredation.java +++ b/Mage.Sets/src/mage/cards/e/EzurisPredation.java @@ -53,7 +53,7 @@ public class EzurisPredation extends CardImpl { public EzurisPredation(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{5}{G}{G}{G}"); - // For each creature your opponents control, put a 4/4 green Beast creature token onto the battlefield. Each of those Beasts fights a different one of those creatures. + // For each creature your opponents control, create a 4/4 green Beast creature token. Each of those Beasts fights a different one of those creatures. this.getSpellAbility().addEffect(new EzurisPredationEffect()); } @@ -71,7 +71,7 @@ class EzurisPredationEffect extends OneShotEffect { public EzurisPredationEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "For each creature your opponents control, put a 4/4 green Beast creature token onto the battlefield. Each of those Beasts fights a different one of those creatures"; + this.staticText = "For each creature your opponents control, create a 4/4 green Beast creature token. Each of those Beasts fights a different one of those creatures"; } public EzurisPredationEffect(final EzurisPredationEffect effect) { diff --git a/Mage.Sets/src/mage/cards/f/FatedInfatuation.java b/Mage.Sets/src/mage/cards/f/FatedInfatuation.java index ec2372e740d..d1e66b90155 100644 --- a/Mage.Sets/src/mage/cards/f/FatedInfatuation.java +++ b/Mage.Sets/src/mage/cards/f/FatedInfatuation.java @@ -47,7 +47,7 @@ public class FatedInfatuation extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{U}{U}{U}"); - // Put a token onto the battlefield that's a copy of target creature you control. If it's your turn, scry 2. + // Create a token that's a copy of target creature you control. If it's your turn, scry 2. this.getSpellAbility().addEffect(new PutTokenOntoBattlefieldCopyTargetEffect()); this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new ScryEffect(2), MyTurnCondition.getInstance(), "If it's your turn, scry 2")); diff --git a/Mage.Sets/src/mage/cards/f/FatedIntervention.java b/Mage.Sets/src/mage/cards/f/FatedIntervention.java index 480efebb6ef..cadf53377fb 100644 --- a/Mage.Sets/src/mage/cards/f/FatedIntervention.java +++ b/Mage.Sets/src/mage/cards/f/FatedIntervention.java @@ -47,7 +47,7 @@ public class FatedIntervention extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{G}{G}{G}"); - // Put two 3/3 green Centaur enchantment creature tokens onto the battlefield. If it's your turn, scry 2. + // Create two 3/3 green Centaur enchantment creature tokens. If it's your turn, scry 2. this.getSpellAbility().addEffect(new CreateTokenEffect(new CentaurEnchantmentCreatureToken(), 2)); this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new ScryEffect(2), MyTurnCondition.getInstance(), "If it's your turn, scry 2")); } diff --git a/Mage.Sets/src/mage/cards/f/FeastOrFamine.java b/Mage.Sets/src/mage/cards/f/FeastOrFamine.java index 4638251374e..5996d2b59f7 100644 --- a/Mage.Sets/src/mage/cards/f/FeastOrFamine.java +++ b/Mage.Sets/src/mage/cards/f/FeastOrFamine.java @@ -58,7 +58,7 @@ public class FeastOrFamine extends CardImpl { public FeastOrFamine(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{B}"); - // Choose one - Put a 2/2 black Zombie creature token onto the battlefield; + // Choose one - Create a 2/2 black Zombie creature token; this.getSpellAbility().addEffect(new CreateTokenEffect(new ZombieToken())); // or destroy target nonartifact, nonblack creature and it can't be regenerated. diff --git a/Mage.Sets/src/mage/cards/f/FeedThePack.java b/Mage.Sets/src/mage/cards/f/FeedThePack.java index 64b8b1368f1..2706fed5d43 100644 --- a/Mage.Sets/src/mage/cards/f/FeedThePack.java +++ b/Mage.Sets/src/mage/cards/f/FeedThePack.java @@ -56,7 +56,7 @@ public class FeedThePack extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{5}{G}"); - // At the beginning of your end step, you may sacrifice a nontoken creature. If you do, put X 2/2 green Wolf creature tokens onto the battlefield, where X is the sacrificed creature's toughness. + // At the beginning of your end step, you may sacrifice a nontoken creature. If you do, create X 2/2 green Wolf creature tokens, where X is the sacrificed creature's toughness. this.addAbility(new BeginningOfYourEndStepTriggeredAbility(new FeedThePackEffect(), true)); } @@ -80,7 +80,7 @@ class FeedThePackEffect extends OneShotEffect { public FeedThePackEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "sacrifice a nontoken creature. If you do, put X 2/2 green Wolf creature tokens onto the battlefield, where X is the sacrificed creature's toughness"; + this.staticText = "sacrifice a nontoken creature. If you do, create X 2/2 green Wolf creature tokens, where X is the sacrificed creature's toughness"; } public FeedThePackEffect(final FeedThePackEffect effect) { diff --git a/Mage.Sets/src/mage/cards/f/FeldonOfTheThirdPath.java b/Mage.Sets/src/mage/cards/f/FeldonOfTheThirdPath.java index 1fb9868c0c0..f3a6896a3b4 100644 --- a/Mage.Sets/src/mage/cards/f/FeldonOfTheThirdPath.java +++ b/Mage.Sets/src/mage/cards/f/FeldonOfTheThirdPath.java @@ -65,7 +65,7 @@ public class FeldonOfTheThirdPath extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(3); - // {2}{R}, {T}: Put a token onto the battlefield that's a copy of target creature card in your graveyard, except it's an artifact in addition to its other types. It gains haste. Sacrifice it at the beginning of the next end step. + // {2}{R}, {T}: Create a token that's a copy of target creature card in your graveyard, except it's an artifact in addition to its other types. It gains haste. Sacrifice it at the beginning of the next end step. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new FeldonOfTheThirdPathEffect(), new ManaCostsImpl("{2}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(1, 1, new FilterCreatureCard("creature card in your graveyard"))); @@ -86,7 +86,7 @@ class FeldonOfTheThirdPathEffect extends OneShotEffect { public FeldonOfTheThirdPathEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Put a token onto the battlefield that's a copy of target creature card in your graveyard, except it's an artifact in addition to its other types. It gains haste. Sacrifice it at the beginning of the next end step"; + this.staticText = "Create a token that's a copy of target creature card in your graveyard, except it's an artifact in addition to its other types. It gains haste. Sacrifice it at the beginning of the next end step"; } public FeldonOfTheThirdPathEffect(final FeldonOfTheThirdPathEffect effect) { diff --git a/Mage.Sets/src/mage/cards/f/FelhideSpiritbinder.java b/Mage.Sets/src/mage/cards/f/FelhideSpiritbinder.java index c2f3f14c659..8da4e58b751 100644 --- a/Mage.Sets/src/mage/cards/f/FelhideSpiritbinder.java +++ b/Mage.Sets/src/mage/cards/f/FelhideSpiritbinder.java @@ -69,7 +69,7 @@ public class FelhideSpiritbinder extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(4); - // Inspired - Whenever Felhide Spiritbinder becomes untapped, you may pay {1}{R}. If you do, put a token onto the battlefield that's a copy of another target creature except it's an enchantment in addition to its other types. It gains haste. Exile it at the beginning of the next end step. + // Inspired - Whenever Felhide Spiritbinder becomes untapped, you may pay {1}{R}. If you do, create a token that's a copy of another target creature except it's an enchantment in addition to its other types. It gains haste. Exile it at the beginning of the next end step. Ability ability = new InspiredAbility(new DoIfCostPaid(new FelhideSpiritbinderEffect(), new ManaCostsImpl("{1}{R}"), "Use effect of {source}?")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); @@ -89,7 +89,7 @@ class FelhideSpiritbinderEffect extends OneShotEffect { public FelhideSpiritbinderEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "put a token onto the battlefield that's a copy of another target creature except it's an enchantment in addition to its other types. It gains haste. Exile it at the beginning of the next end step"; + this.staticText = "create a token that's a copy of another target creature except it's an enchantment in addition to its other types. It gains haste. Exile it at the beginning of the next end step"; } public FelhideSpiritbinderEffect(final FelhideSpiritbinderEffect effect) { diff --git a/Mage.Sets/src/mage/cards/f/FeralIncarnation.java b/Mage.Sets/src/mage/cards/f/FeralIncarnation.java index b5e73a1d309..a9eccdb7d6d 100644 --- a/Mage.Sets/src/mage/cards/f/FeralIncarnation.java +++ b/Mage.Sets/src/mage/cards/f/FeralIncarnation.java @@ -46,7 +46,7 @@ public class FeralIncarnation extends CardImpl { // Convoke this.addAbility(new ConvokeAbility()); - // Put three 3/3 green Beast creature tokens onto the battlefield. + // Create three 3/3 green Beast creature tokens. this.getSpellAbility().addEffect(new CreateTokenEffect(new BeastToken(), 3)); } diff --git a/Mage.Sets/src/mage/cards/f/FeralLightning.java b/Mage.Sets/src/mage/cards/f/FeralLightning.java index dd44fbe9106..aab267a017d 100644 --- a/Mage.Sets/src/mage/cards/f/FeralLightning.java +++ b/Mage.Sets/src/mage/cards/f/FeralLightning.java @@ -55,7 +55,7 @@ public class FeralLightning extends CardImpl { public FeralLightning(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{R}{R}{R}"); - // Put three 3/1 red Elemental creature tokens with haste onto the battlefield. Exile them at the beginning of the next end step. + // Create three 3/1 red Elemental creature tokens with haste. Exile them at the beginning of the next end step. this.getSpellAbility().addEffect(new FeralLightningEffect()); } @@ -74,7 +74,7 @@ class FeralLightningEffect extends OneShotEffect { public FeralLightningEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Put three 3/1 red Elemental creature tokens with haste onto the battlefield. Exile them at the beginning of the next end step"; + this.staticText = "Create three 3/1 red Elemental creature tokens with haste. Exile them at the beginning of the next end step"; } public FeralLightningEffect(final FeralLightningEffect effect) { diff --git a/Mage.Sets/src/mage/cards/f/FeudkillersVerdict.java b/Mage.Sets/src/mage/cards/f/FeudkillersVerdict.java index ec38bd411c1..71d6a9269ae 100644 --- a/Mage.Sets/src/mage/cards/f/FeudkillersVerdict.java +++ b/Mage.Sets/src/mage/cards/f/FeudkillersVerdict.java @@ -51,7 +51,7 @@ public class FeudkillersVerdict extends CardImpl { this.subtype.add("Giant"); - // You gain 10 life. Then if you have more life than an opponent, put a 5/5 white Giant Warrior creature token onto the battlefield. + // You gain 10 life. Then if you have more life than an opponent, create a 5/5 white Giant Warrior creature token. this.getSpellAbility().addEffect(new FeudkillersVerdictEffect()); } @@ -69,7 +69,7 @@ class FeudkillersVerdictEffect extends OneShotEffect { public FeudkillersVerdictEffect() { super(Outcome.Benefit); - this.staticText = "You gain 10 life. Then if you have more life than an opponent, put a 5/5 white Giant Warrior creature token onto the battlefield"; + this.staticText = "You gain 10 life. Then if you have more life than an opponent, create a 5/5 white Giant Warrior creature token"; } public FeudkillersVerdictEffect(final FeudkillersVerdictEffect effect) { diff --git a/Mage.Sets/src/mage/cards/f/FieldOfSouls.java b/Mage.Sets/src/mage/cards/f/FieldOfSouls.java index 528c78f0e70..bb47ef9e0d1 100644 --- a/Mage.Sets/src/mage/cards/f/FieldOfSouls.java +++ b/Mage.Sets/src/mage/cards/f/FieldOfSouls.java @@ -55,7 +55,7 @@ public class FieldOfSouls extends CardImpl { public FieldOfSouls(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}{W}"); - // Whenever a nontoken creature is put into your graveyard from the battlefield, put a 1/1 white Spirit creature token with flying onto the battlefield. + // Whenever a nontoken creature is put into your graveyard from the battlefield, create a 1/1 white Spirit creature token with flying. this.addAbility(new DiesCreatureTriggeredAbility(new CreateTokenEffect(new SpiritWhiteToken()), false, filter)); } diff --git a/Mage.Sets/src/mage/cards/f/FinalIteration.java b/Mage.Sets/src/mage/cards/f/FinalIteration.java index bbee8e08314..d151a1d28ff 100644 --- a/Mage.Sets/src/mage/cards/f/FinalIteration.java +++ b/Mage.Sets/src/mage/cards/f/FinalIteration.java @@ -88,7 +88,7 @@ public class FinalIteration extends CardImpl { ability.addEffect(effect); this.addAbility(ability); - // Whenever you cast an instant or sorcery spell, put a 1/1 blue Human Wizard creature token onto the battlefield. + // Whenever you cast an instant or sorcery spell, create a 1/1 blue Human Wizard creature token. this.addAbility(new SpellCastControllerTriggeredAbility(new CreateTokenEffect(new HumanWizardToken()), filterSpell, false)); } diff --git a/Mage.Sets/src/mage/cards/f/FirstResponse.java b/Mage.Sets/src/mage/cards/f/FirstResponse.java index 494c3fc54c2..c04c08a759b 100644 --- a/Mage.Sets/src/mage/cards/f/FirstResponse.java +++ b/Mage.Sets/src/mage/cards/f/FirstResponse.java @@ -48,9 +48,9 @@ import mage.watchers.common.PlayerLostLifeWatcher; public class FirstResponse extends CardImpl { public FirstResponse(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); - // At the beginning of each upkeep, if you lost life last turn, put a 1/1 white Soldier creature token onto the battlefield. + // At the beginning of each upkeep, if you lost life last turn, create a 1/1 white Soldier creature token. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new FirstResponseEffect(), TargetController.ANY, false), new PlayerLostLifeWatcher()); } @@ -69,7 +69,7 @@ class FirstResponseEffect extends OneShotEffect { public FirstResponseEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "if you lost life last turn, put a 1/1 white Soldier creature token onto the battlefield"; + this.staticText = "if you lost life last turn, create a 1/1 white Soldier creature token"; } public FirstResponseEffect(final FirstResponseEffect effect) { diff --git a/Mage.Sets/src/mage/cards/f/FistsOfIronwood.java b/Mage.Sets/src/mage/cards/f/FistsOfIronwood.java index ef6499ab6bb..2ae42c78026 100644 --- a/Mage.Sets/src/mage/cards/f/FistsOfIronwood.java +++ b/Mage.Sets/src/mage/cards/f/FistsOfIronwood.java @@ -61,7 +61,7 @@ public class FistsOfIronwood extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // When Fists of Ironwood enters the battlefield, put two 1/1 green Saproling creature tokens onto the battlefield. + // When Fists of Ironwood enters the battlefield, create two 1/1 green Saproling creature tokens. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new SaprolingToken(), 2), false)); // Enchanted creature has trample. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/f/FlamerushRider.java b/Mage.Sets/src/mage/cards/f/FlamerushRider.java index de43a4a782d..d9f816482aa 100644 --- a/Mage.Sets/src/mage/cards/f/FlamerushRider.java +++ b/Mage.Sets/src/mage/cards/f/FlamerushRider.java @@ -71,7 +71,7 @@ public class FlamerushRider extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - // Whenever Flamerush Rider attacks, put a token onto the battlefield tapped and attacking that's a copy of another target attacking creature. Exile the token at end of combat. + // Whenever Flamerush Rider attacks, create a token tapped and attacking that's a copy of another target attacking creature. Exile the token at end of combat. Ability ability = new AttacksTriggeredAbility(new FlamerushRiderEffect(), false); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); @@ -94,7 +94,7 @@ class FlamerushRiderEffect extends OneShotEffect { public FlamerushRiderEffect() { super(Outcome.Copy); - this.staticText = "put a token onto the battlefield tapped and attacking that's a copy of another target attacking creature. Exile the token at end of combat"; + this.staticText = "create a token tapped and attacking that's a copy of another target attacking creature. Exile the token at end of combat"; } public FlamerushRiderEffect(final FlamerushRiderEffect effect) { diff --git a/Mage.Sets/src/mage/cards/f/FlameshadowConjuring.java b/Mage.Sets/src/mage/cards/f/FlameshadowConjuring.java index 45545663358..58a3194e856 100644 --- a/Mage.Sets/src/mage/cards/f/FlameshadowConjuring.java +++ b/Mage.Sets/src/mage/cards/f/FlameshadowConjuring.java @@ -64,9 +64,9 @@ public class FlameshadowConjuring extends CardImpl { public FlameshadowConjuring(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{R}"); - // Whenever a nontoken creature enters the battlefield under your control, you may pay {R}. If you do, put a token onto the battlefield that's a copy of that creature. That token gains haste. Exile it at the beginning of the next end step. + // Whenever a nontoken creature enters the battlefield under your control, you may pay {R}. If you do, create a token that's a copy of that creature. That token gains haste. Exile it at the beginning of the next end step. Ability ability = new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new FlameshadowConjuringEffect(), filterNontoken, false, SetTargetPointer.PERMANENT, - "Whenever a nontoken creature enters the battlefield under your control, you may pay {R}. If you do, put a token onto the battlefield that's a copy of that creature. That token gains haste. Exile it at the beginning of the next end step"); + "Whenever a nontoken creature enters the battlefield under your control, you may pay {R}. If you do, create a token that's a copy of that creature. That token gains haste. Exile it at the beginning of the next end step"); ability.addCost(new ManaCostsImpl("{R}")); this.addAbility(ability); } @@ -85,7 +85,7 @@ class FlameshadowConjuringEffect extends OneShotEffect { public FlameshadowConjuringEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "put a token onto the battlefield that's a copy of that creature. That token gains haste. Exile it at the beginning of the next end step"; + this.staticText = "create a token that's a copy of that creature. That token gains haste. Exile it at the beginning of the next end step"; } public FlameshadowConjuringEffect(final FlameshadowConjuringEffect effect) { diff --git a/Mage.Sets/src/mage/cards/f/Flamewright.java b/Mage.Sets/src/mage/cards/f/Flamewright.java index 9c95d7b866d..d909713f34c 100644 --- a/Mage.Sets/src/mage/cards/f/Flamewright.java +++ b/Mage.Sets/src/mage/cards/f/Flamewright.java @@ -53,26 +53,26 @@ import mage.target.common.TargetCreatureOrPlayer; * @author fireshoes */ public class Flamewright extends CardImpl { - + private static final FilterControlledPermanent filter = new FilterControlledPermanent("creature with defender"); - + static { filter.add(new CardTypePredicate(CardType.CREATURE)); filter.add(new AbilityPredicate(DefenderAbility.class)); } public Flamewright(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{R}{W}"); this.subtype.add("Human"); this.subtype.add("Artificer"); this.power = new MageInt(1); this.toughness = new MageInt(1); - // {1}, {tap}: Put a 1/1 colorless Construct artifact creature token with defender onto the battlefield. + // {1}, {tap}: Create a 1/1 colorless Construct artifact creature token with defender. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ConstructToken()), new ManaCostsImpl("{1}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); - + // {tap}, Sacrifice a creature with defender: Flamewright deals 1 damage to target creature or player. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); @@ -91,7 +91,7 @@ public class Flamewright extends CardImpl { } class ConstructToken extends Token { - + public ConstructToken() { this("CNS"); } @@ -107,4 +107,4 @@ class ConstructToken extends Token { addAbility(DefenderAbility.getInstance()); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/f/FleshCarver.java b/Mage.Sets/src/mage/cards/f/FleshCarver.java index 9b57518b515..d1742ef88ac 100644 --- a/Mage.Sets/src/mage/cards/f/FleshCarver.java +++ b/Mage.Sets/src/mage/cards/f/FleshCarver.java @@ -81,7 +81,7 @@ public class FleshCarver extends CardImpl { ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); this.addAbility(ability); - // When Flesh Carver dies, put an X/X black Horror creature token onto the battlefield, where X is Flesh Carver's power. + // When Flesh Carver dies, create an X/X black Horror creature token, where X is Flesh Carver's power. this.addAbility(new FleshCarverAbility()); } @@ -133,7 +133,7 @@ class FleshCarverEffect extends OneShotEffect { public FleshCarverEffect() { super(Outcome.DestroyPermanent); - staticText = "put an X/X black Horror creature token onto the battlefield, where X is {this}'s power"; + staticText = "create an X/X black Horror creature token, where X is {this}'s power"; } public FleshCarverEffect(FleshCarverEffect ability) { diff --git a/Mage.Sets/src/mage/cards/f/FlourishingDefenses.java b/Mage.Sets/src/mage/cards/f/FlourishingDefenses.java index 3036bc381d7..10c26d08d0c 100644 --- a/Mage.Sets/src/mage/cards/f/FlourishingDefenses.java +++ b/Mage.Sets/src/mage/cards/f/FlourishingDefenses.java @@ -50,7 +50,7 @@ public class FlourishingDefenses extends CardImpl { public FlourishingDefenses(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{4}{G}"); - // Whenever a -1/-1 counter is placed on a creature, you may put a 1/1 green Elf Warrior creature token onto the battlefield. + // Whenever a -1/-1 counter is placed on a creature, you may create a 1/1 green Elf Warrior creature token. this.addAbility(new FlourishingDefensesTriggeredAbility()); } @@ -98,6 +98,6 @@ class FlourishingDefensesTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever a -1/-1 counter is placed on a creature, you may put a 1/1 green Elf Warrior creature token onto the battlefield."; + return "Whenever a -1/-1 counter is placed on a creature, you may create a 1/1 green Elf Warrior creature token."; } } diff --git a/Mage.Sets/src/mage/cards/f/FlurryOfHorns.java b/Mage.Sets/src/mage/cards/f/FlurryOfHorns.java index 070683642fd..29fc7dae906 100644 --- a/Mage.Sets/src/mage/cards/f/FlurryOfHorns.java +++ b/Mage.Sets/src/mage/cards/f/FlurryOfHorns.java @@ -47,7 +47,7 @@ public class FlurryOfHorns extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{R}"); - // Put two 2/3 red Minotaur creature tokens with haste onto the battlefield. + // Create two 2/3 red Minotaur creature tokens with haste. this.getSpellAbility().addEffect(new CreateTokenEffect(new FlurryOfHornsMinotaurToken(), 2)); } diff --git a/Mage.Sets/src/mage/cards/f/FollowedFootsteps.java b/Mage.Sets/src/mage/cards/f/FollowedFootsteps.java index f2afbb704cd..dc214e80eb6 100644 --- a/Mage.Sets/src/mage/cards/f/FollowedFootsteps.java +++ b/Mage.Sets/src/mage/cards/f/FollowedFootsteps.java @@ -64,7 +64,7 @@ public class FollowedFootsteps extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // At the beginning of your upkeep, put a token that's a copy of enchanted creature onto the battlefield. + // At the beginning of your upkeep, create a token that's a copy of enchanted creature. this.addAbility(new OnEventTriggeredAbility(GameEvent.EventType.UPKEEP_STEP_PRE, "beginning of your upkeep", new FollowedFootstepsEffect(), false)); } @@ -82,7 +82,7 @@ class FollowedFootstepsEffect extends OneShotEffect { public FollowedFootstepsEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "You put a token onto the battlefield that's a copy of enchanted creature"; + this.staticText = "You create a token that's a copy of enchanted creature"; } public FollowedFootstepsEffect(final FollowedFootstepsEffect effect) { diff --git a/Mage.Sets/src/mage/cards/f/ForbiddenOrchard.java b/Mage.Sets/src/mage/cards/f/ForbiddenOrchard.java index 44aa3ea92ab..b8ebbac06ba 100644 --- a/Mage.Sets/src/mage/cards/f/ForbiddenOrchard.java +++ b/Mage.Sets/src/mage/cards/f/ForbiddenOrchard.java @@ -54,7 +54,7 @@ public class ForbiddenOrchard extends CardImpl { // {T}: Add one mana of any color to your mana pool. this.addAbility(new AnyColorManaAbility()); - // Whenever you tap Forbidden Orchard for mana, put a 1/1 colorless Spirit creature token onto the battlefield under target opponent's control. + // Whenever you tap Forbidden Orchard for mana, create a 1/1 colorless Spirit creature token under target opponent's control. this.addAbility(new ForbiddenOrchardTriggeredAbility()); } diff --git a/Mage.Sets/src/mage/cards/f/ForlornPseudamma.java b/Mage.Sets/src/mage/cards/f/ForlornPseudamma.java index 002ab5cacf7..2ef119130ab 100644 --- a/Mage.Sets/src/mage/cards/f/ForlornPseudamma.java +++ b/Mage.Sets/src/mage/cards/f/ForlornPseudamma.java @@ -54,7 +54,7 @@ public class ForlornPseudamma extends CardImpl { // Intimidate this.addAbility(IntimidateAbility.getInstance()); - // Inspired - Whenever Forlorn Pseudamma becomes untapped, you may pay {2}{B}. If you do, put a 2/2 black Zombie enchantment creature token onto the battlefield. + // Inspired - Whenever Forlorn Pseudamma becomes untapped, you may pay {2}{B}. If you do, create a 2/2 black Zombie enchantment creature token. this.addAbility(new InspiredAbility(new DoIfCostPaid(new CreateTokenEffect(new ForlornPseudammaZombieToken()), new ManaCostsImpl("{2}{B}")))); } diff --git a/Mage.Sets/src/mage/cards/f/FoulEmissary.java b/Mage.Sets/src/mage/cards/f/FoulEmissary.java index a38318deaff..f98b53d26c8 100644 --- a/Mage.Sets/src/mage/cards/f/FoulEmissary.java +++ b/Mage.Sets/src/mage/cards/f/FoulEmissary.java @@ -68,7 +68,7 @@ public class FoulEmissary extends CardImpl { // When Foul Emissary enters the battlefield, look at the top four cards of your library. You may reveal a creature card from among them and put it into your hand. Put the rest on the bottom of your library in any order. this.addAbility(new EntersBattlefieldTriggeredAbility(new LookLibraryAndPickControllerEffect(new StaticValue(4), false, new StaticValue(1), filter, false))); - // When you sacrifice Foul Emissary while casting a spell with emerge, put a 3/2 colorless Eldrazi Horror creature token onto the battlefield. + // When you sacrifice Foul Emissary while casting a spell with emerge, create a 3/2 colorless Eldrazi Horror creature token. this.addAbility(new FoulEmissaryTriggeredAbility(new CreateTokenEffect(new EldraziHorrorToken()), false)); } @@ -108,6 +108,6 @@ class FoulEmissaryTriggeredAbility extends SacrificeSourceTriggeredAbility { @Override public String getRule() { - return "When you sacrifice {this} while casting a spell with emerge, put a 3/2 colorless Eldrazi Horror creature token onto the battlefield."; + return "When you sacrifice {this} while casting a spell with emerge, create a 3/2 colorless Eldrazi Horror creature token."; } } diff --git a/Mage.Sets/src/mage/cards/f/FoundryOfTheConsuls.java b/Mage.Sets/src/mage/cards/f/FoundryOfTheConsuls.java index 001427fbfc4..6a97ff0abeb 100644 --- a/Mage.Sets/src/mage/cards/f/FoundryOfTheConsuls.java +++ b/Mage.Sets/src/mage/cards/f/FoundryOfTheConsuls.java @@ -53,7 +53,7 @@ public class FoundryOfTheConsuls extends CardImpl { // {T}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); - // {5}, {T}, Sacrifice Foundry of the Consuls: Put two 1/1 colorless Thopter artifact creature tokens with flying onto the battlefield. + // {5}, {T}, Sacrifice Foundry of the Consuls: Create two 1/1 colorless Thopter artifact creature tokens with flying. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ThopterColorlessToken(), 2), new ManaCostsImpl("{5}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/f/FreshMeat.java b/Mage.Sets/src/mage/cards/f/FreshMeat.java index 1b245f32ae2..bd144d9195d 100644 --- a/Mage.Sets/src/mage/cards/f/FreshMeat.java +++ b/Mage.Sets/src/mage/cards/f/FreshMeat.java @@ -48,7 +48,7 @@ public class FreshMeat extends CardImpl { public FreshMeat(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{G}"); - // Put a 3/3 green Beast creature token onto the battlefield for each creature put into your graveyard from the battlefield this turn. + // Create a 3/3 green Beast creature token for each creature put into your graveyard from the battlefield this turn. this.getSpellAbility().addWatcher(new CreaturesDiedWatcher()); this.getSpellAbility().addEffect(new CreateTokenEffect(new BeastToken(), new FreshMeatDynamicValue())); } diff --git a/Mage.Sets/src/mage/cards/f/FreyaliseLlanowarsFury.java b/Mage.Sets/src/mage/cards/f/FreyaliseLlanowarsFury.java index 6d7d8313ae8..fda2a75bd7f 100644 --- a/Mage.Sets/src/mage/cards/f/FreyaliseLlanowarsFury.java +++ b/Mage.Sets/src/mage/cards/f/FreyaliseLlanowarsFury.java @@ -60,12 +60,12 @@ public class FreyaliseLlanowarsFury extends CardImpl { } public FreyaliseLlanowarsFury(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.PLANESWALKER},"{3}{G}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.PLANESWALKER}, "{3}{G}{G}"); this.subtype.add("Freyalise"); this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(3)); - // +2: Put a 1/1 green Elf Druid creature token onto the battlefield with "{T}: Add {G} to your mana pool." + // +2: Create a 1/1 green Elf Druid creature token with "{T}: Add {G} to your mana pool." this.addAbility(new LoyaltyAbility(new CreateTokenEffect(new FreyaliseLlanowarsFuryToken()), 2)); // -2: Destroy target artifact or enchantment. LoyaltyAbility loyaltyAbility = new LoyaltyAbility(new DestroyTargetEffect(), -2); @@ -91,7 +91,7 @@ public class FreyaliseLlanowarsFury extends CardImpl { class FreyaliseLlanowarsFuryToken extends Token { FreyaliseLlanowarsFuryToken() { - super("Elf Druid", "1/1 green Elf Druid creature token with \"{t}: Add {G} to your mana pool.\""); + super("Elf Druid", "1/1 green Elf Druid creature token with \"{T}: Add {G} to your mana pool.\""); this.setOriginalExpansionSetCode("C14"); this.cardType.add(CardType.CREATURE); this.color = ObjectColor.GREEN; diff --git a/Mage.Sets/src/mage/cards/f/FromBeyond.java b/Mage.Sets/src/mage/cards/f/FromBeyond.java index edfacd0bc87..3aa53e75395 100644 --- a/Mage.Sets/src/mage/cards/f/FromBeyond.java +++ b/Mage.Sets/src/mage/cards/f/FromBeyond.java @@ -64,7 +64,7 @@ public class FromBeyond extends CardImpl { // Devoid this.addAbility(new DevoidAbility(this.color)); - // At the beginning of your upkeep, put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has "Sacrifice this creature: Add {C} to your mana pool." + // At the beginning of your upkeep, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool." this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new EldraziScionToken()), TargetController.YOU, false)); // {1}{G}, Sacrifice From Beyond: Search your library for an Eldrazi card, reveal it, put it into your hand, then shuffle your library. diff --git a/Mage.Sets/src/mage/cards/f/FromUnderTheFloorboards.java b/Mage.Sets/src/mage/cards/f/FromUnderTheFloorboards.java index 2f4a59404b9..52b190caa23 100644 --- a/Mage.Sets/src/mage/cards/f/FromUnderTheFloorboards.java +++ b/Mage.Sets/src/mage/cards/f/FromUnderTheFloorboards.java @@ -56,11 +56,11 @@ public class FromUnderTheFloorboards extends CardImpl { ability.setRuleAtTheTop(true); this.addAbility(ability); - // Put three 2/2 black Zombie creature tokens onto the battlefield tapped and you gain 3 life. - // If From Under the Floorboards's madness cost was paid, instead put X of those tokens onto the battlefield tapped and you gain X life. + // Create three 2/2 black Zombie creature tokens tapped and you gain 3 life. + // If From Under the Floorboards's madness cost was paid, instead create X of those tokens tapped and you gain X life. DynamicValue xValue = new FromUnderTheFloorboardsManacostVariableValue(); Effect effect = new CreateTokenEffect(new ZombieToken(), xValue, true, false); - effect.setText("Put three 2/2 black Zombie creature tokens onto the battlefield tapped and you gain 3 life. If {this} madness cost was paid, instead put X of those tokens onto the battlefield tapped and you gain X life."); + effect.setText("Create three 2/2 black Zombie creature tokens tapped and you gain 3 life. If {this} madness cost was paid, instead create X of those tokens tapped and you gain X life."); this.getSpellAbility().addEffect(effect); this.getSpellAbility().addEffect(new GainLifeEffect(xValue)); } diff --git a/Mage.Sets/src/mage/cards/f/FungalSprouting.java b/Mage.Sets/src/mage/cards/f/FungalSprouting.java index e8082f9fd1e..1af33b76e77 100644 --- a/Mage.Sets/src/mage/cards/f/FungalSprouting.java +++ b/Mage.Sets/src/mage/cards/f/FungalSprouting.java @@ -55,7 +55,7 @@ public class FungalSprouting extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{G}"); - // Put X 1/1 green Saproling creature tokens onto the battlefield, where X is the greatest power among creatures you control. + // create X 1/1 green Saproling creature tokens, where X is the greatest power among creatures you control. this.getSpellAbility().addEffect(new FungalSproutingEffect()); } @@ -80,7 +80,7 @@ class FungalSproutingEffect extends OneShotEffect { public FungalSproutingEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Put X 1/1 green Saproling creature tokens onto the battlefield, where X is the greatest power among creatures you control"; + this.staticText = "create X 1/1 green Saproling creature tokens, where X is the greatest power among creatures you control"; } public FungalSproutingEffect(final FungalSproutingEffect effect) { diff --git a/Mage.Sets/src/mage/cards/g/GallowsAtWillowHill.java b/Mage.Sets/src/mage/cards/g/GallowsAtWillowHill.java index b904b080c10..c606c022f1f 100644 --- a/Mage.Sets/src/mage/cards/g/GallowsAtWillowHill.java +++ b/Mage.Sets/src/mage/cards/g/GallowsAtWillowHill.java @@ -66,7 +66,7 @@ public class GallowsAtWillowHill extends CardImpl { public GallowsAtWillowHill(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); - // {3}, {tap}, Tap three untapped Humans you control: Destroy target creature. Its controller puts a 1/1 white Spirit creature token with flying onto the battlefield. + // {3}, {tap}, Tap three untapped Humans you control: Destroy target creature. Its controller creates a 1/1 white Spirit creature token with flying. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GallowsAtWillowHillEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledPermanent(3, 3, humanFilter, false))); @@ -88,7 +88,7 @@ class GallowsAtWillowHillEffect extends OneShotEffect { public GallowsAtWillowHillEffect() { super(Outcome.DestroyPermanent); - staticText = "Destroy target creature. Its controller puts a 1/1 white Spirit creature token with flying onto the battlefield"; + staticText = "Destroy target creature. Its controller creates a 1/1 white Spirit creature token with flying"; } public GallowsAtWillowHillEffect(final GallowsAtWillowHillEffect effect) { diff --git a/Mage.Sets/src/mage/cards/g/GarrukApexPredator.java b/Mage.Sets/src/mage/cards/g/GarrukApexPredator.java index 48d405f8cc6..f8a8c845427 100644 --- a/Mage.Sets/src/mage/cards/g/GarrukApexPredator.java +++ b/Mage.Sets/src/mage/cards/g/GarrukApexPredator.java @@ -85,7 +85,7 @@ public class GarrukApexPredator extends CardImpl { ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); - // +1: Put a 3/3 black Beast creature token with deathtouch onto the battlefield. + // +1: Create a 3/3 black Beast creature token with deathtouch. ability = new LoyaltyAbility(new CreateTokenEffect(new GarrukApexPredatorBeastToken()), 1); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GarrukPrimalHunter.java b/Mage.Sets/src/mage/cards/g/GarrukPrimalHunter.java index c2ea5f1e4f7..37ac70b982d 100644 --- a/Mage.Sets/src/mage/cards/g/GarrukPrimalHunter.java +++ b/Mage.Sets/src/mage/cards/g/GarrukPrimalHunter.java @@ -61,13 +61,13 @@ public class GarrukPrimalHunter extends CardImpl { this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(3)); - // +1: Put a 3/3 green Beast creature token onto the battlefield. + // +1: Create a 3/3 green Beast creature token. this.addAbility(new LoyaltyAbility(new CreateTokenEffect(new BeastToken()), 1)); // -3: Draw cards equal to the greatest power among creatures you control. this.addAbility(new LoyaltyAbility(new GarrukPrimalHunterEffect(), -3)); - // -6: Put a 6/6 green Wurm creature token onto the battlefield for each land you control. + // -6: Create a 6/6 green Wurm creature token for each land you control. this.addAbility(new LoyaltyAbility(new CreateTokenEffect(new WurmToken(), new PermanentsOnBattlefieldCount(filter)), -6)); } diff --git a/Mage.Sets/src/mage/cards/g/GarrukRelentless.java b/Mage.Sets/src/mage/cards/g/GarrukRelentless.java index 7991bce45e3..e030f9501ab 100644 --- a/Mage.Sets/src/mage/cards/g/GarrukRelentless.java +++ b/Mage.Sets/src/mage/cards/g/GarrukRelentless.java @@ -72,7 +72,7 @@ public class GarrukRelentless extends CardImpl { ability1.addTarget(new TargetCreaturePermanent()); this.addAbility(ability1); - // 0: Put a 2/2 green Wolf creature token onto the battlefield. + // 0: Create a 2/2 green Wolf creature token. LoyaltyAbility ability2 = new LoyaltyAbility(new CreateTokenEffect(new WolfToken()), 0); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/g/GarrukTheVeilCursed.java b/Mage.Sets/src/mage/cards/g/GarrukTheVeilCursed.java index b9d6cb22746..1708f3fa983 100644 --- a/Mage.Sets/src/mage/cards/g/GarrukTheVeilCursed.java +++ b/Mage.Sets/src/mage/cards/g/GarrukTheVeilCursed.java @@ -27,6 +27,7 @@ */ package mage.cards.g; +import java.util.UUID; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.dynamicvalue.DynamicValue; @@ -43,6 +44,7 @@ import mage.cards.CardSetInfo; import mage.cards.Cards; import mage.cards.CardsImpl; import mage.constants.*; +import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -53,16 +55,13 @@ import mage.target.Target; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledPermanent; -import java.util.UUID; -import mage.filter.common.FilterControlledCreaturePermanent; - /** * @author nantuko */ public class GarrukTheVeilCursed extends CardImpl { public GarrukTheVeilCursed(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.PLANESWALKER},""); + super(ownerId, setInfo, new CardType[]{CardType.PLANESWALKER}, ""); this.subtype.add("Garruk"); // this card is the second face of double-faced card @@ -72,7 +71,7 @@ public class GarrukTheVeilCursed extends CardImpl { this.color.setGreen(true); this.color.setBlack(true); - // +1 : Put a 1/1 black Wolf creature token with deathtouch onto the battlefield. + // +1 : Create a 1/1 black Wolf creature token with deathtouch. LoyaltyAbility ability1 = new LoyaltyAbility(new CreateTokenEffect(new WolfTokenWithDeathtouch()), 1); this.addAbility(ability1); @@ -195,4 +194,3 @@ class GarrukTheVeilCursedEffect extends OneShotEffect { return new GarrukTheVeilCursedEffect(this); } } - diff --git a/Mage.Sets/src/mage/cards/g/GarrukWildspeaker.java b/Mage.Sets/src/mage/cards/g/GarrukWildspeaker.java index 7213a3904d4..e2635c6f880 100644 --- a/Mage.Sets/src/mage/cards/g/GarrukWildspeaker.java +++ b/Mage.Sets/src/mage/cards/g/GarrukWildspeaker.java @@ -64,7 +64,7 @@ public class GarrukWildspeaker extends CardImpl { ability1.addTarget(new TargetLandPermanent(2)); this.addAbility(ability1); - // −1: Put a 3/3 green Beast creature token onto the battlefield. + // −1: Create a 3/3 green Beast creature token. this.addAbility(new LoyaltyAbility(new CreateTokenEffect(beastToken), -1)); // −4: Creatures you control get +3/+3 and gain trample until end of turn. diff --git a/Mage.Sets/src/mage/cards/g/GatherTheTownsfolk.java b/Mage.Sets/src/mage/cards/g/GatherTheTownsfolk.java index 85ff875b96f..c55a05dc489 100644 --- a/Mage.Sets/src/mage/cards/g/GatherTheTownsfolk.java +++ b/Mage.Sets/src/mage/cards/g/GatherTheTownsfolk.java @@ -46,10 +46,10 @@ public class GatherTheTownsfolk extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{W}"); - // Put two 1/1 white Human creature tokens onto the battlefield. - // Fateful hour - If you have 5 or less life, put five of those tokens onto the battlefield instead. + // Create two 1/1 white Human creature tokens. + // Fateful hour - If you have 5 or less life, create five of those tokens instead. this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new CreateTokenEffect(new HumanToken(), 5), new CreateTokenEffect(new HumanToken(), 2), - FatefulHourCondition.getInstance(), "Put two 1/1 white Human creature tokens onto the battlefield. If you have 5 or less life, put five of those tokens onto the battlefield instead")); + FatefulHourCondition.getInstance(), "Create two 1/1 white Human creature tokens. If you have 5 or less life, create five of those tokens instead")); } public GatherTheTownsfolk(final GatherTheTownsfolk card) { diff --git a/Mage.Sets/src/mage/cards/g/GeistHonoredMonk.java b/Mage.Sets/src/mage/cards/g/GeistHonoredMonk.java index 6f9064d73af..aacc72c6c77 100644 --- a/Mage.Sets/src/mage/cards/g/GeistHonoredMonk.java +++ b/Mage.Sets/src/mage/cards/g/GeistHonoredMonk.java @@ -61,7 +61,7 @@ public class GeistHonoredMonk extends CardImpl { // Geist-Honored Monk's power and toughness are each equal to the number of creatures you control. this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent()), Duration.EndOfGame))); - // When Geist-Honored Monk enters the battlefield, put two 1/1 white Spirit creature tokens with flying onto the battlefield. + // When Geist-Honored Monk enters the battlefield, create two 1/1 white Spirit creature tokens with flying. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new SpiritWhiteToken("ISD"), 2))); } diff --git a/Mage.Sets/src/mage/cards/g/GeistOfSaintTraft.java b/Mage.Sets/src/mage/cards/g/GeistOfSaintTraft.java index 6dbe86a82da..8f247bd337b 100644 --- a/Mage.Sets/src/mage/cards/g/GeistOfSaintTraft.java +++ b/Mage.Sets/src/mage/cards/g/GeistOfSaintTraft.java @@ -28,8 +28,6 @@ package mage.cards.g; import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -39,6 +37,7 @@ import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; @@ -52,7 +51,7 @@ import mage.target.targetpointer.FixedTarget; public class GeistOfSaintTraft extends CardImpl { public GeistOfSaintTraft(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}{U}"); this.supertype.add("Legendary"); this.subtype.add("Spirit"); this.subtype.add("Cleric"); @@ -62,7 +61,7 @@ public class GeistOfSaintTraft extends CardImpl { // Hexproof this.addAbility(HexproofAbility.getInstance()); - // Whenever Geist of Saint Traft attacks, put a 4/4 white Angel creature token with flying onto the battlefield tapped and attacking. Exile that token at end of combat. + // Whenever Geist of Saint Traft attacks, create a 4/4 white Angel creature token with flying tapped and attacking. Exile that token at end of combat. this.addAbility(new AttacksTriggeredAbility(new GeistOfSaintTraftEffect(), false)); } @@ -80,7 +79,7 @@ class GeistOfSaintTraftEffect extends OneShotEffect { GeistOfSaintTraftEffect() { super(Outcome.PutCreatureInPlay); - staticText = "put a 4/4 white Angel creature token with flying onto the battlefield tapped and attacking. Exile that token at end of combat"; + staticText = "create a 4/4 white Angel creature token with flying tapped and attacking. Exile that token at end of combat"; } GeistOfSaintTraftEffect(final GeistOfSaintTraftEffect effect) { diff --git a/Mage.Sets/src/mage/cards/g/GeistSnatch.java b/Mage.Sets/src/mage/cards/g/GeistSnatch.java index c69905205e2..536ea6995ee 100644 --- a/Mage.Sets/src/mage/cards/g/GeistSnatch.java +++ b/Mage.Sets/src/mage/cards/g/GeistSnatch.java @@ -59,7 +59,7 @@ public class GeistSnatch extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{U}{U}"); - // Counter target creature spell. Put a 1/1 blue Spirit creature token with flying onto the battlefield. + // Counter target creature spell. Create a 1/1 blue Spirit creature token with flying. this.getSpellAbility().addTarget(new TargetSpell(filter)); this.getSpellAbility().addEffect(new GeistSnatchCounterTargetEffect()); } @@ -78,7 +78,7 @@ class GeistSnatchCounterTargetEffect extends OneShotEffect { public GeistSnatchCounterTargetEffect() { super(Outcome.Detriment); - staticText = "Counter target creature spell. Put a 1/1 blue Spirit creature token with flying onto the battlefield"; + staticText = "Counter target creature spell. Create a 1/1 blue Spirit creature token with flying"; } public GeistSnatchCounterTargetEffect(final GeistSnatchCounterTargetEffect effect) { diff --git a/Mage.Sets/src/mage/cards/g/GelatinousGenesis.java b/Mage.Sets/src/mage/cards/g/GelatinousGenesis.java index 0b56da6062c..5c012bca88c 100644 --- a/Mage.Sets/src/mage/cards/g/GelatinousGenesis.java +++ b/Mage.Sets/src/mage/cards/g/GelatinousGenesis.java @@ -48,7 +48,7 @@ public class GelatinousGenesis extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{X}{X}{G}"); - // Put X X/X green Ooze creature tokens onto the battlefield. + // create X X/X green Ooze creature tokens. this.getSpellAbility().addEffect(new GelatinousGenesisEffect()); } @@ -66,7 +66,7 @@ class GelatinousGenesisEffect extends OneShotEffect { public GelatinousGenesisEffect() { super(Outcome.PutCreatureInPlay); - staticText = "Put X X/X green Ooze creature tokens onto the battlefield"; + staticText = "create X X/X green Ooze creature tokens"; } public GelatinousGenesisEffect(GelatinousGenesisEffect ability) { diff --git a/Mage.Sets/src/mage/cards/g/GenesisChamber.java b/Mage.Sets/src/mage/cards/g/GenesisChamber.java index 9a2e5de77df..9c32f0ff6d9 100644 --- a/Mage.Sets/src/mage/cards/g/GenesisChamber.java +++ b/Mage.Sets/src/mage/cards/g/GenesisChamber.java @@ -59,7 +59,7 @@ public class GenesisChamber extends CardImpl { public GenesisChamber(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); - // Whenever a nontoken creature enters the battlefield, if Genesis Chamber is untapped, that creature's controller puts a 1/1 colorless Myr artifact creature token onto the battlefield. + // Whenever a nontoken creature enters the battlefield, if Genesis Chamber is untapped, that creature's controller creates a 1/1 colorless Myr artifact creature token. this.addAbility(new GenesisChamberTriggeredAbility(new GenesisChamberEffect(), filter)); } @@ -75,7 +75,7 @@ public class GenesisChamber extends CardImpl { class GenesisChamberTriggeredAbility extends EntersBattlefieldAllTriggeredAbility { - private static final String rule = "Whenever a nontoken creature enters the battlefield, if {this} is untapped, that creature's controller puts a 1/1 colorless Myr artifact creature token onto the battlefield"; + private static final String rule = "Whenever a nontoken creature enters the battlefield, if {this} is untapped, that creature's controller creates a 1/1 colorless Myr artifact creature token"; public GenesisChamberTriggeredAbility(Effect effect, FilterPermanent filter) { super(Zone.BATTLEFIELD, effect, filter, false, SetTargetPointer.PERMANENT, rule); @@ -109,7 +109,7 @@ class GenesisChamberEffect extends OneShotEffect { public GenesisChamberEffect() { super(Outcome.Benefit); - this.staticText = "that creature's controller puts a 1/1 colorless Myr artifact creature token onto the battlefield"; + this.staticText = "that creature's controller creates a 1/1 colorless Myr artifact creature token"; } public GenesisChamberEffect(final GenesisChamberEffect effect) { diff --git a/Mage.Sets/src/mage/cards/g/GhaveGuruOfSpores.java b/Mage.Sets/src/mage/cards/g/GhaveGuruOfSpores.java index 925537fa0e9..f50db77be68 100644 --- a/Mage.Sets/src/mage/cards/g/GhaveGuruOfSpores.java +++ b/Mage.Sets/src/mage/cards/g/GhaveGuruOfSpores.java @@ -75,7 +75,7 @@ public class GhaveGuruOfSpores extends CardImpl { // Ghave, Guru of Spores enters the battlefield with five +1/+1 counters on it. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(5)))); - // {1}, Remove a +1/+1 counter from a creature you control: Put a 1/1 green Saproling creature token onto the battlefield. + // {1}, Remove a +1/+1 counter from a creature you control: Create a 1/1 green Saproling creature token. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new GenericManaCost(1)); ability.addCost(new RemoveCounterCost(new TargetControlledCreaturePermanent(1, 1, new FilterControlledCreaturePermanent(), true), CounterType.P1P1)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GhirapurGearcrafter.java b/Mage.Sets/src/mage/cards/g/GhirapurGearcrafter.java index 7f1c5e11625..8bf41e4cbe3 100644 --- a/Mage.Sets/src/mage/cards/g/GhirapurGearcrafter.java +++ b/Mage.Sets/src/mage/cards/g/GhirapurGearcrafter.java @@ -49,7 +49,7 @@ public class GhirapurGearcrafter extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - // When Ghirapur Gearcrafter enters the battlefield, put a 1/1 colorless Thopter artifact creature token with flying onto the battlefield. + // When Ghirapur Gearcrafter enters the battlefield, create a 1/1 colorless Thopter artifact creature token with flying. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new ThopterColorlessToken()))); } diff --git a/Mage.Sets/src/mage/cards/g/GhoulcallerGisa.java b/Mage.Sets/src/mage/cards/g/GhoulcallerGisa.java index a7b1fbaff7c..4d9596ff1ce 100644 --- a/Mage.Sets/src/mage/cards/g/GhoulcallerGisa.java +++ b/Mage.Sets/src/mage/cards/g/GhoulcallerGisa.java @@ -69,12 +69,12 @@ public class GhoulcallerGisa extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(4); - // {B}, {tap}, Sacrifice another creature: Put X 2/2 black Zombie creature tokens onto the battlefield, where X is the sacrificed creature's power. + // {B}, {tap}, Sacrifice another creature: create X 2/2 black Zombie creature tokens, where X is the sacrificed creature's power. DynamicValue xValue = new SacrificeCostCreaturesPower(); Token zombie = new ZombieToken(); zombie.setTokenType(2); Effect effect = new CreateTokenEffect(zombie, xValue); - effect.setText("Put X 2/2 black Zombie creature tokens onto the battlefield, where X is the sacrificed creature's power"); + effect.setText("create X 2/2 black Zombie creature tokens, where X is the sacrificed creature's power"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(filter))); diff --git a/Mage.Sets/src/mage/cards/g/GhoulcallersAccomplice.java b/Mage.Sets/src/mage/cards/g/GhoulcallersAccomplice.java index 5865ef98f99..4acbe24e4c0 100644 --- a/Mage.Sets/src/mage/cards/g/GhoulcallersAccomplice.java +++ b/Mage.Sets/src/mage/cards/g/GhoulcallersAccomplice.java @@ -53,7 +53,7 @@ public class GhoulcallersAccomplice extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // {3}{B}, Exile Ghoulcaller's Accomplice from your graveyard: Put a 2/2 black Zombie creature token onto the battlefield. + // {3}{B}, Exile Ghoulcaller's Accomplice from your graveyard: Create a 2/2 black Zombie creature token. // Activate this ability only any time you could cast a sorcery. Ability ability = new ActivateAsSorceryActivatedAbility(Zone.GRAVEYARD, new CreateTokenEffect(new ZombieToken()), new ManaCostsImpl("{3}{B}")); ability.addCost(new ExileSourceFromGraveCost()); diff --git a/Mage.Sets/src/mage/cards/g/GiantAdephage.java b/Mage.Sets/src/mage/cards/g/GiantAdephage.java index 21a33a0b6b0..813a91faa29 100644 --- a/Mage.Sets/src/mage/cards/g/GiantAdephage.java +++ b/Mage.Sets/src/mage/cards/g/GiantAdephage.java @@ -52,7 +52,7 @@ public class GiantAdephage extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); - // Whenever Giant Adephage deals combat damage to a player, put a token onto the battlefield that is a copy of Giant Adephage. + // Whenever Giant Adephage deals combat damage to a player, create a token that is a copy of Giant Adephage. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new PutTokenOntoBattlefieldCopySourceEffect(), false)); } diff --git a/Mage.Sets/src/mage/cards/g/GiantCaterpillar.java b/Mage.Sets/src/mage/cards/g/GiantCaterpillar.java index 77a91183b20..e2fa1fcc0bf 100644 --- a/Mage.Sets/src/mage/cards/g/GiantCaterpillar.java +++ b/Mage.Sets/src/mage/cards/g/GiantCaterpillar.java @@ -50,15 +50,15 @@ import mage.game.permanent.token.Token; public class GiantCaterpillar extends CardImpl { public GiantCaterpillar(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{G}"); this.subtype.add("Insect"); this.power = new MageInt(3); this.toughness = new MageInt(3); - // {G}, Sacrifice Giant Caterpillar: Put a 1/1 green Insect creature token with flying named Butterfly onto the battlefield at the beginning of the next end step. + // {G}, Sacrifice Giant Caterpillar: Create a 1/1 green Insect creature token with flying named Butterfly at the beginning of the next end step. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateDelayedTriggeredAbilityEffect( - new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new CreateTokenEffect(new ButterflyToken()))), - new ManaCostsImpl("{G}")); + new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new CreateTokenEffect(new ButterflyToken()))), + new ManaCostsImpl("{G}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/Giantbaiting.java b/Mage.Sets/src/mage/cards/g/Giantbaiting.java index c362554a086..2bf9df6ad2c 100644 --- a/Mage.Sets/src/mage/cards/g/Giantbaiting.java +++ b/Mage.Sets/src/mage/cards/g/Giantbaiting.java @@ -53,7 +53,7 @@ public class Giantbaiting extends CardImpl { public Giantbaiting(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{R/G}"); - // Put a 4/4 red and green Giant Warrior creature token with haste onto the battlefield. Exile it at the beginning of the next end step. + // Create a 4/4 red and green Giant Warrior creature token with haste. Exile it at the beginning of the next end step. this.getSpellAbility().addEffect(new GiantbaitingEffect()); // Conspire @@ -75,7 +75,7 @@ class GiantbaitingEffect extends OneShotEffect { public GiantbaitingEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Put a 4/4 red and green Giant Warrior creature token with haste onto the battlefield. Exile it at the beginning of the next end step"; + this.staticText = "Create a 4/4 red and green Giant Warrior creature token with haste. Exile it at the beginning of the next end step"; } public GiantbaitingEffect(final GiantbaitingEffect effect) { diff --git a/Mage.Sets/src/mage/cards/g/GideonAllyOfZendikar.java b/Mage.Sets/src/mage/cards/g/GideonAllyOfZendikar.java index d9274b55e66..2b592171c8e 100644 --- a/Mage.Sets/src/mage/cards/g/GideonAllyOfZendikar.java +++ b/Mage.Sets/src/mage/cards/g/GideonAllyOfZendikar.java @@ -67,7 +67,7 @@ public class GideonAllyOfZendikar extends CardImpl { ability.addEffect(effect); this.addAbility(ability); - // 0: Put a 2/2 white Knight Ally creature token onto the battlefield. + // 0: Create a 2/2 white Knight Ally creature token. this.addAbility(new LoyaltyAbility(new CreateTokenEffect(new KnightAllyToken()), 0)); // -4: You get an emblem with "Creatures you control get +1/+1." diff --git a/Mage.Sets/src/mage/cards/g/GideonsPhalanx.java b/Mage.Sets/src/mage/cards/g/GideonsPhalanx.java index afff09a8f24..bf569c97872 100644 --- a/Mage.Sets/src/mage/cards/g/GideonsPhalanx.java +++ b/Mage.Sets/src/mage/cards/g/GideonsPhalanx.java @@ -51,7 +51,7 @@ public class GideonsPhalanx extends CardImpl { public GideonsPhalanx(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{5}{W}{W}"); - // Put four 2/2 white Knight creature tokens with vigilance onto the battlefield. + // Create four 2/2 white Knight creature tokens with vigilance. this.getSpellAbility().addEffect(new CreateTokenEffect(new KnightToken(), 4)); // Spell mastery - If there are two or more instant and/or sorcery cards in your graveyard, creatures you control gain indestructible until end of turn. diff --git a/Mage.Sets/src/mage/cards/g/Gild.java b/Mage.Sets/src/mage/cards/g/Gild.java index 25a137dee58..cd72e91447e 100644 --- a/Mage.Sets/src/mage/cards/g/Gild.java +++ b/Mage.Sets/src/mage/cards/g/Gild.java @@ -50,9 +50,9 @@ public class Gild extends CardImpl { // Exile target creature. this.getSpellAbility().addEffect(new ExileTargetEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - // Put a colorless artifact token named Gold onto the battlefield. It has "Sacrifice this artifact: Add one mana of any color to your mana pool." + // Create a colorless artifact token named Gold. It has "Sacrifice this artifact: Add one mana of any color to your mana pool." Effect effect = new CreateTokenEffect(new GoldToken()); - effect.setText("Put a colorless artifact token named Gold onto the battlefield. It has \"Sacrifice this artifact: Add one mana of any color to your mana pool.\""); + effect.setText("Create a colorless artifact token named Gold. It has \"Sacrifice this artifact: Add one mana of any color to your mana pool.\""); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/cards/g/GiltLeafAmbush.java b/Mage.Sets/src/mage/cards/g/GiltLeafAmbush.java index 44cef66d9a9..46ab3358afe 100644 --- a/Mage.Sets/src/mage/cards/g/GiltLeafAmbush.java +++ b/Mage.Sets/src/mage/cards/g/GiltLeafAmbush.java @@ -56,7 +56,7 @@ public class GiltLeafAmbush extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.INSTANT},"{2}{G}"); this.subtype.add("Elf"); - // Put two 1/1 green Elf Warrior creature tokens into play. Clash with an opponent. If you win, those creatures gain deathtouch until end of turn + // Create two 1/1 green Elf Warrior creature tokens into play. Clash with an opponent. If you win, those creatures gain deathtouch until end of turn this.getSpellAbility().addEffect(new GiltLeafAmbushCreateTokenEffect()); } @@ -74,7 +74,7 @@ class GiltLeafAmbushCreateTokenEffect extends OneShotEffect { public GiltLeafAmbushCreateTokenEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Put two 1/1 green Elf Warrior creature tokens into play. Clash with an opponent. If you win, those creatures gain deathtouch until end of turn"; + this.staticText = "Create two 1/1 green Elf Warrior creature tokens into play. Clash with an opponent. If you win, those creatures gain deathtouch until end of turn"; } public GiltLeafAmbushCreateTokenEffect(final GiltLeafAmbushCreateTokenEffect effect) { diff --git a/Mage.Sets/src/mage/cards/g/GisasBidding.java b/Mage.Sets/src/mage/cards/g/GisasBidding.java index 2dfee7d7ede..dc5e1f10a13 100644 --- a/Mage.Sets/src/mage/cards/g/GisasBidding.java +++ b/Mage.Sets/src/mage/cards/g/GisasBidding.java @@ -45,7 +45,7 @@ public class GisasBidding extends CardImpl { public GisasBidding(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{B}{B}"); - // Put two 2/2 black Zombie creature tokens onto the battlefield. + // Create two 2/2 black Zombie creature tokens. this.getSpellAbility().addEffect(new CreateTokenEffect(new ZombieToken(), 2)); // Madness {2}{B} diff --git a/Mage.Sets/src/mage/cards/g/GloomwidowsFeast.java b/Mage.Sets/src/mage/cards/g/GloomwidowsFeast.java index 51391d3a85a..11cdf6a9dc7 100644 --- a/Mage.Sets/src/mage/cards/g/GloomwidowsFeast.java +++ b/Mage.Sets/src/mage/cards/g/GloomwidowsFeast.java @@ -58,7 +58,7 @@ public class GloomwidowsFeast extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{G}"); - // Destroy target creature with flying. If that creature was blue or black, put a 1/2 green Spider creature token with reach onto the battlefield. + // Destroy target creature with flying. If that creature was blue or black, create a 1/2 green Spider creature token with reach. this.getSpellAbility().addEffect(new GloomwidowsFeastEffect()); this.getSpellAbility().addTarget(new TargetPermanent(filter)); @@ -80,7 +80,7 @@ class GloomwidowsFeastEffect extends OneShotEffect { public GloomwidowsFeastEffect() { super(Outcome.DestroyPermanent); - this.staticText = "Destroy target creature with flying. If that creature was blue or black, put a 1/2 green Spider creature token with reach onto the battlefield"; + this.staticText = "Destroy target creature with flying. If that creature was blue or black, create a 1/2 green Spider creature token with reach"; } public GloomwidowsFeastEffect(final GloomwidowsFeastEffect effect) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinAssault.java b/Mage.Sets/src/mage/cards/g/GoblinAssault.java index 8b0745720d9..c73a01b2b6b 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinAssault.java +++ b/Mage.Sets/src/mage/cards/g/GoblinAssault.java @@ -58,7 +58,7 @@ public class GoblinAssault extends CardImpl { public GoblinAssault(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}"); - // At the beginning of your upkeep, put a 1/1 red Goblin creature token with haste onto the battlefield. + // At the beginning of your upkeep, create a 1/1 red Goblin creature token with haste. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new GoblinTokenWithHaste()), TargetController.YOU, false)); // Goblin creatures attack each turn if able. diff --git a/Mage.Sets/src/mage/cards/g/GoblinKaboomist.java b/Mage.Sets/src/mage/cards/g/GoblinKaboomist.java index bb98b2b8970..cd02229e5be 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinKaboomist.java +++ b/Mage.Sets/src/mage/cards/g/GoblinKaboomist.java @@ -60,14 +60,14 @@ import mage.target.common.TargetCreaturePermanent; public class GoblinKaboomist extends CardImpl { public GoblinKaboomist(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}"); this.subtype.add("Goblin"); this.subtype.add("Warrior"); this.power = new MageInt(1); this.toughness = new MageInt(2); - // At the beginning of your upkeep, put a colorless artifact token named Land Mine onto the battlefield + // At the beginning of your upkeep, create a colorless artifact token named Land Mine // with "{R}, Sacrifice this artifact: This artifact deals 2 damage to target attacking creature without flying." // Then flip a coin. If you lose the flip, Goblin Kaboomist deals 2 damage to itself. Ability ability = new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new LandMineToken()), TargetController.YOU, false); @@ -85,13 +85,12 @@ public class GoblinKaboomist extends CardImpl { } } - class GoblinKaboomistFlipCoinEffect extends OneShotEffect { public GoblinKaboomistFlipCoinEffect() { super(Outcome.Damage); } - + public GoblinKaboomistFlipCoinEffect(final GoblinKaboomistFlipCoinEffect effect) { super(effect); } @@ -100,7 +99,7 @@ class GoblinKaboomistFlipCoinEffect extends OneShotEffect { public GoblinKaboomistFlipCoinEffect copy() { return new GoblinKaboomistFlipCoinEffect(this); } - + @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); @@ -115,17 +114,17 @@ class GoblinKaboomistFlipCoinEffect extends OneShotEffect { } return false; } - + } class LandMineToken extends Token { private static final FilterAttackingCreature filter = new FilterAttackingCreature("attacking creature without flying"); - + static { filter.add(Predicates.not(new AbilityPredicate(FlyingAbility.class))); } - + public LandMineToken() { super("Land Mine", "colorless artifact token named Land Mine with \"{R}, Sacrifice this artifact: This artifact deals 2 damage to target attacking creature without flying.\""); this.setOriginalExpansionSetCode("M15"); diff --git a/Mage.Sets/src/mage/cards/g/GoblinMarshal.java b/Mage.Sets/src/mage/cards/g/GoblinMarshal.java index a215cfc82a9..7af33b214c1 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinMarshal.java +++ b/Mage.Sets/src/mage/cards/g/GoblinMarshal.java @@ -53,7 +53,7 @@ public class GoblinMarshal extends CardImpl { this.toughness = new MageInt(3); this.addAbility(new EchoAbility("{4}{R}{R}")); - // When Goblin Marshal enters the battlefield or dies, put two 1/1 red Goblin creature tokens onto the battlefield. + // When Goblin Marshal enters the battlefield or dies, create two 1/1 red Goblin creature tokens. Ability enterAbility = new EntersBattlefieldOrDiesSourceTriggeredAbility(new CreateTokenEffect(new GoblinToken(), 2), false); this.addAbility(enterAbility); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinOffensive.java b/Mage.Sets/src/mage/cards/g/GoblinOffensive.java index 12aedcf624b..e7b780603d2 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinOffensive.java +++ b/Mage.Sets/src/mage/cards/g/GoblinOffensive.java @@ -44,7 +44,7 @@ public class GoblinOffensive extends CardImpl { public GoblinOffensive(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{X}{1}{R}{R}"); - // Put X 1/1 red Goblin creature tokens onto the battlefield. + // create X 1/1 red Goblin creature tokens. this.getSpellAbility().addEffect(new CreateTokenEffect(new GoblinToken(), new ManacostVariableValue())); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinRabblemaster.java b/Mage.Sets/src/mage/cards/g/GoblinRabblemaster.java index 4f29260760e..28518ccddfd 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinRabblemaster.java +++ b/Mage.Sets/src/mage/cards/g/GoblinRabblemaster.java @@ -80,7 +80,7 @@ public class GoblinRabblemaster extends CardImpl { Effect effect = new AttacksIfAbleAllEffect(otherGoblinFilter); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect), new AttackedThisTurnWatcher()); - // At the beginning of combat on your turn, put a 1/1 red Goblin creature token with haste onto the battlefield. + // At the beginning of combat on your turn, create a 1/1 red Goblin creature token with haste. this.addAbility(new BeginningOfCombatTriggeredAbility(new CreateTokenEffect(new GoblinTokenWithHaste()), TargetController.YOU, false)); // When Goblin Rabblemaster attacks, it gets +1/+0 until end of turn for each other attacking Goblin. diff --git a/Mage.Sets/src/mage/cards/g/GoblinRally.java b/Mage.Sets/src/mage/cards/g/GoblinRally.java index b17591c3795..b23c810c4cd 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinRally.java +++ b/Mage.Sets/src/mage/cards/g/GoblinRally.java @@ -45,7 +45,7 @@ public class GoblinRally extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{R}{R}"); - // Put four 1/1 red Goblin creature tokens onto the battlefield. + // Create four 1/1 red Goblin creature tokens. this.getSpellAbility().addEffect(new CreateTokenEffect(new GoblinToken(), 4)); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinScouts.java b/Mage.Sets/src/mage/cards/g/GoblinScouts.java index e7636905770..10d211d874f 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinScouts.java +++ b/Mage.Sets/src/mage/cards/g/GoblinScouts.java @@ -45,7 +45,7 @@ public class GoblinScouts extends CardImpl { public GoblinScouts(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{R}{R}"); - // Put three 1/1 red Goblin Scout creature tokens with mountainwalk onto the battlefield. + // Create three 1/1 red Goblin Scout creature tokens with mountainwalk. this.getSpellAbility().addEffect(new CreateTokenEffect(new GoblinScoutsToken(), 3)); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinTrenches.java b/Mage.Sets/src/mage/cards/g/GoblinTrenches.java index 17626694fae..8fb74ac800e 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinTrenches.java +++ b/Mage.Sets/src/mage/cards/g/GoblinTrenches.java @@ -56,7 +56,7 @@ public class GoblinTrenches extends CardImpl { - // {2}, Sacrifice a land: Put two 1/1 red and white Goblin Soldier creature tokens onto the battlefield. + // {2}, Sacrifice a land: Create two 1/1 red and white Goblin Soldier creature tokens. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GoblinTrenchesToken(), 2), new GenericManaCost(2)); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GoblinWarrens.java b/Mage.Sets/src/mage/cards/g/GoblinWarrens.java index 79f1b35dfd5..b939bb0f44c 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinWarrens.java +++ b/Mage.Sets/src/mage/cards/g/GoblinWarrens.java @@ -53,7 +53,7 @@ public class GoblinWarrens extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}"); - // {2}{R}, Sacrifice two Goblins: Put three 1/1 red Goblin creature tokens onto the battlefield. + // {2}{R}, Sacrifice two Goblins: Create three 1/1 red Goblin creature tokens. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GoblinToken(), 3), new ManaCostsImpl("{2}{R}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, true))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/Goblinslide.java b/Mage.Sets/src/mage/cards/g/Goblinslide.java index de423338cb9..1114cf302cf 100644 --- a/Mage.Sets/src/mage/cards/g/Goblinslide.java +++ b/Mage.Sets/src/mage/cards/g/Goblinslide.java @@ -55,7 +55,7 @@ public class Goblinslide extends CardImpl { public Goblinslide(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}"); - // Whenever you cast a noncreature spell, you may pay {1}. If you do, put a 1/1 red Goblin creature token with haste onto the battlefield. + // Whenever you cast a noncreature spell, you may pay {1}. If you do, create a 1/1 red Goblin creature token with haste. this.addAbility(new SpellCastControllerTriggeredAbility(new DoIfCostPaid(new CreateTokenEffect(new GoblinTokenWithHaste()), new GenericManaCost(1)), filter, false)); } diff --git a/Mage.Sets/src/mage/cards/g/GodFavoredGeneral.java b/Mage.Sets/src/mage/cards/g/GodFavoredGeneral.java index c36819d518c..2bea2af4948 100644 --- a/Mage.Sets/src/mage/cards/g/GodFavoredGeneral.java +++ b/Mage.Sets/src/mage/cards/g/GodFavoredGeneral.java @@ -52,7 +52,7 @@ public class GodFavoredGeneral extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // Inspired - Whenever God-Favored General becomes untapped, you may pay {2}{W}. If you do, put two 1/1 white Soldier enchantment creature tokens onto the battlefield. + // Inspired - Whenever God-Favored General becomes untapped, you may pay {2}{W}. If you do, create two 1/1 white Soldier enchantment creature tokens. this.addAbility(new InspiredAbility(new DoIfCostPaid(new CreateTokenEffect(new SoldierToken(), 2), new ManaCostsImpl("{2}{W}")))); } diff --git a/Mage.Sets/src/mage/cards/g/GodsEyeGateToTheReikai.java b/Mage.Sets/src/mage/cards/g/GodsEyeGateToTheReikai.java index 458785b56d0..315e2058de7 100644 --- a/Mage.Sets/src/mage/cards/g/GodsEyeGateToTheReikai.java +++ b/Mage.Sets/src/mage/cards/g/GodsEyeGateToTheReikai.java @@ -47,7 +47,7 @@ public class GodsEyeGateToTheReikai extends CardImpl { this.supertype.add("Legendary"); // {tap}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); - // When Gods' Eye, Gate to the Reikai is put into a graveyard from the battlefield, put a 1/1 colorless Spirit creature token onto the battlefield. + // When Gods' Eye, Gate to the Reikai is put into a graveyard from the battlefield, create a 1/1 colorless Spirit creature token. this.addAbility(new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new CreateTokenEffect(new SpiritToken(), 1), false)); } diff --git a/Mage.Sets/src/mage/cards/g/GoldmeadowLookout.java b/Mage.Sets/src/mage/cards/g/GoldmeadowLookout.java index 9fa359e5010..3eaa8f5af42 100644 --- a/Mage.Sets/src/mage/cards/g/GoldmeadowLookout.java +++ b/Mage.Sets/src/mage/cards/g/GoldmeadowLookout.java @@ -50,13 +50,13 @@ import mage.target.common.TargetCreaturePermanent; public class GoldmeadowLookout extends CardImpl { public GoldmeadowLookout(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}"); this.subtype.add("Kithkin"); this.subtype.add("Spellshaper"); this.power = new MageInt(2); this.toughness = new MageInt(2); - // {W}, {tap}, Discard a card: Put a 1/1 white Kithkin Soldier creature token named Goldmeadow Harrier onto the battlefield. It has "{W}, {tap}: Tap target creature." + // {W}, {tap}, Discard a card: Create a 1/1 white Kithkin Soldier creature token named Goldmeadow Harrier. It has "{W}, {tap}: Tap target creature." Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GoldmeadowHarrierToken()), new ManaCostsImpl("{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); diff --git a/Mage.Sets/src/mage/cards/g/GolgariGermination.java b/Mage.Sets/src/mage/cards/g/GolgariGermination.java index b716c13b71e..814d6b57b14 100644 --- a/Mage.Sets/src/mage/cards/g/GolgariGermination.java +++ b/Mage.Sets/src/mage/cards/g/GolgariGermination.java @@ -56,7 +56,7 @@ public class GolgariGermination extends CardImpl { public GolgariGermination(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{B}{G}"); - // Whenever a nontoken creature you control dies, put a 1/1 green Saproling creature token onto the battlefield. + // Whenever a nontoken creature you control dies, create a 1/1 green Saproling creature token. this.addAbility(new DiesCreatureTriggeredAbility(new CreateTokenEffect(new SaprolingToken()), false, filter)); } diff --git a/Mage.Sets/src/mage/cards/g/GrafHarvest.java b/Mage.Sets/src/mage/cards/g/GrafHarvest.java index 6c62c5008e1..35bc105f1ab 100644 --- a/Mage.Sets/src/mage/cards/g/GrafHarvest.java +++ b/Mage.Sets/src/mage/cards/g/GrafHarvest.java @@ -68,7 +68,7 @@ public class GrafHarvest extends CardImpl { effect.setText("Zombies you control have menace. (They can't be blocked except by two or more creatures.)"); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); - // {3}{B}, Exile a creature card from your graveyard: Put a 2/2 black Zombie creature token onto the battlefield. + // {3}{B}, Exile a creature card from your graveyard: Create a 2/2 black Zombie creature token. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ZombieToken()), new ManaCostsImpl("{3}{B}")); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(new FilterCreatureCard("a creature card from your graveyard")))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GraveBirthing.java b/Mage.Sets/src/mage/cards/g/GraveBirthing.java index 857e02f2ab4..cd8c0849028 100644 --- a/Mage.Sets/src/mage/cards/g/GraveBirthing.java +++ b/Mage.Sets/src/mage/cards/g/GraveBirthing.java @@ -60,11 +60,11 @@ public class GraveBirthing extends CardImpl { Ability ability = new DevoidAbility(this.color); ability.setRuleAtTheTop(true); this.addAbility(ability); - // Target opponent exiles a card from his or her graveyard. You put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has "Sacrifice this creature: Add {C} to your mana pool." + // Target opponent exiles a card from his or her graveyard. You create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool." this.getSpellAbility().addEffect(new GraveBirthingEffect()); this.getSpellAbility().addTarget(new TargetOpponent()); Effect effect = new CreateTokenEffect(new EldraziScionToken()); - effect.setText("You put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has \"Sacrifice this creature: Add {C} to your mana pool.\"
"); + effect.setText("You create a 1/1 colorless Eldrazi Scion creature token. It has \"Sacrifice this creature: Add {C} to your mana pool.\"
"); this.getSpellAbility().addEffect(effect); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/cards/g/GraveTitan.java b/Mage.Sets/src/mage/cards/g/GraveTitan.java index 35440a5c7bf..62a76a83939 100644 --- a/Mage.Sets/src/mage/cards/g/GraveTitan.java +++ b/Mage.Sets/src/mage/cards/g/GraveTitan.java @@ -99,7 +99,7 @@ class GraveTitanAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever {this} enters the battlefield or attacks, put two 2/2 black Zombie creature tokens onto the battlefield."; + return "Whenever {this} enters the battlefield or attacks, create two 2/2 black Zombie creature tokens."; } } diff --git a/Mage.Sets/src/mage/cards/g/GriffinGuide.java b/Mage.Sets/src/mage/cards/g/GriffinGuide.java index 726907bbf10..5ba5b307448 100644 --- a/Mage.Sets/src/mage/cards/g/GriffinGuide.java +++ b/Mage.Sets/src/mage/cards/g/GriffinGuide.java @@ -70,7 +70,7 @@ public class GriffinGuide extends CardImpl { ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2,2, Duration.WhileOnBattlefield)); ability.addEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield, "and has flying")); this.addAbility(ability); - // When enchanted creature dies, put a 2/2 white Griffin creature token with flying onto the battlefield. + // When enchanted creature dies, create a 2/2 white Griffin creature token with flying. this.addAbility(new DiesAttachedTriggeredAbility(new CreateTokenEffect(new GriffinToken()), "enchanted creature")); } diff --git a/Mage.Sets/src/mage/cards/g/GrizzlyFate.java b/Mage.Sets/src/mage/cards/g/GrizzlyFate.java index 0597f80bdc6..c4d920b6fe5 100644 --- a/Mage.Sets/src/mage/cards/g/GrizzlyFate.java +++ b/Mage.Sets/src/mage/cards/g/GrizzlyFate.java @@ -50,12 +50,12 @@ public class GrizzlyFate extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{G}{G}"); - // Put two 2/2 green Bear creature tokens onto the battlefield. - // Threshold - Put four 2/2 green Bear creature tokens onto the battlefield instead if seven or more cards are in your graveyard. + // Create two 2/2 green Bear creature tokens. + // Threshold - Create four 2/2 green Bear creature tokens instead if seven or more cards are in your graveyard. Effect effect = new ConditionalOneShotEffect(new CreateTokenEffect(new BearToken(), 4), new CreateTokenEffect(new BearToken(), 2), new CardsInControllerGraveCondition(7), - "Put two 2/2 green Bear creature tokens onto the battlefield.

Threshold - Put four 2/2 green Bear creature tokens onto the battlefield instead if seven or more cards are in your graveyard."); + "Create two 2/2 green Bear creature tokens.

Threshold - Create four 2/2 green Bear creature tokens instead if seven or more cards are in your graveyard."); this.getSpellAbility().addEffect(effect); // Flashback {5}{G}{G} diff --git a/Mage.Sets/src/mage/cards/g/GroveOfTheGuardian.java b/Mage.Sets/src/mage/cards/g/GroveOfTheGuardian.java index 4aa5c1d760d..e71bc6745ca 100644 --- a/Mage.Sets/src/mage/cards/g/GroveOfTheGuardian.java +++ b/Mage.Sets/src/mage/cards/g/GroveOfTheGuardian.java @@ -61,12 +61,12 @@ public class GroveOfTheGuardian extends CardImpl { } public GroveOfTheGuardian(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.LAND},""); + super(ownerId, setInfo, new CardType[]{CardType.LAND}, ""); // {T}: Add {C} to your mana pool. this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(0, 0, 0, 0, 0, 0, 0, 1), new TapSourceCost())); - // {3}{G}{W}, {T}, Tap two untapped creatures you control, Sacrifice Grove of the Guardian: Put an 8/8 green and white Elemental creature token with vigilance onto the battlefield. + // {3}{G}{W}, {T}, Tap two untapped creatures you control, Sacrifice Grove of the Guardian: Create an 8/8 green and white Elemental creature token with vigilance. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ElementalToken(), 1), new ManaCostsImpl("{3}{G}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, false))); diff --git a/Mage.Sets/src/mage/cards/g/GrovetenderDruids.java b/Mage.Sets/src/mage/cards/g/GrovetenderDruids.java index b9cf7ef2b0e..fe4827e235b 100644 --- a/Mage.Sets/src/mage/cards/g/GrovetenderDruids.java +++ b/Mage.Sets/src/mage/cards/g/GrovetenderDruids.java @@ -58,7 +58,7 @@ public class GrovetenderDruids extends CardImpl { this.toughness = new MageInt(3); // Rally-Whenever Grovetender Druids or another Ally enters the battlefield under your control, you may pay {1}. - // If you do, put a 1/1 green Plant creature token onto the battlefield. + // If you do, create a 1/1 green Plant creature token. this.addAbility(new AllyEntersBattlefieldTriggeredAbility(new GrovetenderDruidsEffect(), false)); } @@ -76,7 +76,7 @@ class GrovetenderDruidsEffect extends OneShotEffect { GrovetenderDruidsEffect() { super(Outcome.Benefit); - this.staticText = "you may pay {1}. If you do, put a 1/1 green Plant creature token onto the battlefield"; + this.staticText = "you may pay {1}. If you do, create a 1/1 green Plant creature token"; } GrovetenderDruidsEffect(final GrovetenderDruidsEffect effect) { diff --git a/Mage.Sets/src/mage/cards/g/GrowingRanks.java b/Mage.Sets/src/mage/cards/g/GrowingRanks.java index 647ea205b63..3a0f6bf65a7 100644 --- a/Mage.Sets/src/mage/cards/g/GrowingRanks.java +++ b/Mage.Sets/src/mage/cards/g/GrowingRanks.java @@ -53,7 +53,7 @@ public class GrowingRanks extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{G/W}{G/W}"); - // At the beginning of your upkeep, populate. (Put a token onto the battlefield that's a copy of a creature token you control.) + // At the beginning of your upkeep, populate. (Create a token that's a copy of a creature token you control.) this.addAbility(new BeginningOfUpkeepTriggeredAbility(new PopulateEffect(""), TargetController.YOU, false)); } diff --git a/Mage.Sets/src/mage/cards/g/GutterGrime.java b/Mage.Sets/src/mage/cards/g/GutterGrime.java index 2a71ebd8221..de917824f26 100644 --- a/Mage.Sets/src/mage/cards/g/GutterGrime.java +++ b/Mage.Sets/src/mage/cards/g/GutterGrime.java @@ -63,7 +63,7 @@ public class GutterGrime extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{4}{G}"); - // Whenever a nontoken creature you control dies, put a slime counter on Gutter Grime, then put a green Ooze creature token onto the battlefield with "This creature's power and toughness are each equal to the number of slime counters on Gutter Grime." + // Whenever a nontoken creature you control dies, put a slime counter on Gutter Grime, then create a green Ooze creature token with "This creature's power and toughness are each equal to the number of slime counters on Gutter Grime." this.addAbility(new GutterGrimeTriggeredAbility()); } @@ -118,7 +118,7 @@ class GutterGrimeTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever a nontoken creature you control dies, put a slime counter on {this}, then put a green Ooze creature token onto the battlefield with \"This creature's power and toughness are each equal to the number of slime counters on {this}.\""; + return "Whenever a nontoken creature you control dies, put a slime counter on {this}, then create a green Ooze creature token with \"This creature's power and toughness are each equal to the number of slime counters on {this}.\""; } } diff --git a/Mage.Sets/src/mage/cards/g/GwyllionHedgeMage.java b/Mage.Sets/src/mage/cards/g/GwyllionHedgeMage.java index 98e3b5334b7..92d9c56e294 100644 --- a/Mage.Sets/src/mage/cards/g/GwyllionHedgeMage.java +++ b/Mage.Sets/src/mage/cards/g/GwyllionHedgeMage.java @@ -60,7 +60,7 @@ public class GwyllionHedgeMage extends CardImpl { filter2.add(new SubtypePredicate("Swamp")); } - private final String rule1 = "When {this} enters the battlefield, if you control two or more Plains, you may put a 1/1 white Kithkin Soldier creature token onto the battlefield."; + private final String rule1 = "When {this} enters the battlefield, if you control two or more Plains, you may create a 1/1 white Kithkin Soldier creature token."; private final String rule2 = "When {this} enters the battlefield, if you control two or more Swamps, you may put a -1/-1 counter on target creature."; public GwyllionHedgeMage(UUID ownerId, CardSetInfo setInfo) { @@ -71,7 +71,7 @@ public class GwyllionHedgeMage extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // When Gwyllion Hedge-Mage enters the battlefield, if you control two or more Plains, you may put a 1/1 white Kithkin Soldier creature token onto the battlefield. + // When Gwyllion Hedge-Mage enters the battlefield, if you control two or more Plains, you may create a 1/1 white Kithkin Soldier creature token. Ability ability = new ConditionalTriggeredAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new KithkinToken()), true), new PermanentsOnTheBattlefieldCondition(filter, CountType.MORE_THAN, 1), rule1); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HallowedSpiritkeeper.java b/Mage.Sets/src/mage/cards/h/HallowedSpiritkeeper.java index c586be77c3b..db632a988a7 100644 --- a/Mage.Sets/src/mage/cards/h/HallowedSpiritkeeper.java +++ b/Mage.Sets/src/mage/cards/h/HallowedSpiritkeeper.java @@ -56,9 +56,9 @@ public class HallowedSpiritkeeper extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); - // When Hallowed Spiritkeeper dies, put X 1/1 white Spirit creature tokens with flying onto the battlefield, where X is the number of creature cards in your graveyard. + // When Hallowed Spiritkeeper dies, create X 1/1 white Spirit creature tokens with flying, where X is the number of creature cards in your graveyard. Effect effect = new CreateTokenEffect(new SpiritWhiteToken(), new CardsInControllerGraveyardCount(new FilterCreatureCard("creature cards"))); - effect.setText("put X 1/1 white Spirit creature tokens with flying onto the battlefield, where X is the number of creature cards in your graveyard"); + effect.setText("create X 1/1 white Spirit creature tokens with flying, where X is the number of creature cards in your graveyard"); this.addAbility(new DiesTriggeredAbility(effect, false)); } diff --git a/Mage.Sets/src/mage/cards/h/HammerOfPurphoros.java b/Mage.Sets/src/mage/cards/h/HammerOfPurphoros.java index f3433e2b18e..e888547026d 100644 --- a/Mage.Sets/src/mage/cards/h/HammerOfPurphoros.java +++ b/Mage.Sets/src/mage/cards/h/HammerOfPurphoros.java @@ -62,7 +62,7 @@ public class HammerOfPurphoros extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent("Creatures")))); - // {2}{R}, {tap}, Sacrifice a land: Put a 3/3 colorless Golem enchantment artifact creature token onto the battlefield. + // {2}{R}, {tap}, Sacrifice a land: Create a 3/3 colorless Golem enchantment artifact creature token. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HammerOfPurphorosGolemToken()), new ManaCostsImpl("{2}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(new FilterControlledLandPermanent("land")))); diff --git a/Mage.Sets/src/mage/cards/h/HangarbackWalker.java b/Mage.Sets/src/mage/cards/h/HangarbackWalker.java index e0fcf2524ca..2e9a1cc2239 100644 --- a/Mage.Sets/src/mage/cards/h/HangarbackWalker.java +++ b/Mage.Sets/src/mage/cards/h/HangarbackWalker.java @@ -61,7 +61,7 @@ public class HangarbackWalker extends CardImpl { // Hangarback Walker enters the battlefield with X +1/+1 counters on it. this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.P1P1.createInstance()))); - // When Hangarback Walker dies, put a 1/1 colorless Thopter artifact creature token with flying onto the battlefield for each +1/+1 counter on Hangarback Walker. + // When Hangarback Walker dies, create a 1/1 colorless Thopter artifact creature token with flying for each +1/+1 counter on Hangarback Walker. this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new ThopterColorlessToken(), new CountersSourceCount(CounterType.P1P1)), false)); // {1}, {t}: Put a +1/+1 counter on Hangarback Walker. diff --git a/Mage.Sets/src/mage/cards/h/HanweirGarrison.java b/Mage.Sets/src/mage/cards/h/HanweirGarrison.java index a6eaf52311f..db4bc57659b 100644 --- a/Mage.Sets/src/mage/cards/h/HanweirGarrison.java +++ b/Mage.Sets/src/mage/cards/h/HanweirGarrison.java @@ -53,7 +53,7 @@ public class HanweirGarrison extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(3); - // Whenever Hanweir Garrison attacks, put two 1/1 red Human creature tokens onto the battlefield tapped and attacking. + // Whenever Hanweir Garrison attacks, create two 1/1 red Human creature tokens tapped and attacking. this.addAbility(new AttacksTriggeredAbility(new CreateTokenEffect(new RedHumanToken(), 2, true, true), false)); // (Melds with Hanweir Battlements.) diff --git a/Mage.Sets/src/mage/cards/h/HanweirTheWrithingTownship.java b/Mage.Sets/src/mage/cards/h/HanweirTheWrithingTownship.java index 8d549fe970b..c48d2d2be49 100644 --- a/Mage.Sets/src/mage/cards/h/HanweirTheWrithingTownship.java +++ b/Mage.Sets/src/mage/cards/h/HanweirTheWrithingTownship.java @@ -61,7 +61,7 @@ public class HanweirTheWrithingTownship extends MeldCard { // Haste this.addAbility(HasteAbility.getInstance()); - // Whenever Hanweir, the Writhing Township attacks, put two 3/2 colorless Eldrazi Horror creature tokens onto the battlefield tapped and attacking. + // Whenever Hanweir, the Writhing Township attacks, create two 3/2 colorless Eldrazi Horror creature tokens tapped and attacking. this.addAbility(new AttacksTriggeredAbility(new CreateTokenEffect(new EldraziHorrorToken(), 2, true, true), false)); } diff --git a/Mage.Sets/src/mage/cards/h/HauntedAngel.java b/Mage.Sets/src/mage/cards/h/HauntedAngel.java index 0ceaa7fb23d..8f6f9760cfb 100644 --- a/Mage.Sets/src/mage/cards/h/HauntedAngel.java +++ b/Mage.Sets/src/mage/cards/h/HauntedAngel.java @@ -56,7 +56,7 @@ public class HauntedAngel extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // When Haunted Angel dies, exile Haunted Angel and each other player puts a 3/3 black Angel creature token with flying onto the battlefield. + // When Haunted Angel dies, exile Haunted Angel and each other player creates a 3/3 black Angel creature token with flying. Ability ability = new DiesTriggeredAbility(new ExileSourceEffect()); ability.addEffect(new HauntedAngelEffect()); this.addAbility(ability); @@ -76,7 +76,7 @@ class HauntedAngelEffect extends OneShotEffect { public HauntedAngelEffect() { super(Outcome.Detriment); - staticText = "and each other player puts a 3/3 black Angel creature token with flying onto the battlefield."; + staticText = "and each other player creates a 3/3 black Angel creature token with flying."; } public HauntedAngelEffect(HauntedAngelEffect copy) { diff --git a/Mage.Sets/src/mage/cards/h/HauntedDead.java b/Mage.Sets/src/mage/cards/h/HauntedDead.java index 65b07333466..49f5cd58454 100644 --- a/Mage.Sets/src/mage/cards/h/HauntedDead.java +++ b/Mage.Sets/src/mage/cards/h/HauntedDead.java @@ -56,7 +56,7 @@ public class HauntedDead extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // When Haunted Dead enters the battlefield, put a 1/1 white Spirit creature token with flying onto the battlefield. + // When Haunted Dead enters the battlefield, create a 1/1 white Spirit creature token with flying. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new SpiritWhiteToken()))); // {1}{B}, Discard two cards: Return Haunted Dead from your graveyard to the battlefield tapped. diff --git a/Mage.Sets/src/mage/cards/h/HavengulRunebinder.java b/Mage.Sets/src/mage/cards/h/HavengulRunebinder.java index d2ba6e695fe..150c314c8fe 100644 --- a/Mage.Sets/src/mage/cards/h/HavengulRunebinder.java +++ b/Mage.Sets/src/mage/cards/h/HavengulRunebinder.java @@ -67,7 +67,7 @@ public class HavengulRunebinder extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // {2}{U}, {tap}, Exile a creature card from your graveyard: Put a 2/2 black Zombie creature token onto the battlefield, + // {2}{U}, {tap}, Exile a creature card from your graveyard: Create a 2/2 black Zombie creature token, // then put a +1/+1 counter on each Zombie creature you control. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ZombieToken()), diff --git a/Mage.Sets/src/mage/cards/h/HazezonTamar.java b/Mage.Sets/src/mage/cards/h/HazezonTamar.java index 6724d2df9d7..11a0dc64729 100644 --- a/Mage.Sets/src/mage/cards/h/HazezonTamar.java +++ b/Mage.Sets/src/mage/cards/h/HazezonTamar.java @@ -72,7 +72,7 @@ public class HazezonTamar extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(4); - // When Hazezon Tamar enters the battlefield, put X 1/1 Sand Warrior creature tokens that are red, green, and white onto the battlefield at the beginning of your next upkeep, where X is the number of lands you control at that time. + // When Hazezon Tamar enters the battlefield, create X 1/1 Sand Warrior creature tokens that are red, green, and white at the beginning of your next upkeep, where X is the number of lands you control at that time. this.addAbility(new EntersBattlefieldTriggeredAbility(new HazezonTamarEntersEffect(), false)); // When Hazezon leaves the battlefield, exile all Sand Warriors. this.addAbility(new LeavesBattlefieldTriggeredAbility(new ExileAllEffect(filter), false)); @@ -92,7 +92,7 @@ class HazezonTamarEntersEffect extends OneShotEffect { public HazezonTamarEntersEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "put X 1/1 Sand Warrior creature tokens that are red, green, and white onto the battlefield at the beginning of your next upkeep, where X is the number of lands you control at that time"; + this.staticText = "create X 1/1 Sand Warrior creature tokens that are red, green, and white at the beginning of your next upkeep, where X is the number of lands you control at that time"; } public HazezonTamarEntersEffect(final HazezonTamarEntersEffect effect) { @@ -109,7 +109,7 @@ class HazezonTamarEntersEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { Effect effect = new CreateTokenEffect(new HazezonTamarSandWarrior(), new PermanentsOnBattlefieldCount(new FilterControlledLandPermanent())); - effect.setText("put X 1/1 Sand Warrior creature tokens that are red, green, and white onto the battlefield, where X is the number of lands you control at that time"); + effect.setText("create X 1/1 Sand Warrior creature tokens that are red, green, and white, where X is the number of lands you control at that time"); DelayedTriggeredAbility delayedAbility = new AtTheBeginOfYourNextUpkeepDelayedTriggeredAbility(effect); game.addDelayedTriggeredAbility(delayedAbility, source); return true; diff --git a/Mage.Sets/src/mage/cards/h/HearthcageGiant.java b/Mage.Sets/src/mage/cards/h/HearthcageGiant.java index 6407a38d775..b0048dfafe5 100644 --- a/Mage.Sets/src/mage/cards/h/HearthcageGiant.java +++ b/Mage.Sets/src/mage/cards/h/HearthcageGiant.java @@ -69,7 +69,7 @@ public class HearthcageGiant extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); - //When Hearthcage Giant enters the battlefield, put two 3/1 red Elemental Shaman creature tokens onto the battlefield. + //When Hearthcage Giant enters the battlefield, create two 3/1 red Elemental Shaman creature tokens. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new ElementalShamanToken("LRW"), 2), false)); //Sacrifice an Elemental: Target Giant creature gets +3/+1 until end of turn. diff --git a/Mage.Sets/src/mage/cards/h/HeatShimmer.java b/Mage.Sets/src/mage/cards/h/HeatShimmer.java index 928362440d1..76e1cacb42d 100644 --- a/Mage.Sets/src/mage/cards/h/HeatShimmer.java +++ b/Mage.Sets/src/mage/cards/h/HeatShimmer.java @@ -54,7 +54,7 @@ public class HeatShimmer extends CardImpl { public HeatShimmer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{R}"); - // Put a token that's a copy of target creature onto the battlefield. That token has haste and "At the beginning of the end step, exile this permanent." + // Create a token that's a copy of target creature. That token has haste and "At the beginning of the end step, exile this permanent." this.getSpellAbility().addEffect(new HeatShimmerEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } @@ -73,7 +73,7 @@ class HeatShimmerEffect extends OneShotEffect { public HeatShimmerEffect() { super(Outcome.Copy); - this.staticText = "Put a token that's a copy of target creature onto the battlefield. That token has haste and \"At the beginning of the end step, exile this permanent.\""; + this.staticText = "Create a token that's a copy of target creature. That token has haste and \"At the beginning of the end step, exile this permanent.\""; } public HeatShimmerEffect(final HeatShimmerEffect effect) { diff --git a/Mage.Sets/src/mage/cards/h/HeliodGodOfTheSun.java b/Mage.Sets/src/mage/cards/h/HeliodGodOfTheSun.java index d7d22bc7fc4..0ca61244c14 100644 --- a/Mage.Sets/src/mage/cards/h/HeliodGodOfTheSun.java +++ b/Mage.Sets/src/mage/cards/h/HeliodGodOfTheSun.java @@ -73,7 +73,7 @@ public class HeliodGodOfTheSun extends CardImpl { // Other creatures you control have vigilance. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent(), true))); - // {2}{W}{W}: Put a 2/1 white Cleric enchantment creature token onto the battlefield. + // {2}{W}{W}: Create a 2/1 white Cleric enchantment creature token. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HeliodGodOfTheSunToken()), new ManaCostsImpl("{2}{W}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/h/HellionCrucible.java b/Mage.Sets/src/mage/cards/h/HellionCrucible.java index 899031ef506..d8219053bcf 100644 --- a/Mage.Sets/src/mage/cards/h/HellionCrucible.java +++ b/Mage.Sets/src/mage/cards/h/HellionCrucible.java @@ -64,7 +64,7 @@ public class HellionCrucible extends CardImpl { ability.addCost(new TapSourceCost()); this.addAbility(ability); - // {1}{R}, {tap}, Remove two pressure counters from Hellion Crucible and sacrifice it: Put a 4/4 red Hellion creature token with haste onto the battlefield. + // {1}{R}, {tap}, Remove two pressure counters from Hellion Crucible and sacrifice it: Create a 4/4 red Hellion creature token with haste. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HellionToken(), 1), new ManaCostsImpl("{1}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.PRESSURE.createInstance(2))); diff --git a/Mage.Sets/src/mage/cards/h/HellionEruption.java b/Mage.Sets/src/mage/cards/h/HellionEruption.java index 0e595ba356f..c68155c0778 100644 --- a/Mage.Sets/src/mage/cards/h/HellionEruption.java +++ b/Mage.Sets/src/mage/cards/h/HellionEruption.java @@ -52,7 +52,7 @@ public class HellionEruption extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{5}{R}"); - // Sacrifice all creatures you control, then put that many 4/4 red Hellion creature tokens onto the battlefield. + // Sacrifice all creatures you control, then create that many 4/4 red Hellion creature tokens. this.getSpellAbility().addEffect(new HellionEruptionEffect()); } @@ -70,7 +70,7 @@ class HellionEruptionEffect extends OneShotEffect { public HellionEruptionEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Sacrifice all creatures you control, then put that many 4/4 red Hellion creature tokens onto the battlefield"; + this.staticText = "Sacrifice all creatures you control, then create that many 4/4 red Hellion creature tokens"; } public HellionEruptionEffect(final HellionEruptionEffect effect) { diff --git a/Mage.Sets/src/mage/cards/h/HelmOfKaldra.java b/Mage.Sets/src/mage/cards/h/HelmOfKaldra.java index 641203b13e3..ee9c3ba07e1 100644 --- a/Mage.Sets/src/mage/cards/h/HelmOfKaldra.java +++ b/Mage.Sets/src/mage/cards/h/HelmOfKaldra.java @@ -72,7 +72,7 @@ public class HelmOfKaldra extends CardImpl { } public HelmOfKaldra(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); this.supertype.add("Legendary"); this.subtype.add("Equipment"); @@ -85,13 +85,13 @@ public class HelmOfKaldra extends CardImpl { effect.setText("and haste"); ability.addEffect(effect); this.addAbility(ability); - // {1}: If you control Equipment named Helm of Kaldra, Sword of Kaldra, and Shield of Kaldra, put a legendary 4/4 colorless Avatar creature token named Kaldra onto the battlefield and attach those Equipment to it. + // {1}: If you control Equipment named Helm of Kaldra, Sword of Kaldra, and Shield of Kaldra, create a legendary 4/4 colorless Avatar creature token named Kaldra and attach those Equipment to it. this.addAbility(new ConditionalActivatedAbility( Zone.BATTLEFIELD, new HelmOfKaldraEffect(), new GenericManaCost(1), new HelmOfKaldraCondition(), - "{1}: If you control Equipment named Helm of Kaldra, Sword of Kaldra, and Shield of Kaldra, put a legendary 4/4 colorless Avatar creature token named Kaldra onto the battlefield and attach those Equipment to it")); + "{1}: If you control Equipment named Helm of Kaldra, Sword of Kaldra, and Shield of Kaldra, create a legendary 4/4 colorless Avatar creature token named Kaldra and attach those Equipment to it")); // Equip {2} this.addAbility(new EquipAbility(Outcome.Benefit, new ManaCostsImpl("{2}"))); } @@ -125,7 +125,7 @@ class HelmOfKaldraEffect extends OneShotEffect { public HelmOfKaldraEffect() { super(Outcome.Benefit); - this.staticText = "If you control Equipment named Helm of Kaldra, Sword of Kaldra, and Shield of Kaldra, put a legendary 4/4 colorless Avatar creature token named Kaldra onto the battlefield and attach those Equipment to it"; + this.staticText = "If you control Equipment named Helm of Kaldra, Sword of Kaldra, and Shield of Kaldra, create a legendary 4/4 colorless Avatar creature token named Kaldra and attach those Equipment to it"; } public HelmOfKaldraEffect(final HelmOfKaldraEffect effect) { diff --git a/Mage.Sets/src/mage/cards/h/HeraldOfAnafenza.java b/Mage.Sets/src/mage/cards/h/HeraldOfAnafenza.java index b287ddf81dc..eec92a6fe3d 100644 --- a/Mage.Sets/src/mage/cards/h/HeraldOfAnafenza.java +++ b/Mage.Sets/src/mage/cards/h/HeraldOfAnafenza.java @@ -59,7 +59,7 @@ public class HeraldOfAnafenza extends CardImpl { // Outlast {2}{W} ({2}{W} {T}: Put a +1/+1 counter on this creature. Outlast only as a sorcery.) this.addAbility(new OutlastAbility(new ManaCostsImpl("{2}{W}"))); - // Whenever you activate Herald of Anafenza's outlast ability, put a 1/1 white Warrior creature token onto the battlefield. + // Whenever you activate Herald of Anafenza's outlast ability, create a 1/1 white Warrior creature token. this.addAbility(new HeraldOfAnafenzaTriggeredAbility()); } diff --git a/Mage.Sets/src/mage/cards/h/HeroOfBladehold.java b/Mage.Sets/src/mage/cards/h/HeroOfBladehold.java index 1991d31cbad..fa9ae99e3f3 100644 --- a/Mage.Sets/src/mage/cards/h/HeroOfBladehold.java +++ b/Mage.Sets/src/mage/cards/h/HeroOfBladehold.java @@ -54,7 +54,7 @@ public class HeroOfBladehold extends CardImpl { // Battle cry (Whenever this creature attacks, each other attacking creature gets +1/+0 until end of turn.) this.addAbility(new BattleCryAbility()); - // Whenever Hero of Bladehold attacks, put two 1/1 white Soldier creature tokens onto the battlefield tapped and attacking. + // Whenever Hero of Bladehold attacks, create two 1/1 white Soldier creature tokens tapped and attacking. this.addAbility(new AttacksTriggeredAbility(new CreateTokenEffect(new SoldierToken(), 2, true, true), false)); } diff --git a/Mage.Sets/src/mage/cards/h/HiveStirrings.java b/Mage.Sets/src/mage/cards/h/HiveStirrings.java index b1683cf663c..9f1c2a9cdda 100644 --- a/Mage.Sets/src/mage/cards/h/HiveStirrings.java +++ b/Mage.Sets/src/mage/cards/h/HiveStirrings.java @@ -43,7 +43,7 @@ public class HiveStirrings extends CardImpl { public HiveStirrings(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{W}"); - // Put two 1/1 colorless Sliver creature tokens onto the battlefield. + // Create two 1/1 colorless Sliver creature tokens. this.getSpellAbility().addEffect(new CreateTokenEffect(new SliverToken(), 2)); } diff --git a/Mage.Sets/src/mage/cards/h/HomaridSpawningBed.java b/Mage.Sets/src/mage/cards/h/HomaridSpawningBed.java index 9501fa4a040..f0e561f4325 100644 --- a/Mage.Sets/src/mage/cards/h/HomaridSpawningBed.java +++ b/Mage.Sets/src/mage/cards/h/HomaridSpawningBed.java @@ -59,7 +59,7 @@ public class HomaridSpawningBed extends CardImpl { public HomaridSpawningBed(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{U}{U}"); - // {1}{U}{U}, Sacrifice a blue creature: Put X 1/1 blue Camarid creature tokens onto the battlefield, where X is the sacrificed creature's converted mana cost. + // {1}{U}{U}, Sacrifice a blue creature: create X 1/1 blue Camarid creature tokens, where X is the sacrificed creature's converted mana cost. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CamaridToken(), new SacrificeCostConvertedMana("creature")), new ManaCostsImpl("{1}{U}{U}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(filter))); diff --git a/Mage.Sets/src/mage/cards/h/HoodedHydra.java b/Mage.Sets/src/mage/cards/h/HoodedHydra.java index 7144abab53c..0d7477c459e 100644 --- a/Mage.Sets/src/mage/cards/h/HoodedHydra.java +++ b/Mage.Sets/src/mage/cards/h/HoodedHydra.java @@ -65,7 +65,7 @@ public class HoodedHydra extends CardImpl { // Hooded Hydra enters the battlefield with X +1/+1 counters on it. this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.P1P1.createInstance()))); - // When Hooded Hydra dies, put a 1/1 green Snake creature token onto the battlefield for each +1/+1 counter on it. + // When Hooded Hydra dies, create a 1/1 green Snake creature token for each +1/+1 counter on it. this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new SnakeToken("KTK"), new CountersSourceCount(CounterType.P1P1)), false)); // Morph {3}{G}{G} diff --git a/Mage.Sets/src/mage/cards/h/HoofprintsOfTheStag.java b/Mage.Sets/src/mage/cards/h/HoofprintsOfTheStag.java index 9144a281e2f..12a94603b29 100644 --- a/Mage.Sets/src/mage/cards/h/HoofprintsOfTheStag.java +++ b/Mage.Sets/src/mage/cards/h/HoofprintsOfTheStag.java @@ -57,7 +57,7 @@ public class HoofprintsOfTheStag extends CardImpl { // Whenever you draw a card, you may put a hoofprint counter on Hoofprints of the Stag. this.addAbility(new DrawCardControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.HOOFPRINT.createInstance(1)), true)); - // {2}{w}, Remove four hoofprint counters from Hoofprints of the Stag: Put a 4/4 white Elemental creature token with flying onto the battlefield. Activate this ability only during your turn. + // {2}{w}, Remove four hoofprint counters from Hoofprints of the Stag: Create a 4/4 white Elemental creature token with flying. Activate this ability only during your turn. Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new WhiteElementalToken(), 1), new ManaCostsImpl("{2}{W}"), MyTurnCondition.getInstance()); ability.addCost(new RemoveCountersSourceCost(CounterType.HOOFPRINT.createInstance(4))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HordelingOutburst.java b/Mage.Sets/src/mage/cards/h/HordelingOutburst.java index 7a1708b2e53..a4123498bc5 100644 --- a/Mage.Sets/src/mage/cards/h/HordelingOutburst.java +++ b/Mage.Sets/src/mage/cards/h/HordelingOutburst.java @@ -41,9 +41,9 @@ import mage.game.permanent.token.GoblinToken; public class HordelingOutburst extends CardImpl { public HordelingOutburst(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{R}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{R}{R}"); - // Put 3 1/1 red Goblin creature tokens onto the battlefield. + // Put three 1/1 red Goblin creature tokens. this.getSpellAbility().addEffect(new CreateTokenEffect(new GoblinToken(), 3)); } diff --git a/Mage.Sets/src/mage/cards/h/HorncallersChant.java b/Mage.Sets/src/mage/cards/h/HorncallersChant.java index 3736385c11d..8ad04f9694e 100644 --- a/Mage.Sets/src/mage/cards/h/HorncallersChant.java +++ b/Mage.Sets/src/mage/cards/h/HorncallersChant.java @@ -47,8 +47,8 @@ public class HorncallersChant extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{7}{G}"); - // Put a 4/4 green Rhino creature token with trample onto the battlefield, then populate. - // (Put a token onto the battlefield that's a copy of a creature token you control.) + // Create a 4/4 green Rhino creature token with trample, then populate. + // (Create a token that's a copy of a creature token you control.) this.getSpellAbility().addEffect(new CreateTokenEffect(new RhinoToken())); this.getSpellAbility().addEffect(new PopulateEffect("then")); } diff --git a/Mage.Sets/src/mage/cards/h/HornetCannon.java b/Mage.Sets/src/mage/cards/h/HornetCannon.java index 8718e4b0421..f05993ea329 100644 --- a/Mage.Sets/src/mage/cards/h/HornetCannon.java +++ b/Mage.Sets/src/mage/cards/h/HornetCannon.java @@ -53,9 +53,9 @@ import mage.target.targetpointer.FixedTarget; public class HornetCannon extends CardImpl { public HornetCannon(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); - // {3}, {tap}: Put a 1/1 colorless Insect artifact creature token with flying and haste named Hornet onto the battlefield. Destroy it at the beginning of the next end step. + // {3}, {tap}: Create a 1/1 colorless Insect artifact creature token with flying and haste named Hornet. Destroy it at the beginning of the next end step. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HornetCannonEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); this.addAbility(ability); @@ -75,7 +75,7 @@ class HornetCannonEffect extends OneShotEffect { public HornetCannonEffect() { super(Outcome.PutCreatureInPlay); - staticText = "Put a 1/1 colorless Insect artifact creature token with flying and haste named Hornet onto the battlefield. Destroy it at the beginning of the next end step."; + staticText = "Create a 1/1 colorless Insect artifact creature token with flying and haste named Hornet. Destroy it at the beginning of the next end step."; } public HornetCannonEffect(final HornetCannonEffect effect) { diff --git a/Mage.Sets/src/mage/cards/h/HornetNest.java b/Mage.Sets/src/mage/cards/h/HornetNest.java index bcbcbe068a0..b264d2c9ca6 100644 --- a/Mage.Sets/src/mage/cards/h/HornetNest.java +++ b/Mage.Sets/src/mage/cards/h/HornetNest.java @@ -60,7 +60,7 @@ public class HornetNest extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); - // Whenever Hornet Nest is dealt damage, put that many 1/1 green Insect creature tokens with flying and deathtouch onto the battlefield. + // Whenever Hornet Nest is dealt damage, create that many 1/1 green Insect creature tokens with flying and deathtouch. this.addAbility(new DealtDamageToSourceTriggeredAbility(Zone.BATTLEFIELD, new HornetNestDealDamageEffect(), false)); } @@ -78,7 +78,7 @@ class HornetNestDealDamageEffect extends OneShotEffect { public HornetNestDealDamageEffect() { super(Outcome.Damage); - this.staticText = "put that many 1/1 green Insect creature tokens with flying and deathtouch onto the battlefield"; + this.staticText = "create that many 1/1 green Insect creature tokens with flying and deathtouch"; } public HornetNestDealDamageEffect(final HornetNestDealDamageEffect effect) { diff --git a/Mage.Sets/src/mage/cards/h/HornetQueen.java b/Mage.Sets/src/mage/cards/h/HornetQueen.java index c4931f0b4d9..b0b43677448 100644 --- a/Mage.Sets/src/mage/cards/h/HornetQueen.java +++ b/Mage.Sets/src/mage/cards/h/HornetQueen.java @@ -55,7 +55,7 @@ public class HornetQueen extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Deathtouch this.addAbility(DeathtouchAbility.getInstance()); - // When Hornet Queen enters the battlefield, put four 1/1 green Insect creature tokens with flying and deathtouch onto the battlefield. + // When Hornet Queen enters the battlefield, create four 1/1 green Insect creature tokens with flying and deathtouch. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new HornetQueenInsectToken(), 4), false)); } diff --git a/Mage.Sets/src/mage/cards/h/Hostility.java b/Mage.Sets/src/mage/cards/h/Hostility.java index b57b01ff107..24a14ba8ae1 100644 --- a/Mage.Sets/src/mage/cards/h/Hostility.java +++ b/Mage.Sets/src/mage/cards/h/Hostility.java @@ -64,7 +64,7 @@ public class Hostility extends CardImpl { this.addAbility(HasteAbility.getInstance()); // If a spell you control would deal damage to an opponent, prevent that damage. - // Put a 3/1 red Elemental Shaman creature token with haste onto the battlefield for each 1 damage prevented this way. + // Create a 3/1 red Elemental Shaman creature token with haste for each 1 damage prevented this way. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new HostilityEffect())); // When Hostility is put into a graveyard from anywhere, shuffle it into its owner's library. @@ -85,7 +85,7 @@ class HostilityEffect extends PreventionEffectImpl { public HostilityEffect() { super(Duration.WhileOnBattlefield, Integer.MAX_VALUE, false, false); - staticText = "If a spell you control would deal damage to an opponent, prevent that damage. Put a 3/1 red Elemental Shaman creature token with haste onto the battlefield for each 1 damage prevented this way."; + staticText = "If a spell you control would deal damage to an opponent, prevent that damage. Create a 3/1 red Elemental Shaman creature token with haste for each 1 damage prevented this way."; } public HostilityEffect(final HostilityEffect effect) { diff --git a/Mage.Sets/src/mage/cards/h/HourOfNeed.java b/Mage.Sets/src/mage/cards/h/HourOfNeed.java index d581dad272c..d3bcac747f5 100644 --- a/Mage.Sets/src/mage/cards/h/HourOfNeed.java +++ b/Mage.Sets/src/mage/cards/h/HourOfNeed.java @@ -56,7 +56,7 @@ public class HourOfNeed extends CardImpl { // Strive — Hour of Need costs {1}{U} more to cast for each target beyond the first. this.addAbility(new StriveAbility("{1}{U}")); - // Exile any number of target creatures. For each creature exiled this way, its controller puts a 4/4 blue Sphinx creature token with flying onto the battlefield. + // Exile any number of target creatures. For each creature exiled this way, its controller creates a 4/4 blue Sphinx creature token with flying. this.getSpellAbility().addEffect(new HourOfNeedExileEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent(0, Integer.MAX_VALUE)); } @@ -75,7 +75,7 @@ class HourOfNeedExileEffect extends OneShotEffect { public HourOfNeedExileEffect() { super(Outcome.Benefit); - this.staticText = "Exile any number of target creatures. For each creature exiled this way, its controller puts a 4/4 blue Sphinx creature token with flying onto the battlefield"; + this.staticText = "Exile any number of target creatures. For each creature exiled this way, its controller creates a 4/4 blue Sphinx creature token with flying"; } public HourOfNeedExileEffect(final HourOfNeedExileEffect effect) { diff --git a/Mage.Sets/src/mage/cards/h/HowlingChorus.java b/Mage.Sets/src/mage/cards/h/HowlingChorus.java index d41e06864f0..d7c6b350242 100644 --- a/Mage.Sets/src/mage/cards/h/HowlingChorus.java +++ b/Mage.Sets/src/mage/cards/h/HowlingChorus.java @@ -58,7 +58,7 @@ public class HowlingChorus extends CardImpl { // Creatures with power less than Howling Chorus's power can't block it. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByCreaturesWithLessPowerEffect())); - // Whenever Howling Chorus deals combat damage to a player, put a 3/2 colorless Eldrazi Horror creature token onto the battlefield. + // Whenever Howling Chorus deals combat damage to a player, create a 3/2 colorless Eldrazi Horror creature token. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new CreateTokenEffect(new EldraziHorrorToken()), false)); } diff --git a/Mage.Sets/src/mage/cards/h/HowlpackAlpha.java b/Mage.Sets/src/mage/cards/h/HowlpackAlpha.java index 996e5c0fa00..f62ebd571ef 100644 --- a/Mage.Sets/src/mage/cards/h/HowlpackAlpha.java +++ b/Mage.Sets/src/mage/cards/h/HowlpackAlpha.java @@ -57,7 +57,7 @@ import mage.abilities.effects.Effect; */ public class HowlpackAlpha extends CardImpl { - private static final String ruleText = "At the beginning of your end step, put a 2/2 green Wolf creature token onto the battlefield"; + private static final String ruleText = "At the beginning of your end step, create a 2/2 green Wolf creature token"; private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Werewolf and Wolf creatures"); @@ -81,7 +81,7 @@ public class HowlpackAlpha extends CardImpl { Effect effect = new ConditionalContinuousEffect(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true), new TransformedCondition(), null); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); - // At the beginning of your end step, put a 2/2 green Wolf creature token onto the battlefield. + // At the beginning of your end step, create a 2/2 green Wolf creature token. this.addAbility(new ConditionalTriggeredAbility(new BeginningOfYourEndStepTriggeredAbility(new CreateTokenEffect(new WolfToken()), false), new TransformedCondition(), ruleText)); // At the beginning of each upkeep, if a player cast two or more spells last turn, transform Howlpack Alpha. diff --git a/Mage.Sets/src/mage/cards/h/HuntedDragon.java b/Mage.Sets/src/mage/cards/h/HuntedDragon.java index c4eaa8289f6..08a92628a00 100644 --- a/Mage.Sets/src/mage/cards/h/HuntedDragon.java +++ b/Mage.Sets/src/mage/cards/h/HuntedDragon.java @@ -57,7 +57,7 @@ public class HuntedDragon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); this.addAbility(HasteAbility.getInstance()); - // When Hunted Dragon enters the battlefield, put three 2/2 white Knight creature tokens with first strike onto the battlefield under target opponent's control. + // When Hunted Dragon enters the battlefield, create three 2/2 white Knight creature tokens with first strike under target opponent's control. Ability ability = new EntersBattlefieldTriggeredAbility(new CreateTokenTargetEffect(new KnightToken(), 3), false); Target target = new TargetOpponent(); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/h/HuntedHorror.java b/Mage.Sets/src/mage/cards/h/HuntedHorror.java index 0552ff5bc1a..d9f9826a636 100644 --- a/Mage.Sets/src/mage/cards/h/HuntedHorror.java +++ b/Mage.Sets/src/mage/cards/h/HuntedHorror.java @@ -59,7 +59,7 @@ public class HuntedHorror extends CardImpl { this.toughness = new MageInt(7); this.addAbility(TrampleAbility.getInstance()); - // When Hunted Horror enters the battlefield, put two 3/3 green Centaur creature tokens with protection from black onto the battlefield under target opponent's control. + // When Hunted Horror enters the battlefield, create two 3/3 green Centaur creature tokens with protection from black under target opponent's control. Ability ability = new EntersBattlefieldTriggeredAbility(new CreateTokenTargetEffect(new CentaurToken(), 2), false); Target target = new TargetOpponent(); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/h/HuntedLammasu.java b/Mage.Sets/src/mage/cards/h/HuntedLammasu.java index 02443266f09..755b8160ecd 100644 --- a/Mage.Sets/src/mage/cards/h/HuntedLammasu.java +++ b/Mage.Sets/src/mage/cards/h/HuntedLammasu.java @@ -54,7 +54,7 @@ public class HuntedLammasu extends CardImpl { this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); - // When Hunted Lammasu enters the battlefield, put a 4/4 black Horror creature token onto the battlefield under target opponent's control. + // When Hunted Lammasu enters the battlefield, create a 4/4 black Horror creature token under target opponent's control. Ability ability = new EntersBattlefieldTriggeredAbility(new CreateTokenTargetEffect(new HorrorToken()), false); Target target = new TargetOpponent(); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/h/HuntedPhantasm.java b/Mage.Sets/src/mage/cards/h/HuntedPhantasm.java index 074da3f57d6..b67a4765bd7 100644 --- a/Mage.Sets/src/mage/cards/h/HuntedPhantasm.java +++ b/Mage.Sets/src/mage/cards/h/HuntedPhantasm.java @@ -55,7 +55,7 @@ public class HuntedPhantasm extends CardImpl { // Hunted Phantasm can't be blocked. this.addAbility(new CantBeBlockedSourceAbility()); - // When Hunted Phantasm enters the battlefield, put five 1/1 red Goblin creature tokens onto the battlefield under target opponent's control. + // When Hunted Phantasm enters the battlefield, create five 1/1 red Goblin creature tokens under target opponent's control. Ability ability = new EntersBattlefieldTriggeredAbility(new CreateTokenTargetEffect(new GoblinToken(), 5), false); Target target = new TargetOpponent(); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/h/HuntedTroll.java b/Mage.Sets/src/mage/cards/h/HuntedTroll.java index f0b44048ab5..7019957aa15 100644 --- a/Mage.Sets/src/mage/cards/h/HuntedTroll.java +++ b/Mage.Sets/src/mage/cards/h/HuntedTroll.java @@ -60,7 +60,7 @@ public class HuntedTroll extends CardImpl { this.power = new MageInt(8); this.toughness = new MageInt(4); - // When Hunted Troll enters the battlefield, put four 1/1 blue Faerie creature tokens with flying onto the battlefield under target opponent's control. + // When Hunted Troll enters the battlefield, create four 1/1 blue Faerie creature tokens with flying under target opponent's control. Ability ability = new EntersBattlefieldTriggeredAbility(new CreateTokenTargetEffect(new FaerieToken(), 4), false); Target target = new TargetOpponent(); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/h/HuntingPack.java b/Mage.Sets/src/mage/cards/h/HuntingPack.java index d5e62c2290e..96919cad861 100644 --- a/Mage.Sets/src/mage/cards/h/HuntingPack.java +++ b/Mage.Sets/src/mage/cards/h/HuntingPack.java @@ -44,7 +44,7 @@ public class HuntingPack extends CardImpl { public HuntingPack(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{5}{G}{G}"); - // Put a 4/4 green Beast creature token onto the battlefield. + // Create a 4/4 green Beast creature token. this.getSpellAbility().addEffect(new CreateTokenEffect(new BeastToken2(), 1)); // Storm this.addAbility(new StormAbility()); diff --git a/Mage.Sets/src/mage/cards/h/HuntmasterOfTheFells.java b/Mage.Sets/src/mage/cards/h/HuntmasterOfTheFells.java index 4ca7014ad56..f9a81f12340 100644 --- a/Mage.Sets/src/mage/cards/h/HuntmasterOfTheFells.java +++ b/Mage.Sets/src/mage/cards/h/HuntmasterOfTheFells.java @@ -64,7 +64,7 @@ public class HuntmasterOfTheFells extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // Whenever this creature enters the battlefield or transforms into Huntmaster of the Fells, put a 2/2 green Wolf creature token onto the battlefield and you gain 2 life. + // Whenever this creature enters the battlefield or transforms into Huntmaster of the Fells, create a 2/2 green Wolf creature token and you gain 2 life. this.addAbility(new HuntmasterOfTheFellsAbility()); // At the beginning of each upkeep, if no spells were cast last turn, transform Huntmaster of the Fells. @@ -120,6 +120,6 @@ class HuntmasterOfTheFellsAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever this creature enters the battlefield or transforms into {this}, put a 2/2 green Wolf creature token onto the battlefield and you gain 2 life."; + return "Whenever this creature enters the battlefield or transforms into {this}, create a 2/2 green Wolf creature token and you gain 2 life."; } } diff --git a/Mage.Sets/src/mage/cards/h/HydraBroodmaster.java b/Mage.Sets/src/mage/cards/h/HydraBroodmaster.java index 344d30548b8..4be46ae48ea 100644 --- a/Mage.Sets/src/mage/cards/h/HydraBroodmaster.java +++ b/Mage.Sets/src/mage/cards/h/HydraBroodmaster.java @@ -57,7 +57,7 @@ public class HydraBroodmaster extends CardImpl { // {X}{X}{G}: Monstrosity X this.addAbility(new MonstrosityAbility("{X}{X}{G}", Integer.MAX_VALUE)); - // When Hydra Broodmaster becomes monstrous, put X X/X green Hydra creature tokens onto the battlefield. + // When Hydra Broodmaster becomes monstrous, create X X/X green Hydra creature tokens. this.addAbility(new BecomesMonstrousSourceTriggeredAbility(new HydraBroodmasterEffect())); } @@ -75,7 +75,7 @@ class HydraBroodmasterEffect extends OneShotEffect { public HydraBroodmasterEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "put X X/X green Hydra creature tokens onto the battlefield"; + this.staticText = "create X X/X green Hydra creature tokens"; } public HydraBroodmasterEffect(final HydraBroodmasterEffect effect) { diff --git a/Mage.Sets/src/mage/cards/i/IbHalfheartGoblinTactician.java b/Mage.Sets/src/mage/cards/i/IbHalfheartGoblinTactician.java index 40c3f933210..69c81978910 100644 --- a/Mage.Sets/src/mage/cards/i/IbHalfheartGoblinTactician.java +++ b/Mage.Sets/src/mage/cards/i/IbHalfheartGoblinTactician.java @@ -82,7 +82,7 @@ public class IbHalfheartGoblinTactician extends CardImpl { // Whenever another Goblin you control becomes blocked, sacrifice it. If you do, it deals 4 damage to each creature blocking it. this.addAbility(new BecomesBlockedAllTriggeredAbility(new IbHalfheartGoblinTacticianEffect(), false, filterGoblin, true)); - // Sacrifice two Mountains: Put two 1/1 red Goblin creature tokens onto the battlefield. + // Sacrifice two Mountains: Create two 1/1 red Goblin creature tokens. this.addAbility(new SimpleActivatedAbility( Zone.BATTLEFIELD, new CreateTokenEffect(new GoblinToken(), 2), diff --git a/Mage.Sets/src/mage/cards/i/IcatianCrier.java b/Mage.Sets/src/mage/cards/i/IcatianCrier.java index 6fc68e75223..c156e6b7f97 100644 --- a/Mage.Sets/src/mage/cards/i/IcatianCrier.java +++ b/Mage.Sets/src/mage/cards/i/IcatianCrier.java @@ -54,7 +54,7 @@ public class IcatianCrier extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // {1}{W}, {tap}, Discard a card: Put two 1/1 white Citizen creature tokens onto the battlefield. + // {1}{W}, {tap}, Discard a card: Create two 1/1 white Citizen creature tokens. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CitizenToken(), 2), new ManaCostsImpl("{1}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); diff --git a/Mage.Sets/src/mage/cards/i/IcatianTown.java b/Mage.Sets/src/mage/cards/i/IcatianTown.java index c42b97da7fe..2c1b9a24c98 100644 --- a/Mage.Sets/src/mage/cards/i/IcatianTown.java +++ b/Mage.Sets/src/mage/cards/i/IcatianTown.java @@ -44,7 +44,7 @@ public class IcatianTown extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{5}{W}"); - // Put four 1/1 white Citizen creature tokens onto the battlefield. + // Create four 1/1 white Citizen creature tokens. this.getSpellAbility().addEffect(new CreateTokenEffect(new CitizenToken(), 4)); } diff --git a/Mage.Sets/src/mage/cards/i/IncreasingDevotion.java b/Mage.Sets/src/mage/cards/i/IncreasingDevotion.java index 20b535c7e7a..ca84f45c3fb 100644 --- a/Mage.Sets/src/mage/cards/i/IncreasingDevotion.java +++ b/Mage.Sets/src/mage/cards/i/IncreasingDevotion.java @@ -49,9 +49,9 @@ import mage.game.stack.Spell; public class IncreasingDevotion extends CardImpl { public IncreasingDevotion(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{W}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{W}{W}"); - // Put five 1/1 white Human creature tokens onto the battlefield. If Increasing Devotion was cast from a graveyard, put ten of those tokens onto the battlefield instead. + // Create five 1/1 white Human creature tokens. If Increasing Devotion was cast from a graveyard, create ten of those tokens instead. this.getSpellAbility().addEffect(new IncreasingDevotionEffect()); // Flashback {7}{W}{W} @@ -74,7 +74,7 @@ class IncreasingDevotionEffect extends OneShotEffect { public IncreasingDevotionEffect() { super(Outcome.PutCreatureInPlay); - staticText = "Put five 1/1 white Human creature tokens onto the battlefield. If Increasing Devotion was cast from a graveyard, put ten of those tokens onto the battlefield instead"; + staticText = "Create five 1/1 white Human creature tokens. If {this} was cast from a graveyard, create ten of those tokens instead"; } public IncreasingDevotionEffect(final IncreasingDevotionEffect effect) { diff --git a/Mage.Sets/src/mage/cards/i/IncubatorDrone.java b/Mage.Sets/src/mage/cards/i/IncubatorDrone.java index 57fe4d94e42..8d18e1abcce 100644 --- a/Mage.Sets/src/mage/cards/i/IncubatorDrone.java +++ b/Mage.Sets/src/mage/cards/i/IncubatorDrone.java @@ -54,9 +54,9 @@ public class IncubatorDrone extends CardImpl { // Devoid this.addAbility(new DevoidAbility(this.color)); - // Whenever Incubator Drone enters the battlefield, put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has "Sacrifice this creature: Add {C} to your mana pool." + // Whenever Incubator Drone enters the battlefield, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool." Effect effect = new CreateTokenEffect(new EldraziScionToken()); - effect.setText("put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has \"Sacrifice this creature: Add {C} to your mana pool.\""); + effect.setText("create a 1/1 colorless Eldrazi Scion creature token. It has \"Sacrifice this creature: Add {C} to your mana pool.\""); this.addAbility(new EntersBattlefieldTriggeredAbility(effect, false)); } diff --git a/Mage.Sets/src/mage/cards/i/InexorableBlob.java b/Mage.Sets/src/mage/cards/i/InexorableBlob.java index 599d96ff97b..b17f1f67da3 100644 --- a/Mage.Sets/src/mage/cards/i/InexorableBlob.java +++ b/Mage.Sets/src/mage/cards/i/InexorableBlob.java @@ -51,11 +51,11 @@ public class InexorableBlob extends CardImpl { this.toughness = new MageInt(3); // Delirium — Whenever Inexorable Blob attacks and there are at least four card types among cards in your graveyard, - // put a 3/3 green Ooze creature token onto the battlefield tapped and attacking. + // create a 3/3 green Ooze creature token tapped and attacking. this.addAbility(new ConditionalTriggeredAbility(new AttacksTriggeredAbility(new CreateTokenEffect(new OozeToken(3, 3), 1, true, true), false), DeliriumCondition.getInstance(), "Delirium — Whenever {this} attacks and there are at least four card types among cards in your graveyard, " - + "put a 3/3 green Ooze creature token onto the battlefield tapped and attacking.")); + + "create a 3/3 green Ooze creature token tapped and attacking.")); } public InexorableBlob(final InexorableBlob card) { diff --git a/Mage.Sets/src/mage/cards/i/InfernalGenesis.java b/Mage.Sets/src/mage/cards/i/InfernalGenesis.java index f7bd6f732cd..dcad9a7b301 100644 --- a/Mage.Sets/src/mage/cards/i/InfernalGenesis.java +++ b/Mage.Sets/src/mage/cards/i/InfernalGenesis.java @@ -50,7 +50,7 @@ public class InfernalGenesis extends CardImpl { public InfernalGenesis(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{4}{B}{B}"); - // At the beginning of each player's upkeep, that player puts the top card of his or her library into his or her graveyard. Then he or she puts X 1/1 black Minion creature tokens onto the battlefield, where X is that card's converted mana cost. + // At the beginning of each player's upkeep, that player puts the top card of his or her library into his or her graveyard. Then he or she creates X 1/1 black Minion creature tokens, where X is that card's converted mana cost. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new InfernalGenesisEffect(), TargetController.ANY, false)); } @@ -68,7 +68,7 @@ class InfernalGenesisEffect extends OneShotEffect { InfernalGenesisEffect() { super(Outcome.PutCreatureInPlay); - staticText = "that player puts the top card of his or her library into his or her graveyard. Then he or she puts X 1/1 black Minion creature tokens onto the battlefield, where X is that card's converted mana cost"; + staticText = "that player puts the top card of his or her library into his or her graveyard. Then he or she creates X 1/1 black Minion creature tokens, where X is that card's converted mana cost"; } InfernalGenesisEffect(final InfernalGenesisEffect effect) { diff --git a/Mage.Sets/src/mage/cards/i/InvocationOfSaintTraft.java b/Mage.Sets/src/mage/cards/i/InvocationOfSaintTraft.java index 14b32c91bdd..ceceff93e75 100644 --- a/Mage.Sets/src/mage/cards/i/InvocationOfSaintTraft.java +++ b/Mage.Sets/src/mage/cards/i/InvocationOfSaintTraft.java @@ -68,7 +68,7 @@ public class InvocationOfSaintTraft extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // Enchanted creature has "Whenever this creature attacks, put a 4/4 white Angel creature token with flying onto the battlefield tapped + // Enchanted creature has "Whenever this creature attacks, create a 4/4 white Angel creature token with flying tapped // and attacking. Exile that token at end of combat." Ability gainedAbility = new AttacksTriggeredAbility(new InvocationOfSaintTraftEffect(), false); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); @@ -88,7 +88,7 @@ class InvocationOfSaintTraftEffect extends OneShotEffect { InvocationOfSaintTraftEffect() { super(Outcome.PutCreatureInPlay); - staticText = "put a 4/4 white Angel creature token with flying onto the battlefield tapped and attacking. Exile that token at end of combat"; + staticText = "create a 4/4 white Angel creature token with flying tapped and attacking. Exile that token at end of combat"; } InvocationOfSaintTraftEffect(final InvocationOfSaintTraftEffect effect) { diff --git a/Mage.Sets/src/mage/cards/i/IshkanahGrafwidow.java b/Mage.Sets/src/mage/cards/i/IshkanahGrafwidow.java index 6a8cc3f6edc..244d68f93f3 100644 --- a/Mage.Sets/src/mage/cards/i/IshkanahGrafwidow.java +++ b/Mage.Sets/src/mage/cards/i/IshkanahGrafwidow.java @@ -71,12 +71,12 @@ public class IshkanahGrafwidow extends CardImpl { this.addAbility(ReachAbility.getInstance()); // Delirium &mdash When Ishkanah, Grafwidow enters the battlefield, if there are four or more card types among cards in your graveyard, - // put three 1/2 green Spider creature tokens with reach onto the battlefield. + // create three 1/2 green Spider creature tokens with reach. Ability ability = new ConditionalTriggeredAbility( new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new SpiderToken(), 3), false), new DeliriumCondition(), "Delirium — When {this} enters the battlefield, if there are four or more card types among cards in your graveyard, " - + "put three 1/2 green Spider creature tokens with reach onto the battlefield."); + + "create three 1/2 green Spider creature tokens with reach."); this.addAbility(ability); // {5}{B}: Target opponent loses 1 life for each Spider you control. diff --git a/Mage.Sets/src/mage/cards/i/ItOfTheHorridSwarm.java b/Mage.Sets/src/mage/cards/i/ItOfTheHorridSwarm.java index 15b2489f46e..4a565c8133c 100644 --- a/Mage.Sets/src/mage/cards/i/ItOfTheHorridSwarm.java +++ b/Mage.Sets/src/mage/cards/i/ItOfTheHorridSwarm.java @@ -54,7 +54,7 @@ public class ItOfTheHorridSwarm extends CardImpl { // Emerge {6}{G} this.addAbility(new EmergeAbility(this, new ManaCostsImpl<>("{6}{G}"))); - // When you cast It of the Horrid Swarm, put two 1/1 green Insect creature tokens onto the battlefield. + // When you cast It of the Horrid Swarm, create two 1/1 green Insect creature tokens. this.addAbility(new CastSourceTriggeredAbility(new CreateTokenEffect(new InsectToken(), 2))); } diff --git a/Mage.Sets/src/mage/cards/j/JeditOjanenOfEfrava.java b/Mage.Sets/src/mage/cards/j/JeditOjanenOfEfrava.java index 3c91a3eec27..17b5a080c14 100644 --- a/Mage.Sets/src/mage/cards/j/JeditOjanenOfEfrava.java +++ b/Mage.Sets/src/mage/cards/j/JeditOjanenOfEfrava.java @@ -54,7 +54,7 @@ public class JeditOjanenOfEfrava extends CardImpl { // Forestwalk this.addAbility(new ForestwalkAbility()); - // Whenever Jedit Ojanen of Efrava attacks or blocks, put a 2/2 green Cat Warrior creature token with forestwalk onto the battlefield. + // Whenever Jedit Ojanen of Efrava attacks or blocks, create a 2/2 green Cat Warrior creature token with forestwalk. this.addAbility(new AttacksOrBlocksTriggeredAbility(new CreateTokenEffect(new CatWarriorToken()), false)); } diff --git a/Mage.Sets/src/mage/cards/j/JoinTheRanks.java b/Mage.Sets/src/mage/cards/j/JoinTheRanks.java index 5cad2e1d4d5..c08e0edf9fa 100644 --- a/Mage.Sets/src/mage/cards/j/JoinTheRanks.java +++ b/Mage.Sets/src/mage/cards/j/JoinTheRanks.java @@ -46,7 +46,7 @@ public class JoinTheRanks extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{W}"); this.color.setWhite(true); - // Put two 1/1 white Soldier Ally creature tokens onto the battlefield. + // Create two 1/1 white Soldier Ally creature tokens. this.getSpellAbility().addEffect(new CreateTokenEffect(new JoinTheRanksSoldierToken(), 2)); } diff --git a/Mage.Sets/src/mage/cards/j/JunglePatrol.java b/Mage.Sets/src/mage/cards/j/JunglePatrol.java index 93f41c3dc0d..e86be6174d5 100644 --- a/Mage.Sets/src/mage/cards/j/JunglePatrol.java +++ b/Mage.Sets/src/mage/cards/j/JunglePatrol.java @@ -53,28 +53,28 @@ import mage.target.common.TargetControlledPermanent; * @author fireshoes */ public class JunglePatrol extends CardImpl { - - private static final FilterControlledPermanent filter = new FilterControlledPermanent("a token named Wood"); - + + private static final FilterControlledPermanent filter = new FilterControlledPermanent("a token named Wood"); + static { filter.add(new NamePredicate("Wood")); filter.add(new TokenPredicate()); } public JunglePatrol(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{G}"); this.subtype.add("Human"); this.subtype.add("Soldier"); this.power = new MageInt(3); this.toughness = new MageInt(2); - // {1}{G}, {tap}: Put a 0/1 green Wall creature token with defender named Wood onto the battlefield. + // {1}{G}, {tap}: Create a 0/1 green Wall creature token with defender named Wood. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new WoodToken()), new ManaCostsImpl("{1}{G}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); - + // Sacrifice a token named Wood: Add {R} to your mana pool. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BasicManaEffect(Mana.RedMana(1)), new SacrificeTargetCost(new TargetControlledPermanent(1, 1, filter, true)))); } @@ -102,4 +102,4 @@ class WoodToken extends Token { this.addAbility(DefenderAbility.getInstance()); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/k/KalitasBloodchiefOfGhet.java b/Mage.Sets/src/mage/cards/k/KalitasBloodchiefOfGhet.java index 9815de0f2ff..30fd18f176c 100644 --- a/Mage.Sets/src/mage/cards/k/KalitasBloodchiefOfGhet.java +++ b/Mage.Sets/src/mage/cards/k/KalitasBloodchiefOfGhet.java @@ -57,7 +57,7 @@ public class KalitasBloodchiefOfGhet extends CardImpl { this.subtype.add("Vampire"); this.subtype.add("Warrior"); - // {B}{B}{B}, {T}: Destroy target creature. If that creature dies this way, put a black Vampire creature token onto the battlefield. Its power is equal to that creature's power and its toughness is equal to that creature's toughness. + // {B}{B}{B}, {T}: Destroy target creature. If that creature dies this way, create a black Vampire creature token. Its power is equal to that creature's power and its toughness is equal to that creature's toughness. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new KalitasDestroyEffect(), new ManaCostsImpl("{B}{B}{B}")); ability.addCost(new TapSourceCost()); this.power = new MageInt(5); @@ -80,7 +80,7 @@ class KalitasDestroyEffect extends OneShotEffect { public KalitasDestroyEffect() { super(Outcome.DestroyPermanent); - this.staticText = "Destroy target creature. If that creature dies this way, put a black Vampire creature token onto the battlefield. Its power is equal to that creature's power and its toughness is equal to that creature's toughness"; + this.staticText = "Destroy target creature. If that creature dies this way, create a black Vampire creature token. Its power is equal to that creature's power and its toughness is equal to that creature's toughness"; } public KalitasDestroyEffect(final KalitasDestroyEffect effect) { diff --git a/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java b/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java index d2e6d0c626e..4c1e8100053 100644 --- a/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java +++ b/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java @@ -83,7 +83,7 @@ public class KalitasTraitorOfGhet extends CardImpl { // Lifelink this.addAbility(LifelinkAbility.getInstance()); - // If a nontoken creature an opponent controls would die, instead exile that card and put a 2/2 black Zombie creature token onto the battlefield. + // If a nontoken creature an opponent controls would die, instead exile that card and create a 2/2 black Zombie creature token. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KalitasTraitorOfGhetEffect())); // {2}{B}, Sacrifice another Vampire or Zombie: Put two +1/+1 counters on Kalitas, Traitor of Ghet. @@ -106,7 +106,7 @@ class KalitasTraitorOfGhetEffect extends ReplacementEffectImpl { public KalitasTraitorOfGhetEffect() { super(Duration.WhileOnBattlefield, Outcome.Benefit); - staticText = "If a nontoken creature an opponent controls would die, instead exile that card and put a 2/2 black Zombie creature token onto the battlefield"; + staticText = "If a nontoken creature an opponent controls would die, instead exile that card and create a 2/2 black Zombie creature token"; } public KalitasTraitorOfGhetEffect(final KalitasTraitorOfGhetEffect effect) { diff --git a/Mage.Sets/src/mage/cards/k/KalonianTwingrove.java b/Mage.Sets/src/mage/cards/k/KalonianTwingrove.java index dd03ebc8de3..471eca9c069 100644 --- a/Mage.Sets/src/mage/cards/k/KalonianTwingrove.java +++ b/Mage.Sets/src/mage/cards/k/KalonianTwingrove.java @@ -68,9 +68,9 @@ public class KalonianTwingrove extends CardImpl { // Kalonian Twingrove's power and toughness are each equal to the number of Forests you control. this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filterLands), Duration.EndOfGame))); - // When Kalonian Twingrove enters the battlefield, put a green Treefolk Warrior creature token onto the battlefield with "This creature's power and toughness are each equal to the number of Forests you control." + // When Kalonian Twingrove enters the battlefield, create a green Treefolk Warrior creature token with "This creature's power and toughness are each equal to the number of Forests you control." Effect effect = new CreateTokenEffect(new KalonianTwingroveTreefolkWarriorToken()); - effect.setText("put a green Treefolk Warrior creature token onto the battlefield with \"This creature's power and toughness are each equal to the number of Forests you control.\""); + effect.setText("create a green Treefolk Warrior creature token with \"This creature's power and toughness are each equal to the number of Forests you control.\""); this.addAbility(new EntersBattlefieldTriggeredAbility(effect,false)); } @@ -87,7 +87,7 @@ public class KalonianTwingrove extends CardImpl { class KalonianTwingroveTreefolkWarriorToken extends Token { public KalonianTwingroveTreefolkWarriorToken() { - super("Treefolk Warrior", "green Treefolk Warrior creature token onto the battlefield with \"This creature's power and toughness are each equal to the number of Forests you control.\""); + super("Treefolk Warrior", "green Treefolk Warrior creature token with \"This creature's power and toughness are each equal to the number of Forests you control.\""); this.setOriginalExpansionSetCode("M15"); cardType.add(CardType.CREATURE); color.setGreen(true); diff --git a/Mage.Sets/src/mage/cards/k/KaminoCloningFacility.java b/Mage.Sets/src/mage/cards/k/KaminoCloningFacility.java index dbadf2277d6..568ef385e05 100644 --- a/Mage.Sets/src/mage/cards/k/KaminoCloningFacility.java +++ b/Mage.Sets/src/mage/cards/k/KaminoCloningFacility.java @@ -65,7 +65,7 @@ public class KaminoCloningFacility extends CardImpl { // {T} Add one mana of any color to your mana pool. Spend this mana only to cast a Trooper spell. this.addAbility(new ConditionalAnyColorManaAbility(new TapSourceCost(), 1, new ConditionalSpellManaBuilder(FILTER), true)); - // {5}, {T}: Put a 1/1 white Trooper creature tokens onto the battlefield. + // {5}, {T}: Create a 1/1 white Trooper creature tokens. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new TrooperToken(), 1), new ManaCostsImpl("{5}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KathariBomber.java b/Mage.Sets/src/mage/cards/k/KathariBomber.java index c30b61063d7..2409e7dc1e1 100644 --- a/Mage.Sets/src/mage/cards/k/KathariBomber.java +++ b/Mage.Sets/src/mage/cards/k/KathariBomber.java @@ -59,7 +59,7 @@ public class KathariBomber extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // When Kathari Bomber deals combat damage to a player, put two 1/1 red Goblin creature tokens onto the battlefield and sacrifice Kathari Bomber. + // When Kathari Bomber deals combat damage to a player, create two 1/1 red Goblin creature tokens and sacrifice Kathari Bomber. Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new CreateTokenEffect(new GoblinToken(), 2), false); ability.addEffect(new SacrificeSourceEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KazuulTyrantOfTheCliffs.java b/Mage.Sets/src/mage/cards/k/KazuulTyrantOfTheCliffs.java index 6797d4306fa..1e5a4379d02 100644 --- a/Mage.Sets/src/mage/cards/k/KazuulTyrantOfTheCliffs.java +++ b/Mage.Sets/src/mage/cards/k/KazuulTyrantOfTheCliffs.java @@ -62,7 +62,7 @@ public class KazuulTyrantOfTheCliffs extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(4); - // Whenever a creature an opponent controls attacks, if you're the defending player, put a 3/3 red Ogre creature token onto the battlefield unless that creature's controller pays {3}. + // Whenever a creature an opponent controls attacks, if you're the defending player, create a 3/3 red Ogre creature token unless that creature's controller pays {3}. this.addAbility(new KazuulTyrantOfTheCliffsTriggeredAbility()); } @@ -110,7 +110,7 @@ class KazuulTyrantOfTheCliffsTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever a creature an opponent controls attacks, if you're the defending player, put a 3/3 red Ogre creature token onto the battlefield unless that creature's controller pays {3}"; + return "Whenever a creature an opponent controls attacks, if you're the defending player, create a 3/3 red Ogre creature token unless that creature's controller pays {3}"; } } diff --git a/Mage.Sets/src/mage/cards/k/KessigCagebreakers.java b/Mage.Sets/src/mage/cards/k/KessigCagebreakers.java index 132e6eade35..c65e9a51861 100644 --- a/Mage.Sets/src/mage/cards/k/KessigCagebreakers.java +++ b/Mage.Sets/src/mage/cards/k/KessigCagebreakers.java @@ -55,7 +55,7 @@ public class KessigCagebreakers extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(4); - // Whenever Kessig Cagebreakers attacks, put a 2/2 green Wolf creature token onto the battlefield tapped and attacking for each creature card in your graveyard. + // Whenever Kessig Cagebreakers attacks, create a 2/2 green Wolf creature token tapped and attacking for each creature card in your graveyard. this.addAbility(new AttacksTriggeredAbility(new KessigCagebreakersEffect(), false)); } @@ -73,7 +73,7 @@ class KessigCagebreakersEffect extends OneShotEffect { public KessigCagebreakersEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "put a 2/2 green Wolf creature token onto the battlefield tapped and attacking for each creature card in your graveyard"; + this.staticText = "create a 2/2 green Wolf creature token tapped and attacking for each creature card in your graveyard"; } public KessigCagebreakersEffect(final KessigCagebreakersEffect effect) { diff --git a/Mage.Sets/src/mage/cards/k/KherKeep.java b/Mage.Sets/src/mage/cards/k/KherKeep.java index eff01addf40..f4a96e92412 100644 --- a/Mage.Sets/src/mage/cards/k/KherKeep.java +++ b/Mage.Sets/src/mage/cards/k/KherKeep.java @@ -48,12 +48,12 @@ import mage.game.permanent.token.Token; public class KherKeep extends CardImpl { public KherKeep(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.LAND},""); + super(ownerId, setInfo, new CardType[]{CardType.LAND}, ""); this.supertype.add("Legendary"); // {tap}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); - // {1}{R}, {tap}: Put a 0/1 red Kobold creature token named Kobolds of Kher Keep onto the battlefield. + // {1}{R}, {tap}: Create a 0/1 red Kobold creature token named Kobolds of Kher Keep. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new KherKeepKoboldToken()), new ManaCostsImpl("{1}{R}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KikiJikiMirrorBreaker.java b/Mage.Sets/src/mage/cards/k/KikiJikiMirrorBreaker.java index b925c9cbb9a..74aec5ab29d 100644 --- a/Mage.Sets/src/mage/cards/k/KikiJikiMirrorBreaker.java +++ b/Mage.Sets/src/mage/cards/k/KikiJikiMirrorBreaker.java @@ -63,7 +63,7 @@ public class KikiJikiMirrorBreaker extends CardImpl { } public KikiJikiMirrorBreaker(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}{R}{R}"); this.supertype.add("Legendary"); this.subtype.add("Goblin"); this.subtype.add("Shaman"); @@ -73,7 +73,7 @@ public class KikiJikiMirrorBreaker extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); - // {tap}: Put a token that's a copy of target nonlegendary creature you control onto the battlefield. That token has haste. Sacrifice it at the beginning of the next end step. + // {tap}: Create a token that's a copy of target nonlegendary creature you control . That token has haste. Sacrifice it at the beginning of the next end step. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new KikiJikiMirrorBreakerEffect(), new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent(1, 1, filter, false)); this.addAbility(ability); @@ -94,7 +94,7 @@ class KikiJikiMirrorBreakerEffect extends OneShotEffect { public KikiJikiMirrorBreakerEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Put a token that's a copy of target nonlegendary creature you control onto the battlefield. That token has haste. Sacrifice it at the beginning of the next end step"; + this.staticText = "Create a token that's a copy of target nonlegendary creature you control. That token has haste. Sacrifice it at the beginning of the next end step"; } public KikiJikiMirrorBreakerEffect(final KikiJikiMirrorBreakerEffect effect) { diff --git a/Mage.Sets/src/mage/cards/k/KinTreeInvocation.java b/Mage.Sets/src/mage/cards/k/KinTreeInvocation.java index 3b87a081a42..d08c7894044 100644 --- a/Mage.Sets/src/mage/cards/k/KinTreeInvocation.java +++ b/Mage.Sets/src/mage/cards/k/KinTreeInvocation.java @@ -52,7 +52,7 @@ public class KinTreeInvocation extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{B}{G}"); - // Put an X/X black and green Spirit Warrior creature token onto the battlefield, where X is the greatest toughness among creatures you control. + // Create an X/X black and green Spirit Warrior creature token, where X is the greatest toughness among creatures you control. this.getSpellAbility().addEffect(new KinTreeInvocationCreateTokenEffect()); } @@ -71,7 +71,7 @@ class KinTreeInvocationCreateTokenEffect extends OneShotEffect { public KinTreeInvocationCreateTokenEffect() { super(Outcome.PutCreatureInPlay); - staticText = "Put an X/X black and green Spirit Warrior creature token onto the battlefield, where X is the greatest toughness among creatures you control"; + staticText = "Create an X/X black and green Spirit Warrior creature token, where X is the greatest toughness among creatures you control"; } public KinTreeInvocationCreateTokenEffect(final KinTreeInvocationCreateTokenEffect effect) { @@ -98,7 +98,7 @@ class KinTreeInvocationCreateTokenEffect extends OneShotEffect { ObjectColor objectColor = new ObjectColor(); objectColor.setBlack(true); objectColor.setGreen(true); - Token token = new Token("Spirit Warrior", "X/X black and green Spirit Warrior creature token onto the battlefield, where X is the greatest toughness among creatures you control", + Token token = new Token("Spirit Warrior", "X/X black and green Spirit Warrior creature token, where X is the greatest toughness among creatures you control", objectColor, list, value, value, new AbilitiesImpl<>()); token.getAbilities().newId(); // neccessary if token has ability like DevourAbility() token.putOntoBattlefield(1, game, source.getSourceId(), source.getControllerId()); diff --git a/Mage.Sets/src/mage/cards/k/KingMacarTheGoldCursed.java b/Mage.Sets/src/mage/cards/k/KingMacarTheGoldCursed.java index b00bc374399..eeaf04e813c 100644 --- a/Mage.Sets/src/mage/cards/k/KingMacarTheGoldCursed.java +++ b/Mage.Sets/src/mage/cards/k/KingMacarTheGoldCursed.java @@ -40,8 +40,6 @@ import mage.constants.CardType; import mage.game.permanent.token.GoldToken; import mage.target.common.TargetCreaturePermanent; - - /** * * @author LevelX2 @@ -49,20 +47,20 @@ import mage.target.common.TargetCreaturePermanent; public class KingMacarTheGoldCursed extends CardImpl { public KingMacarTheGoldCursed(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}{B}"); this.supertype.add("Legendary"); this.subtype.add("Human"); this.power = new MageInt(2); this.toughness = new MageInt(3); - // Inspired - Whenever King Macar, the Gold-Cursed becomes untapped, you may exile target creature. If you do, put a colorless artifact token named Gold onto the battlefield. It has "Sacrifice this artifact: Add one mana of any color to your mana pool." + // Inspired - Whenever King Macar, the Gold-Cursed becomes untapped, you may exile target creature. If you do, create a colorless artifact token named Gold. It has "Sacrifice this artifact: Add one mana of any color to your mana pool." Ability ability = new InspiredAbility(new ExileTargetEffect(), true); ability.addTarget(new TargetCreaturePermanent()); Effect effect = new CreateTokenEffect(new GoldToken()); - effect.setText("If you do, put a colorless artifact token named Gold onto the battlefield. It has \"Sacrifice this artifact: Add one mana of any color to your mana pool.\""); - ability.addEffect(effect); - this.addAbility(ability); + effect.setText("If you do, create a colorless artifact token named Gold. It has \"Sacrifice this artifact: Add one mana of any color to your mana pool.\""); + ability.addEffect(effect); + this.addAbility(ability); } public KingMacarTheGoldCursed(final KingMacarTheGoldCursed card) { @@ -79,7 +77,7 @@ public class KingMacarTheGoldCursed extends CardImpl { //class GoldToken extends Token { // // public GoldToken() { -// super("Gold", "colorless artifact token named Gold onto the battlefield. It has \"Sacrifice this artifact: Add one mana of any color to your mana pool.\""); +// super("Gold", "colorless artifact token named Gold. It has \"Sacrifice this artifact: Add one mana of any color to your mana pool.\""); // this.setOriginalExpansionSetCode("BNG"); // cardType.add(CardType.ARTIFACT); // subtype.add("Gold"); @@ -88,4 +86,4 @@ public class KingMacarTheGoldCursed extends CardImpl { // ability.addChoice(new ChoiceColor()); // this.addAbility(ability); // } -//} \ No newline at end of file +//} diff --git a/Mage.Sets/src/mage/cards/k/KinsbaileBorderguard.java b/Mage.Sets/src/mage/cards/k/KinsbaileBorderguard.java index 397ebe34bc8..ac3cdac14cb 100644 --- a/Mage.Sets/src/mage/cards/k/KinsbaileBorderguard.java +++ b/Mage.Sets/src/mage/cards/k/KinsbaileBorderguard.java @@ -70,7 +70,7 @@ public class KinsbaileBorderguard extends CardImpl { // Kinsbaile Borderguard enters the battlefield with a +1/+1 counter on it for each other Kithkin you control. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(0), new PermanentsOnBattlefieldCount(filter), true), "with a +1/+1 counter on it for each other Kithkin you control")); - // When Kinsbaile Borderguard dies, put a 1/1 white Kithkin Soldier creature token onto the battlefield for each counter on it. + // When Kinsbaile Borderguard dies, create a 1/1 white Kithkin Soldier creature token for each counter on it. this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new KithkinToken(), new AllCountersCount()))); } diff --git a/Mage.Sets/src/mage/cards/k/KioraMasterOfTheDepths.java b/Mage.Sets/src/mage/cards/k/KioraMasterOfTheDepths.java index 0a08bcff4ee..43217f7a055 100644 --- a/Mage.Sets/src/mage/cards/k/KioraMasterOfTheDepths.java +++ b/Mage.Sets/src/mage/cards/k/KioraMasterOfTheDepths.java @@ -81,9 +81,9 @@ public class KioraMasterOfTheDepths extends CardImpl { // -2: Reveal the top four cards of your library. You may put a creature card and/or a land card from among them into your hand. Put the rest into your graveyard. this.addAbility(new LoyaltyAbility(new KioraRevealEffect(), -2)); - // -8: You get an emblem with "Whenever a creature enters the battlefield under your control, you may have it fight target creature." Then put three 8/8 blue Octopus creature tokens onto the battlefield. + // -8: You get an emblem with "Whenever a creature enters the battlefield under your control, you may have it fight target creature." Then create three 8/8 blue Octopus creature tokens. Effect effect = new CreateTokenEffect(new OctopusToken(), 3); - effect.setText("Then put three 8/8 blue Octopus creature tokens onto the battlefield"); + effect.setText("Then create three 8/8 blue Octopus creature tokens"); LoyaltyAbility ability3 = new LoyaltyAbility(new GetEmblemEffect(new KioraMasterOfTheDepthsEmblem()), -8); ability3.addEffect(effect); this.addAbility(ability3); diff --git a/Mage.Sets/src/mage/cards/k/KioraTheCrashingWave.java b/Mage.Sets/src/mage/cards/k/KioraTheCrashingWave.java index 88448952f71..cefdd5ffc43 100644 --- a/Mage.Sets/src/mage/cards/k/KioraTheCrashingWave.java +++ b/Mage.Sets/src/mage/cards/k/KioraTheCrashingWave.java @@ -83,7 +83,7 @@ public class KioraTheCrashingWave extends CardImpl { ability.addEffect(new PlayAdditionalLandsControllerEffect(1, Duration.EndOfTurn)); this.addAbility(ability); - // -5: You get an emblem with "At the beginning of your end step, put a 9/9 blue Kraken creature token onto the battlefield." + // -5: You get an emblem with "At the beginning of your end step, create a 9/9 blue Kraken creature token." this.addAbility(new LoyaltyAbility(new GetEmblemEffect(new KioraEmblem()), -5)); } @@ -158,8 +158,8 @@ class KioraPreventionEffect extends PreventionEffectImpl { } /** - * Emblem: "At the beginning of your end step, put a 9/9 blue Kraken creature - * token onto the battlefield." + * Emblem: "At the beginning of your end step, create a 9/9 blue Kraken creature + * token." */ class KioraEmblem extends Emblem { diff --git a/Mage.Sets/src/mage/cards/k/KirtarsWrath.java b/Mage.Sets/src/mage/cards/k/KirtarsWrath.java index 5d4a9eb9fcf..316dc58934b 100644 --- a/Mage.Sets/src/mage/cards/k/KirtarsWrath.java +++ b/Mage.Sets/src/mage/cards/k/KirtarsWrath.java @@ -53,12 +53,12 @@ public class KirtarsWrath extends CardImpl { // Destroy all creatures. They can't be regenerated. - // Threshold - If seven or more cards are in your graveyard, instead destroy all creatures, then put two 1/1 white Spirit creature tokens with flying onto the battlefield. Creatures destroyed this way can't be regenerated. + // Threshold - If seven or more cards are in your graveyard, instead destroy all creatures, then create two 1/1 white Spirit creature tokens with flying. Creatures destroyed this way can't be regenerated. this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new KirtarsWrathEffect(), new DestroyAllEffect(new FilterCreaturePermanent("all creatures"), true), new CardsInControllerGraveCondition(7), - "Destroy all creatures. They can't be regenerated.

Threshold - If seven or more cards are in your graveyard, instead destroy all creatures, then put two 1/1 white Spirit creature tokens with flying onto the battlefield. Creatures destroyed this way can't be regenerated")); + "Destroy all creatures. They can't be regenerated.

Threshold - If seven or more cards are in your graveyard, instead destroy all creatures, then create two 1/1 white Spirit creature tokens with flying. Creatures destroyed this way can't be regenerated")); } @@ -76,7 +76,7 @@ class KirtarsWrathEffect extends OneShotEffect { public KirtarsWrathEffect() { super(Outcome.DestroyPermanent); - this.staticText = "destroy all creatures, then put two 1/1 white Spirit creature tokens with flying onto the battlefield. Creatures destroyed this way can't be regenerated"; + this.staticText = "destroy all creatures, then create two 1/1 white Spirit creature tokens with flying. Creatures destroyed this way can't be regenerated"; } public KirtarsWrathEffect(final KirtarsWrathEffect effect) { diff --git a/Mage.Sets/src/mage/cards/k/KjeldoranOutpost.java b/Mage.Sets/src/mage/cards/k/KjeldoranOutpost.java index 9fd6b10c903..aeaa1aaa928 100644 --- a/Mage.Sets/src/mage/cards/k/KjeldoranOutpost.java +++ b/Mage.Sets/src/mage/cards/k/KjeldoranOutpost.java @@ -65,7 +65,7 @@ public class KjeldoranOutpost extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.ALL, new EnterBattlefieldPayCostOrPutGraveyardEffect(new SacrificeTargetCost(new TargetControlledPermanent(filter))))); // {tap}: Add {W} to your mana pool. this.addAbility(new WhiteManaAbility()); - // {1}{W}, {tap}: Put a 1/1 white Soldier creature token onto the battlefield. + // {1}{W}, {tap}: Create a 1/1 white Soldier creature token. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SoldierToken()), new ManaCostsImpl("{1}{W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KnightWatch.java b/Mage.Sets/src/mage/cards/k/KnightWatch.java index 2829d4688c2..437696d37e0 100644 --- a/Mage.Sets/src/mage/cards/k/KnightWatch.java +++ b/Mage.Sets/src/mage/cards/k/KnightWatch.java @@ -44,7 +44,7 @@ public class KnightWatch extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{W}"); - //Put two 2/2 white Knight creature tokens with vigilance onto the battlefield. + //Create two 2/2 white Knight creature tokens with vigilance. this.getSpellAbility().addEffect(new CreateTokenEffect(new KnightToken(),2)); } diff --git a/Mage.Sets/src/mage/cards/k/KnightlyValor.java b/Mage.Sets/src/mage/cards/k/KnightlyValor.java index 91f68cc0a8c..39bc3ab30c2 100644 --- a/Mage.Sets/src/mage/cards/k/KnightlyValor.java +++ b/Mage.Sets/src/mage/cards/k/KnightlyValor.java @@ -68,7 +68,7 @@ public class KnightlyValor extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // When Knightly Valor enters the battlefield, put a 2/2 white Knight creature token with vigilance onto the battlefield. + // When Knightly Valor enters the battlefield, create a 2/2 white Knight creature token with vigilance. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new KnightToken()))); // Enchanted creature gets +2/+2 and has vigilance. diff --git a/Mage.Sets/src/mage/cards/k/KorozdaGuildmage.java b/Mage.Sets/src/mage/cards/k/KorozdaGuildmage.java index ec892156724..9fde014f570 100644 --- a/Mage.Sets/src/mage/cards/k/KorozdaGuildmage.java +++ b/Mage.Sets/src/mage/cards/k/KorozdaGuildmage.java @@ -78,7 +78,7 @@ public class KorozdaGuildmage extends CardImpl { ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); - // {2}{B}{G}, Sacrifice a nontoken creature: Put X 1/1 green Saproling creature tokens onto the battlefield, where X is the sacrificed creature's toughness. + // {2}{B}{G}, Sacrifice a nontoken creature: create X 1/1 green Saproling creature tokens, where X is the sacrificed creature's toughness. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken(),new SacrificeCostCreaturesToughness()),new ManaCostsImpl("{2}{B}{G}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1,filter, true))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KrenkoMobBoss.java b/Mage.Sets/src/mage/cards/k/KrenkoMobBoss.java index 58232c2d50d..b9393700443 100644 --- a/Mage.Sets/src/mage/cards/k/KrenkoMobBoss.java +++ b/Mage.Sets/src/mage/cards/k/KrenkoMobBoss.java @@ -62,7 +62,7 @@ public class KrenkoMobBoss extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - // {tap}: Put X 1/1 red Goblin creature tokens onto the battlefield, where X is the number of Goblins you control. + // {tap}: create X 1/1 red Goblin creature tokens, where X is the number of Goblins you control. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GoblinToken(), new PermanentsOnBattlefieldCount(filter)), new TapSourceCost())); diff --git a/Mage.Sets/src/mage/cards/k/KrenkosCommand.java b/Mage.Sets/src/mage/cards/k/KrenkosCommand.java index 92b1a009b67..48175015e39 100644 --- a/Mage.Sets/src/mage/cards/k/KrenkosCommand.java +++ b/Mage.Sets/src/mage/cards/k/KrenkosCommand.java @@ -44,7 +44,7 @@ public class KrenkosCommand extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{R}"); - // Put two 1/1 red Goblin creature tokens onto the battlefield. + // Create two 1/1 red Goblin creature tokens. this.getSpellAbility().addEffect(new CreateTokenEffect(new GoblinToken(), 2)); } diff --git a/Mage.Sets/src/mage/cards/l/LAATGunship.java b/Mage.Sets/src/mage/cards/l/LAATGunship.java index 03e14fbd527..18bab3dee28 100644 --- a/Mage.Sets/src/mage/cards/l/LAATGunship.java +++ b/Mage.Sets/src/mage/cards/l/LAATGunship.java @@ -54,7 +54,7 @@ public class LAATGunship extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(2); - // When LAAT Gunship attacks, put a 1/1 white Trooper creature token on to battlefield tapped and attacking. + // When LAAT Gunship attacks, create a 1/1 white Trooper creature token on to battlefield tapped and attacking. this.addAbility(new AttacksTriggeredAbility(new CreateTokenEffect(new TrooperToken(), 1, true, true), false)); // {W}: LAAT Gunship attacks gains spaceflight until the end of turn. diff --git a/Mage.Sets/src/mage/cards/l/LabRats.java b/Mage.Sets/src/mage/cards/l/LabRats.java index 389ddf9ad07..aa24d58ec8a 100644 --- a/Mage.Sets/src/mage/cards/l/LabRats.java +++ b/Mage.Sets/src/mage/cards/l/LabRats.java @@ -47,7 +47,7 @@ public class LabRats extends CardImpl { // Buyback {4} this.addAbility(new BuybackAbility("{4}")); - // Put a 1/1 black Rat creature token onto the battlefield. + // Create a 1/1 black Rat creature token. this.getSpellAbility().addEffect(new CreateTokenEffect(new RatToken())); } diff --git a/Mage.Sets/src/mage/cards/l/LastStand.java b/Mage.Sets/src/mage/cards/l/LastStand.java index bc88957975a..0700bb942e2 100644 --- a/Mage.Sets/src/mage/cards/l/LastStand.java +++ b/Mage.Sets/src/mage/cards/l/LastStand.java @@ -53,7 +53,7 @@ public class LastStand extends CardImpl { public LastStand(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{W}{U}{B}{R}{G}"); - // Target opponent loses 2 life for each Swamp you control. Last Stand deals damage equal to the number of Mountains you control to target creature. Put a 1/1 green Saproling creature token onto the battlefield for each Forest you control. You gain 2 life for each Plains you control. Draw a card for each Island you control, then discard that many cards. + // Target opponent loses 2 life for each Swamp you control. Last Stand deals damage equal to the number of Mountains you control to target creature. Create a 1/1 green Saproling creature token for each Forest you control. You gain 2 life for each Plains you control. Draw a card for each Island you control, then discard that many cards. this.getSpellAbility().addEffect(new LastStandEffect()); this.getSpellAbility().addTarget(new TargetOpponent()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); @@ -86,7 +86,7 @@ class LastStandEffect extends OneShotEffect { public LastStandEffect() { super(Outcome.Benefit); - this.staticText = "Target opponent loses 2 life for each Swamp you control. Last Stand deals damage equal to the number of Mountains you control to target creature. Put a 1/1 green Saproling creature token onto the battlefield for each Forest you control. You gain 2 life for each Plains you control. Draw a card for each Island you control, then discard that many cards"; + this.staticText = "Target opponent loses 2 life for each Swamp you control. Last Stand deals damage equal to the number of Mountains you control to target creature. Create a 1/1 green Saproling creature token for each Forest you control. You gain 2 life for each Plains you control. Draw a card for each Island you control, then discard that many cards"; } public LastStandEffect(final LastStandEffect effect) { @@ -116,7 +116,7 @@ class LastStandEffect extends OneShotEffect { creature.damage(mountains, source.getSourceId(), game, false, true); } } - // Put a 1/1 green Saproling creature token onto the battlefield for each Forest you control. + // Create a 1/1 green Saproling creature token for each Forest you control. int forests = game.getBattlefield().count(filterForest, source.getSourceId(), source.getControllerId(), game); if (forests > 0) { new CreateTokenEffect(new SaprolingToken(), forests).apply(game, source); diff --git a/Mage.Sets/src/mage/cards/l/LaunchTheFleet.java b/Mage.Sets/src/mage/cards/l/LaunchTheFleet.java index 49dcfdb1367..edb409c372b 100644 --- a/Mage.Sets/src/mage/cards/l/LaunchTheFleet.java +++ b/Mage.Sets/src/mage/cards/l/LaunchTheFleet.java @@ -47,18 +47,17 @@ import mage.target.common.TargetCreaturePermanent; public class LaunchTheFleet extends CardImpl { public LaunchTheFleet(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{W}"); - + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{W}"); // Strive - Launch the Fleet costs 1 more to cast for each target beyond the first. this.addAbility(new StriveAbility("{1}")); - - // Until end of turn, any number of target creatures each gain "Whenever this creature attacks, put a 1/1 white Soldier token onto the battlefield tapped and attacking." + + // Until end of turn, any number of target creatures each gain "Whenever this creature attacks, create a 1/1 white Soldier token tapped and attacking." this.getSpellAbility().addTarget(new TargetCreaturePermanent(0, Integer.MAX_VALUE)); Effect effect = new GainAbilityTargetEffect(new AttacksTriggeredAbility(new CreateTokenEffect(new SoldierToken(), 1, true, true), false), Duration.EndOfTurn); - effect.setText("Until end of turn, any number of target creatures each gain \"Whenever this creature attacks, put a 1/1 white Soldier token onto the battlefield tapped and attacking.\""); + effect.setText("Until end of turn, any number of target creatures each gain \"Whenever this creature attacks, create a 1/1 white Soldier token tapped and attacking.\""); this.getSpellAbility().addEffect(effect); - + } public LaunchTheFleet(final LaunchTheFleet card) { diff --git a/Mage.Sets/src/mage/cards/l/LeafdrakeRoost.java b/Mage.Sets/src/mage/cards/l/LeafdrakeRoost.java index 1a35fa20194..03df84a1904 100644 --- a/Mage.Sets/src/mage/cards/l/LeafdrakeRoost.java +++ b/Mage.Sets/src/mage/cards/l/LeafdrakeRoost.java @@ -68,11 +68,11 @@ public class LeafdrakeRoost extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // Enchanted land has "{G}{U}, {tap}: Put a 2/2 green and blue Drake creature token with flying onto the battlefield." + // Enchanted land has "{G}{U}, {tap}: Create a 2/2 green and blue Drake creature token with flying." Ability abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new LeafdrakeRoostDrakeToken()), new ManaCostsImpl("{G}{U}")); abilityToGain.addCost(new TapSourceCost()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(abilityToGain, AttachmentType.AURA, Duration.WhileOnBattlefield, - "Enchanted land has \"{G}{U}, {t}: Put a 2/2 green and blue Drake creature token with flying onto the battlefield.\""))); + "Enchanted land has \"{G}{U}, {t}: Create a 2/2 green and blue Drake creature token with flying.\""))); } diff --git a/Mage.Sets/src/mage/cards/l/LilianaHereticalHealer.java b/Mage.Sets/src/mage/cards/l/LilianaHereticalHealer.java index d584f8fe1c7..cb996b445b1 100644 --- a/Mage.Sets/src/mage/cards/l/LilianaHereticalHealer.java +++ b/Mage.Sets/src/mage/cards/l/LilianaHereticalHealer.java @@ -74,7 +74,7 @@ public class LilianaHereticalHealer extends CardImpl { // Lifelink this.addAbility(LifelinkAbility.getInstance()); - // Whenever another nontoken creature you control dies, exile Liliana Heretical Healer, then return her to the battlefield transformed under her owner's control. If you do, put a 2/2 black Zombie creature token onto the battlefield. + // Whenever another nontoken creature you control dies, exile Liliana Heretical Healer, then return her to the battlefield transformed under her owner's control. If you do, create a 2/2 black Zombie creature token. this.addAbility(new DiesCreatureTriggeredAbility(new ExileAndReturnTransformedSourceEffect(ExileAndReturnTransformedSourceEffect.Gender.FEMAL, new CreateTokenEffect(new ZombieToken())), false, filter)); } diff --git a/Mage.Sets/src/mage/cards/l/LilianaTheLastHope.java b/Mage.Sets/src/mage/cards/l/LilianaTheLastHope.java index 5fbdabd9bab..e4b75f42aad 100644 --- a/Mage.Sets/src/mage/cards/l/LilianaTheLastHope.java +++ b/Mage.Sets/src/mage/cards/l/LilianaTheLastHope.java @@ -81,7 +81,7 @@ public class LilianaTheLastHope extends CardImpl { ability.addEffect(new LilianaTheLastHopeEffect()); this.addAbility(ability); - // -7: You get an emblem with "At the beginning of your end step, put X 2/2 black Zombie creature tokens onto the battlefield, + // -7: You get an emblem with "At the beginning of your end step, create X 2/2 black Zombie creature tokens, // where X is two plus the number of Zombies you control." this.addAbility(new LoyaltyAbility(new GetEmblemEffect(new LilianaTheLastHopeEmblem()), -7)); } diff --git a/Mage.Sets/src/mage/cards/l/LilianasReaver.java b/Mage.Sets/src/mage/cards/l/LilianasReaver.java index d6f4652ead6..143ca975a12 100644 --- a/Mage.Sets/src/mage/cards/l/LilianasReaver.java +++ b/Mage.Sets/src/mage/cards/l/LilianasReaver.java @@ -54,7 +54,7 @@ public class LilianasReaver extends CardImpl { // Deathtouch this.addAbility(DeathtouchAbility.getInstance()); - // Whenever Liliana's Reaver deals combat damage to a player, that player discards a card and you put a 2/2 black Zombie creature token onto the battlefield tapped. + // Whenever Liliana's Reaver deals combat damage to a player, that player discards a card and you create a 2/2 black Zombie creature token tapped. Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new DiscardTargetEffect(1), false, true); ability.addEffect(new CreateTokenEffect(new ZombieToken(), 1, true, false)); diff --git a/Mage.Sets/src/mage/cards/l/LingeringSouls.java b/Mage.Sets/src/mage/cards/l/LingeringSouls.java index 1b76bbec94a..28399c54b8c 100644 --- a/Mage.Sets/src/mage/cards/l/LingeringSouls.java +++ b/Mage.Sets/src/mage/cards/l/LingeringSouls.java @@ -47,7 +47,7 @@ public class LingeringSouls extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{W}"); - // Put two 1/1 white Spirit creature tokens with flying onto the battlefield. + // Create two 1/1 white Spirit creature tokens with flying. this.getSpellAbility().addEffect(new CreateTokenEffect(new SpiritWhiteToken("ISD"), 2)); // Flashback {1}{B} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{1}{B}"), TimingRule.SORCERY)); diff --git a/Mage.Sets/src/mage/cards/l/LinvalaThePreserver.java b/Mage.Sets/src/mage/cards/l/LinvalaThePreserver.java index f1cb087dc61..cb0e2e8cb97 100644 --- a/Mage.Sets/src/mage/cards/l/LinvalaThePreserver.java +++ b/Mage.Sets/src/mage/cards/l/LinvalaThePreserver.java @@ -63,10 +63,10 @@ public class LinvalaThePreserver extends CardImpl { new OpponentHasMoreLifeCondition(), "When {this} enters the battlefield, if an opponent has more life than you, you gain 5 life.")); - // When Linvala enters the battlefield, if an opponent controls more creatures than you, put a 3/3 white Angel creature token with flying onto the battlefield. + // When Linvala enters the battlefield, if an opponent controls more creatures than you, create a 3/3 white Angel creature token with flying. this.addAbility(new ConditionalTriggeredAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new LinvalaAngelToken()), false), new OpponentControlsMoreCondition(new FilterCreaturePermanent()), - "When {this} enters the battlefield, if an opponent controls more creatures than you, put a 3/3 white Angel creature token with flying onto the battlefield.")); + "When {this} enters the battlefield, if an opponent controls more creatures than you, create a 3/3 white Angel creature token with flying.")); } public LinvalaThePreserver(final LinvalaThePreserver card) { diff --git a/Mage.Sets/src/mage/cards/l/LivingHive.java b/Mage.Sets/src/mage/cards/l/LivingHive.java index 8c97591f147..abfd50d4ac3 100644 --- a/Mage.Sets/src/mage/cards/l/LivingHive.java +++ b/Mage.Sets/src/mage/cards/l/LivingHive.java @@ -57,7 +57,7 @@ public class LivingHive extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); - // Whenever Living Hive deals combat damage to a player, put that many 1/1 green Insect creature tokens onto the battlefield. + // Whenever Living Hive deals combat damage to a player, create that many 1/1 green Insect creature tokens. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new LivingHiveEffect(), false, true)); } @@ -75,7 +75,7 @@ class LivingHiveEffect extends OneShotEffect { public LivingHiveEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "put that many 1/1 green Insect creature tokens onto the battlefield"; + this.staticText = "create that many 1/1 green Insect creature tokens"; } public LivingHiveEffect(final LivingHiveEffect effect) { diff --git a/Mage.Sets/src/mage/cards/l/LlanowarMentor.java b/Mage.Sets/src/mage/cards/l/LlanowarMentor.java index c021d2e11c9..56b18645efa 100644 --- a/Mage.Sets/src/mage/cards/l/LlanowarMentor.java +++ b/Mage.Sets/src/mage/cards/l/LlanowarMentor.java @@ -49,13 +49,13 @@ import mage.game.permanent.token.Token; public class LlanowarMentor extends CardImpl { public LlanowarMentor(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{G}"); this.subtype.add("Elf"); this.subtype.add("Spellshaper"); this.power = new MageInt(1); this.toughness = new MageInt(1); - // {G}, {tap}, Discard a card: Put a 1/1 green Elf Druid creature token named Llanowar Elves onto the battlefield. It has "{tap}: Add {G} to your mana pool." + // {G}, {tap}, Discard a card: Create a 1/1 green Elf Druid creature token named Llanowar Elves. It has "{tap}: Add {G} to your mana pool." Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new LlanowarElvesToken()), new ManaCostsImpl("{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); diff --git a/Mage.Sets/src/mage/cards/l/LordOfLineage.java b/Mage.Sets/src/mage/cards/l/LordOfLineage.java index e83966f6037..349f1afa077 100644 --- a/Mage.Sets/src/mage/cards/l/LordOfLineage.java +++ b/Mage.Sets/src/mage/cards/l/LordOfLineage.java @@ -71,7 +71,7 @@ public class LordOfLineage extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Other Vampire creatures you control get +2/+2. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, true))); - // {tap}: Put a 2/2 black Vampire creature token with flying onto the battlefield. + // {tap}: Create a 2/2 black Vampire creature token with flying. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new VampireToken()), new TapSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/l/LullmageMentor.java b/Mage.Sets/src/mage/cards/l/LullmageMentor.java index 05772f40e94..7a0b43ffb9c 100644 --- a/Mage.Sets/src/mage/cards/l/LullmageMentor.java +++ b/Mage.Sets/src/mage/cards/l/LullmageMentor.java @@ -75,7 +75,7 @@ public class LullmageMentor extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // Whenever a spell or ability you control counters a spell, you may put a 1/1 blue Merfolk creature token onto the battlefield. + // Whenever a spell or ability you control counters a spell, you may create a 1/1 blue Merfolk creature token. this.addAbility(new LullmageMentorTriggeredAbility(), new CastedSpellsWithSpellTarget()); // Tap seven untapped Merfolk you control: Counter target spell. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(7, 7, filter, true))); diff --git a/Mage.Sets/src/mage/cards/l/LuminarchAscension.java b/Mage.Sets/src/mage/cards/l/LuminarchAscension.java index 34655913984..1d46c547629 100644 --- a/Mage.Sets/src/mage/cards/l/LuminarchAscension.java +++ b/Mage.Sets/src/mage/cards/l/LuminarchAscension.java @@ -63,7 +63,7 @@ public class LuminarchAscension extends CardImpl { // At the beginning of each opponent's end step, if you didn't lose life this turn, you may put a quest counter on Luminarch Ascension. this.addAbility(new ConditionalTriggeredAbility(new LuminarchAscensionTriggeredAbility(), YouLostNoLifeThisTurnCondition.getInstance(), rule)); - // {1}{W}: Put a 4/4 white Angel creature token with flying onto the battlefield. Activate this ability only if Luminarch Ascension has four or more quest counters on it. + // {1}{W}: Create a 4/4 white Angel creature token with flying. Activate this ability only if Luminarch Ascension has four or more quest counters on it. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new AngelToken()), new ManaCostsImpl("{1}{W}")); ability.addCost(new SourceHasCountersCost(4, CounterType.QUEST)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MaalfeldTwins.java b/Mage.Sets/src/mage/cards/m/MaalfeldTwins.java index fe26fa78caf..81e0c4e9e81 100644 --- a/Mage.Sets/src/mage/cards/m/MaalfeldTwins.java +++ b/Mage.Sets/src/mage/cards/m/MaalfeldTwins.java @@ -49,7 +49,7 @@ public class MaalfeldTwins extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); - // When Maalfeld Twins dies, put two 2/2 black Zombie creature tokens onto the battlefield. + // When Maalfeld Twins dies, create two 2/2 black Zombie creature tokens. this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new ZombieToken(), 2))); } diff --git a/Mage.Sets/src/mage/cards/m/MakeMischief.java b/Mage.Sets/src/mage/cards/m/MakeMischief.java index 00bbfb4114f..87fadc56067 100644 --- a/Mage.Sets/src/mage/cards/m/MakeMischief.java +++ b/Mage.Sets/src/mage/cards/m/MakeMischief.java @@ -45,7 +45,7 @@ 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. Put a 1/1 red Devil creature token onto the battlefield. + // 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." this.getSpellAbility().addEffect(new DamageTargetEffect(1)); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); diff --git a/Mage.Sets/src/mage/cards/m/MarathWillOfTheWild.java b/Mage.Sets/src/mage/cards/m/MarathWillOfTheWild.java index 89025792a41..6831b9686d3 100644 --- a/Mage.Sets/src/mage/cards/m/MarathWillOfTheWild.java +++ b/Mage.Sets/src/mage/cards/m/MarathWillOfTheWild.java @@ -91,7 +91,7 @@ public class MarathWillOfTheWild extends CardImpl { mode.getTargets().add(new TargetCreatureOrPlayer()); ability.addMode(mode); - // or put an X/X green Elemental creature token onto the battlefield. + // or create an X/X green Elemental creature token. mode = new Mode(); mode.getEffects().add(new MarathWillOfTheWildCreateTokenEffect()); ability.addMode(mode); @@ -139,7 +139,7 @@ class MarathWillOfTheWildCreateTokenEffect extends OneShotEffect { public MarathWillOfTheWildCreateTokenEffect() { super(Outcome.PutCreatureInPlay); - staticText = "put an X/X green Elemental creature token onto the battlefield"; + staticText = "create an X/X green Elemental creature token"; } public MarathWillOfTheWildCreateTokenEffect(final MarathWillOfTheWildCreateTokenEffect effect) { diff --git a/Mage.Sets/src/mage/cards/m/MarchOfSouls.java b/Mage.Sets/src/mage/cards/m/MarchOfSouls.java index d63ea612fd1..db32fd5a2b5 100644 --- a/Mage.Sets/src/mage/cards/m/MarchOfSouls.java +++ b/Mage.Sets/src/mage/cards/m/MarchOfSouls.java @@ -51,7 +51,7 @@ public class MarchOfSouls extends CardImpl { public MarchOfSouls(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{W}"); - // Destroy all creatures. They can't be regenerated. For each creature destroyed this way, its controller puts a 1/1 white Spirit creature token with flying onto the battlefield. + // Destroy all creatures. They can't be regenerated. For each creature destroyed this way, its controller creates a 1/1 white Spirit creature token with flying. this.getSpellAbility().addEffect(new MarchOfSoulsEffect()); } @@ -69,7 +69,7 @@ class MarchOfSoulsEffect extends OneShotEffect { public MarchOfSoulsEffect() { super(Outcome.Benefit); - staticText = "Destroy all creatures. They can't be regenerated. For each creature destroyed this way, its controller puts a 1/1 white Spirit creature token with flying onto the battlefield."; + staticText = "Destroy all creatures. They can't be regenerated. For each creature destroyed this way, its controller creates a 1/1 white Spirit creature token with flying."; } public MarchOfSoulsEffect(final MarchOfSoulsEffect effect) { diff --git a/Mage.Sets/src/mage/cards/m/MarduAscendancy.java b/Mage.Sets/src/mage/cards/m/MarduAscendancy.java index 77771f4f008..02c7a61c85b 100644 --- a/Mage.Sets/src/mage/cards/m/MarduAscendancy.java +++ b/Mage.Sets/src/mage/cards/m/MarduAscendancy.java @@ -63,7 +63,7 @@ public class MarduAscendancy extends CardImpl { public MarduAscendancy(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{R}{W}{B}"); - // Whenever a nontoken creature you control attacks, put a 1/1 red Goblin creature token onto the battlefield tapped and attacking. + // Whenever a nontoken creature you control attacks, create a 1/1 red Goblin creature token tapped and attacking. this.addAbility(new AttacksCreatureYouControlTriggeredAbility(new CreateTokenEffect(new GoblinToken(), 1, true, true), false, attackFilter)); // Sacrifice Mardu Ascendancy: Creatures you control get +0/+3 until end of turn. diff --git a/Mage.Sets/src/mage/cards/m/MarduCharm.java b/Mage.Sets/src/mage/cards/m/MarduCharm.java index 9676b8f1fa4..f11c1b99888 100644 --- a/Mage.Sets/src/mage/cards/m/MarduCharm.java +++ b/Mage.Sets/src/mage/cards/m/MarduCharm.java @@ -75,7 +75,7 @@ public class MarduCharm extends CardImpl { this.getSpellAbility().addEffect(new DamageTargetEffect(4)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - // * Put two 1/1 white Warrior creature tokens onto the battlefield. They gain first strike until end of turn. + // * Create two 1/1 white Warrior creature tokens. They gain first strike until end of turn. Mode mode = new Mode(); mode.getEffects().add(new MarduCharmCreateTokenEffect()); this.getSpellAbility().addMode(mode); @@ -102,7 +102,7 @@ class MarduCharmCreateTokenEffect extends OneShotEffect { public MarduCharmCreateTokenEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Put two 1/1 white Warrior creature tokens onto the battlefield. They gain first strike until end of turn"; + this.staticText = "Create two 1/1 white Warrior creature tokens. They gain first strike until end of turn"; } public MarduCharmCreateTokenEffect(final MarduCharmCreateTokenEffect effect) { diff --git a/Mage.Sets/src/mage/cards/m/MarduHordechief.java b/Mage.Sets/src/mage/cards/m/MarduHordechief.java index 70a5b4a6124..064abc85e27 100644 --- a/Mage.Sets/src/mage/cards/m/MarduHordechief.java +++ b/Mage.Sets/src/mage/cards/m/MarduHordechief.java @@ -53,9 +53,9 @@ public class MarduHordechief extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(3); - // Raid - When Mardu Hordechief enters the battlefield, if you attacked with a creature this turn, put a 1/1 white Warrior creature token onto the battlefield + // Raid - When Mardu Hordechief enters the battlefield, if you attacked with a creature this turn, create a 1/1 white Warrior creature token this.addAbility(new ConditionalTriggeredAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new WarriorToken())), RaidCondition.getInstance(), - "Raid - When {this} enters the battlefield, if you attacked with a creature this turn, put a 1/1 white Warrior creature token onto the battlefield."), + "Raid - When {this} enters the battlefield, if you attacked with a creature this turn, create a 1/1 white Warrior creature token."), new PlayerAttackedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/m/MarduStrikeLeader.java b/Mage.Sets/src/mage/cards/m/MarduStrikeLeader.java index a82ce3f34ac..618325857ad 100644 --- a/Mage.Sets/src/mage/cards/m/MarduStrikeLeader.java +++ b/Mage.Sets/src/mage/cards/m/MarduStrikeLeader.java @@ -50,7 +50,7 @@ public class MarduStrikeLeader extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(2); - // Whenever Mardu Strike Leader attacks, put a 2/1 black Warrior creature token onto the battlefield. + // Whenever Mardu Strike Leader attacks, create a 2/1 black Warrior creature token. this.addAbility(new AttacksTriggeredAbility(new CreateTokenEffect(new MarduStrikeLeaderWarriorToken()), false)); // Dash {3}{B} diff --git a/Mage.Sets/src/mage/cards/m/MarrowGnawer.java b/Mage.Sets/src/mage/cards/m/MarrowGnawer.java index 2c9219eba19..f2969e06a2e 100644 --- a/Mage.Sets/src/mage/cards/m/MarrowGnawer.java +++ b/Mage.Sets/src/mage/cards/m/MarrowGnawer.java @@ -80,7 +80,7 @@ public class MarrowGnawer extends CardImpl { // Rat creatures have fear. (They can't be blocked except by artifact creatures and/or black creatures.) this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(FearAbility.getInstance(), Duration.WhileOnBattlefield, filterFear))); - // {T}, Sacrifice a Rat: Put X 1/1 black Rat creature tokens onto the battlefield, where X is the number of Rats you control. + // {T}, Sacrifice a Rat: create X 1/1 black Rat creature tokens, where X is the number of Rats you control. Ability ability; ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new RatToken(),new PermanentsOnBattlefieldCount(filter3)), new SacrificeTargetCost(new TargetControlledPermanent(filterSacrifice))); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/m/MarshFlitter.java b/Mage.Sets/src/mage/cards/m/MarshFlitter.java index db0a93c0349..cf44c63d425 100644 --- a/Mage.Sets/src/mage/cards/m/MarshFlitter.java +++ b/Mage.Sets/src/mage/cards/m/MarshFlitter.java @@ -70,7 +70,7 @@ public class MarshFlitter extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // When Marsh Flitter enters the battlefield, put two 1/1 black Goblin Rogue creature tokens onto the battlefield. + // When Marsh Flitter enters the battlefield, create two 1/1 black Goblin Rogue creature tokens. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new GoblinRogueToken(), 2), false)); // Sacrifice a Goblin: Marsh Flitter has base power and toughness 3/3 until end of turn. Effect effect = new SetPowerToughnessSourceEffect(3, 3, Duration.EndOfTurn, SubLayer.SetPT_7b); diff --git a/Mage.Sets/src/mage/cards/m/MartialCoup.java b/Mage.Sets/src/mage/cards/m/MartialCoup.java index 0de3d82d1fe..0820f4d6000 100644 --- a/Mage.Sets/src/mage/cards/m/MartialCoup.java +++ b/Mage.Sets/src/mage/cards/m/MartialCoup.java @@ -49,7 +49,7 @@ public class MartialCoup extends CardImpl { public MartialCoup(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{X}{W}{W}"); - // Put X 1/1 white Soldier creature tokens onto the battlefield. If X is 5 or more, destroy all other creatures. + // create X 1/1 white Soldier creature tokens. If X is 5 or more, destroy all other creatures. this.getSpellAbility().addEffect(new MartialCoupEffect()); } @@ -69,7 +69,7 @@ class MartialCoupEffect extends OneShotEffect { public MartialCoupEffect() { super(Outcome.PutCreatureInPlay); - staticText = "Put X 1/1 white Soldier creature tokens onto the battlefield. If X is 5 or more, destroy all other creatures"; + staticText = "create X 1/1 white Soldier creature tokens. If X is 5 or more, destroy all other creatures"; } public MartialCoupEffect(final MartialCoupEffect effect) { diff --git a/Mage.Sets/src/mage/cards/m/MasterOfTheWildHunt.java b/Mage.Sets/src/mage/cards/m/MasterOfTheWildHunt.java index 87e1b5da5de..a1e619860fd 100644 --- a/Mage.Sets/src/mage/cards/m/MasterOfTheWildHunt.java +++ b/Mage.Sets/src/mage/cards/m/MasterOfTheWildHunt.java @@ -69,7 +69,7 @@ public class MasterOfTheWildHunt extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - // At the beginning of your upkeep, put a 2/2 green Wolf creature token onto the battlefield. + // At the beginning of your upkeep, create a 2/2 green Wolf creature token. this.addAbility(new OnEventTriggeredAbility(EventType.UPKEEP_STEP_PRE, "beginning of your upkeep", new CreateTokenEffect(wolfToken))); // {T}: Tap all untapped Wolf creatures you control. Each Wolf tapped this way deals damage equal to its power to target creature. That creature deals damage equal to its power divided as its controller chooses among any number of those Wolves. diff --git a/Mage.Sets/src/mage/cards/m/MasterOfWaves.java b/Mage.Sets/src/mage/cards/m/MasterOfWaves.java index 7fe1ff712c9..f7e3adabd7d 100644 --- a/Mage.Sets/src/mage/cards/m/MasterOfWaves.java +++ b/Mage.Sets/src/mage/cards/m/MasterOfWaves.java @@ -74,10 +74,10 @@ public class MasterOfWaves extends CardImpl { this.addAbility(new ProtectionAbility(filterProtection)); // Elemental creatures you control get +1/+1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBoost, false))); - // When Master of Waves enters the battlefield, put a number of 1/0 blue Elemental creature tokens onto the battlefield equal to your devotion to blue. + // When Master of Waves enters the battlefield, create a number of 1/0 blue Elemental creature tokens equal to your devotion to blue. // (Each {U} in the mana costs of permanents you control counts toward your devotion to blue.) Effect effect = new CreateTokenEffect(new MasterOfWavesElementalToken(), new DevotionCount(ColoredManaSymbol.U)); - effect.setText("put a number of 1/0 blue Elemental creature tokens onto the battlefield equal to your devotion to blue. (Each {U} in the mana costs of permanents you control counts toward your devotion to blue.)"); + effect.setText("create a number of 1/0 blue Elemental creature tokens equal to your devotion to blue. (Each {U} in the mana costs of permanents you control counts toward your devotion to blue.)"); this.addAbility(new EntersBattlefieldTriggeredAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/m/MaulSplicer.java b/Mage.Sets/src/mage/cards/m/MaulSplicer.java index 63771178abe..a54468c8c97 100644 --- a/Mage.Sets/src/mage/cards/m/MaulSplicer.java +++ b/Mage.Sets/src/mage/cards/m/MaulSplicer.java @@ -65,7 +65,7 @@ public class MaulSplicer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // When Maul Splicer enters the battlefield, put two 3/3 colorless Golem artifact creature tokens onto the battlefield. + // When Maul Splicer enters the battlefield, create two 3/3 colorless Golem artifact creature tokens. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new GolemToken(expansionSetCode), 2))); // Golem creatures you control have trample. diff --git a/Mage.Sets/src/mage/cards/m/MausoleumGuard.java b/Mage.Sets/src/mage/cards/m/MausoleumGuard.java index fc4f2cfd30d..a6094f6f84a 100644 --- a/Mage.Sets/src/mage/cards/m/MausoleumGuard.java +++ b/Mage.Sets/src/mage/cards/m/MausoleumGuard.java @@ -49,7 +49,7 @@ public class MausoleumGuard extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // When Mausoleum Guard dies, put two 1/1 white Spirit creature tokens with flying onto the battlefield. + // When Mausoleum Guard dies, create two 1/1 white Spirit creature tokens with flying. this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new SpiritWhiteToken("ISD"), 2))); } diff --git a/Mage.Sets/src/mage/cards/m/MelokuTheCloudedMirror.java b/Mage.Sets/src/mage/cards/m/MelokuTheCloudedMirror.java index 0de269b63a3..41938b741b0 100644 --- a/Mage.Sets/src/mage/cards/m/MelokuTheCloudedMirror.java +++ b/Mage.Sets/src/mage/cards/m/MelokuTheCloudedMirror.java @@ -63,7 +63,7 @@ public class MelokuTheCloudedMirror extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // {1}, Return a land you control to its owner's hand: Put a 1/1 blue Illusion creature token with flying onto the battlefield. + // {1}, Return a land you control to its owner's hand: Create a 1/1 blue Illusion creature token with flying. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new MelokuTheCloudedMirrorToken(), 1), new GenericManaCost(1)); ability.addCost(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(filter))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MercyKilling.java b/Mage.Sets/src/mage/cards/m/MercyKilling.java index aca40e3903e..f8c9dfef569 100644 --- a/Mage.Sets/src/mage/cards/m/MercyKilling.java +++ b/Mage.Sets/src/mage/cards/m/MercyKilling.java @@ -50,7 +50,7 @@ public class MercyKilling extends CardImpl { public MercyKilling(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{G/W}"); - // Target creature's controller sacrifices it, then puts X 1/1 green and white Elf Warrior creature tokens onto the battlefield, where X is that creature's power. + // Target creature's controller sacrifices it, then creates X 1/1 green and white Elf Warrior creature tokens, where X is that creature's power. this.getSpellAbility().addEffect(new SacrificeTargetEffect("Target creature's controller sacrifices it")); this.getSpellAbility().addEffect(new MercyKillingTokenEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); @@ -70,7 +70,7 @@ class MercyKillingTokenEffect extends OneShotEffect { public MercyKillingTokenEffect() { super(Outcome.PutCreatureInPlay); - staticText = ", then puts X 1/1 green and white Elf Warrior creature tokens onto the battlefield, where X is that creature's power"; + staticText = ", then creates X 1/1 green and white Elf Warrior creature tokens, where X is that creature's power"; } public MercyKillingTokenEffect(final MercyKillingTokenEffect effect) { diff --git a/Mage.Sets/src/mage/cards/m/Metrognome.java b/Mage.Sets/src/mage/cards/m/Metrognome.java index 192eeffe73f..f272f30ab94 100644 --- a/Mage.Sets/src/mage/cards/m/Metrognome.java +++ b/Mage.Sets/src/mage/cards/m/Metrognome.java @@ -54,9 +54,9 @@ public class Metrognome extends CardImpl { public Metrognome(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); - // When a spell or ability an opponent controls causes you to discard Metrognome, put four 1/1 colorless Gnome artifact creature tokens onto the battlefield. + // When a spell or ability an opponent controls causes you to discard Metrognome, create four 1/1 colorless Gnome artifact creature tokens. this.addAbility(new MetrognomeTriggeredAbility()); - // {4}, {tap}: Put a 1/1 colorless Gnome artifact creature token onto the battlefield. + // {4}, {tap}: Create a 1/1 colorless Gnome artifact creature token. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GnomeToken()), new ManaCostsImpl("{4}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MidnightHaunting.java b/Mage.Sets/src/mage/cards/m/MidnightHaunting.java index 184d403c485..8efd5389217 100644 --- a/Mage.Sets/src/mage/cards/m/MidnightHaunting.java +++ b/Mage.Sets/src/mage/cards/m/MidnightHaunting.java @@ -44,7 +44,7 @@ public class MidnightHaunting extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{W}"); - // Put two 1/1 white Spirit creature tokens with flying onto the battlefield. + // Create two 1/1 white Spirit creature tokens with flying. this.getSpellAbility().addEffect(new CreateTokenEffect(new SpiritWhiteToken("ISD"), 2)); } diff --git a/Mage.Sets/src/mage/cards/m/MidnightRitual.java b/Mage.Sets/src/mage/cards/m/MidnightRitual.java index 62480284b36..718e51ad01a 100644 --- a/Mage.Sets/src/mage/cards/m/MidnightRitual.java +++ b/Mage.Sets/src/mage/cards/m/MidnightRitual.java @@ -56,7 +56,7 @@ public class MidnightRitual extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{X}{2}{B}"); // Exile X target creature cards from your graveyard. - // For each creature card exiled this way, put a 2/2 black Zombie creature token onto the battlefield. + // For each creature card exiled this way, create a 2/2 black Zombie creature token. this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(filter)); this.getSpellAbility().addEffect(new MidnightRitualEffect()); } @@ -83,7 +83,7 @@ class MidnightRitualEffect extends OneShotEffect { public MidnightRitualEffect() { super(Outcome.Neutral); - this.staticText = "Exile X target creature cards from your graveyard. For each creature card exiled this way, put a 2/2 black Zombie creature token onto the battlefield"; + this.staticText = "Exile X target creature cards from your graveyard. For each creature card exiled this way, create a 2/2 black Zombie creature token"; } public MidnightRitualEffect(final MidnightRitualEffect effect) { diff --git a/Mage.Sets/src/mage/cards/m/MidsummerRevel.java b/Mage.Sets/src/mage/cards/m/MidsummerRevel.java index 822240a0a9c..7989630eb6f 100644 --- a/Mage.Sets/src/mage/cards/m/MidsummerRevel.java +++ b/Mage.Sets/src/mage/cards/m/MidsummerRevel.java @@ -56,7 +56,7 @@ public class MidsummerRevel extends CardImpl { // At the beginning of your upkeep, you may put a verse counter on Midsummer Revel. this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.VERSE.createInstance(), true), TargetController.YOU, true)); - // {G}, Sacrifice Midsummer Revel: Put X 3/3 green Beast creature tokens onto the battlefield, where X is the number of verse counters on Midsummer Revel. + // {G}, Sacrifice Midsummer Revel: create X 3/3 green Beast creature tokens, where X is the number of verse counters on Midsummer Revel. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new BeastToken(), new CountersSourceCount(CounterType.VERSE)), new ManaCostsImpl("{G}")); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/m/MilitiasPride.java b/Mage.Sets/src/mage/cards/m/MilitiasPride.java index 81085d2b7b1..87487b75f9b 100644 --- a/Mage.Sets/src/mage/cards/m/MilitiasPride.java +++ b/Mage.Sets/src/mage/cards/m/MilitiasPride.java @@ -55,7 +55,7 @@ public class MilitiasPride extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.ENCHANTMENT},"{1}{W}"); this.subtype.add("Kithkin"); - // Whenever a creature you control attacks, you may pay {W}. If you do put a 1/1 white Kithkin Soldier creature token in play tapped and attacking + // Whenever a creature you control attacks, you may pay {W}. If you do create a 1/1 white Kithkin Soldier creature token in play tapped and attacking this.addAbility(new MilitiasPrideTriggerAbility()); } @@ -95,7 +95,7 @@ class MilitiasPrideTriggerAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever a creature you control attacks, you may pay {W}. If you do put a 1/1 white Kithkin Soldier creature token into play tapped and attacking."; + return "Whenever a creature you control attacks, you may pay {W}. If you do create a 1/1 white Kithkin Soldier creature token into play tapped and attacking."; } @Override diff --git a/Mage.Sets/src/mage/cards/m/MimicVat.java b/Mage.Sets/src/mage/cards/m/MimicVat.java index 1729f9aa65e..eb3e2df711c 100644 --- a/Mage.Sets/src/mage/cards/m/MimicVat.java +++ b/Mage.Sets/src/mage/cards/m/MimicVat.java @@ -59,12 +59,12 @@ import mage.target.targetpointer.FixedTarget; public class MimicVat extends CardImpl { public MimicVat(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // Imprint - Whenever a nontoken creature dies, you may exile that card. If you do, return each other card exiled with Mimic Vat to its owner's graveyard. this.addAbility(new MimicVatTriggeredAbility()); - // {3}, {tap}: Put a token onto the battlefield that's a copy of the exiled card. It gains haste. Exile it at the beginning of the next end step. + // {3}, {tap}: Create a token that's a copy of the exiled card. It gains haste. Exile it at the beginning of the next end step. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MimicVatCreateTokenEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); this.addAbility(ability); @@ -179,7 +179,7 @@ class MimicVatCreateTokenEffect extends OneShotEffect { public MimicVatCreateTokenEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Put a token onto the battlefield that's a copy of the exiled card. It gains haste. Exile it at the beginning of the next end step"; + this.staticText = "Create a token that's a copy of a card exiled with {this}. It gains haste. Exile it at the beginning of the next end step"; } public MimicVatCreateTokenEffect(final MimicVatCreateTokenEffect effect) { diff --git a/Mage.Sets/src/mage/cards/m/MimingSlime.java b/Mage.Sets/src/mage/cards/m/MimingSlime.java index 56c8c3eb6a8..2e6a54f33d5 100644 --- a/Mage.Sets/src/mage/cards/m/MimingSlime.java +++ b/Mage.Sets/src/mage/cards/m/MimingSlime.java @@ -51,7 +51,7 @@ public class MimingSlime extends CardImpl { public MimingSlime(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{G}"); - // Put an X/X green Ooze creature token onto the battlefield, where X is the greatest power among creatures you control. + // Create an X/X green Ooze creature token, where X is the greatest power among creatures you control. this.getSpellAbility().addEffect(new MimingSlimeEffect()); } @@ -69,7 +69,7 @@ class MimingSlimeEffect extends OneShotEffect { public MimingSlimeEffect() { super(Outcome.PutCreatureInPlay); - staticText = "Put an X/X green Ooze creature token onto the battlefield, where X is the greatest power among creatures you control"; + staticText = "Create an X/X green Ooze creature token, where X is the greatest power among creatures you control"; } public MimingSlimeEffect(final MimingSlimeEffect effect) { diff --git a/Mage.Sets/src/mage/cards/m/MinionReflector.java b/Mage.Sets/src/mage/cards/m/MinionReflector.java index 11c416627fe..506f9ac33c5 100644 --- a/Mage.Sets/src/mage/cards/m/MinionReflector.java +++ b/Mage.Sets/src/mage/cards/m/MinionReflector.java @@ -68,7 +68,7 @@ public class MinionReflector extends CardImpl { public MinionReflector(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); - // Whenever a nontoken creature enters the battlefield under your control, you may pay {2}. If you do, put a token that's a copy of that creature onto the battlefield. That token has haste and "At the beginning of the end step, sacrifice this permanent." + // Whenever a nontoken creature enters the battlefield under your control, you may pay {2}. If you do, create a token that's a copy of that creature. That token has haste and "At the beginning of the end step, sacrifice this permanent." Ability ability = new MinionReflectorTriggeredAbility(); ability.addCost(new ManaCostsImpl("{2}")); this.addAbility(ability); @@ -87,7 +87,7 @@ public class MinionReflector extends CardImpl { class MinionReflectorTriggeredAbility extends EntersBattlefieldAllTriggeredAbility { public MinionReflectorTriggeredAbility() { - super(new MinionReflectorEffect(), new FilterControlledCreaturePermanent(), "Whenever a nontoken creature enters the battlefield under your control, you may pay {2}. If you do, put a token that's a copy of that creature onto the battlefield. That token has haste and \"At the beginning of the end step, sacrifice this permanent"); + super(new MinionReflectorEffect(), new FilterControlledCreaturePermanent(), "Whenever a nontoken creature enters the battlefield under your control, you may pay {2}. If you do, create a token that's a copy of that creature. That token has haste and \"At the beginning of the end step, sacrifice this permanent"); filter.add(Predicates.not(new TokenPredicate())); } @@ -121,7 +121,7 @@ class MinionReflectorEffect extends OneShotEffect { public MinionReflectorEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "put a token that's a copy of that creature onto the battlefield. That token has haste and \"At the beginning of the end step, sacrifice this permanent."; + this.staticText = "create a token that's a copy of that creature. That token has haste and \"At the beginning of the end step, sacrifice this permanent."; } public MinionReflectorEffect(final MinionReflectorEffect effect) { diff --git a/Mage.Sets/src/mage/cards/m/MirrorMatch.java b/Mage.Sets/src/mage/cards/m/MirrorMatch.java index c675e746b1b..9a496c6b18f 100644 --- a/Mage.Sets/src/mage/cards/m/MirrorMatch.java +++ b/Mage.Sets/src/mage/cards/m/MirrorMatch.java @@ -58,7 +58,7 @@ public class MirrorMatch extends CardImpl { // Cast Mirror Match only during the declare blockers step. this.addAbility(new CastOnlyDuringPhaseStepSourceAbility(PhaseStep.DECLARE_BLOCKERS)); - // For each creature attacking you or a planeswalker you control, put a token that's a copy of that creature onto the battlefield blocking that creature. Exile those tokens at end of combat. + // For each creature attacking you or a planeswalker you control, create a token that's a copy of that creature blocking that creature. Exile those tokens at end of combat. this.getSpellAbility().addEffect(new MirrorMatchEffect()); } @@ -77,7 +77,7 @@ class MirrorMatchEffect extends OneShotEffect { public MirrorMatchEffect() { super(Outcome.Benefit); - this.staticText = "For each creature attacking you or a planeswalker you control, put a token that's a copy of that creature onto the battlefield blocking that creature. Exile those tokens at end of combat"; + this.staticText = "For each creature attacking you or a planeswalker you control, create a token that's a copy of that creature blocking that creature. Exile those tokens at end of combat"; } public MirrorMatchEffect(final MirrorMatchEffect effect) { diff --git a/Mage.Sets/src/mage/cards/m/MirrorMockery.java b/Mage.Sets/src/mage/cards/m/MirrorMockery.java index abf810466aa..6adcef3291c 100644 --- a/Mage.Sets/src/mage/cards/m/MirrorMockery.java +++ b/Mage.Sets/src/mage/cards/m/MirrorMockery.java @@ -64,7 +64,7 @@ public class MirrorMockery extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // Whenever enchanted creature attacks, you may put a token onto the battlefield that's a copy of that creature. Exile that token at the end of combat. + // Whenever enchanted creature attacks, you may create a token that's a copy of that creature. Exile that token at the end of combat. this.addAbility(new AttacksAttachedTriggeredAbility(new MirrorMockeryEffect(), AttachmentType.AURA, true)); } @@ -82,7 +82,7 @@ class MirrorMockeryEffect extends OneShotEffect { public MirrorMockeryEffect() { super(Outcome.Benefit); - this.staticText = "you may put a token onto the battlefield that's a copy of that creature. Exile that token at the end of combat"; + this.staticText = "you may create a token that's a copy of that creature. Exile that token at the end of combat"; } public MirrorMockeryEffect(final MirrorMockeryEffect effect) { diff --git a/Mage.Sets/src/mage/cards/m/MirrorSigilSergeant.java b/Mage.Sets/src/mage/cards/m/MirrorSigilSergeant.java index 7a2e70ec08d..9e6d32754c2 100644 --- a/Mage.Sets/src/mage/cards/m/MirrorSigilSergeant.java +++ b/Mage.Sets/src/mage/cards/m/MirrorSigilSergeant.java @@ -57,10 +57,10 @@ public class MirrorSigilSergeant extends CardImpl { filter.add(new ColorPredicate(ObjectColor.BLUE)); } - private static final String rule = "At the beginning of your upkeep, if you control a blue permanent, you may put a token that's a copy of Mirror-Sigil Sergeant onto the battlefield."; + private static final String rule = "At the beginning of your upkeep, if you control a blue permanent, you may create a token that's a copy of {this}."; public MirrorSigilSergeant(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{W}"); this.subtype.add("Rhino"); this.subtype.add("Soldier"); @@ -70,9 +70,9 @@ public class MirrorSigilSergeant extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); - // At the beginning of your upkeep, if you control a blue permanent, you may put a token that's a copy of Mirror-Sigil Sergeant onto the battlefield. + // At the beginning of your upkeep, if you control a blue permanent, you may create a token that's a copy of Mirror-Sigil Sergeant. Effect effect = new PutTokenOntoBattlefieldCopySourceEffect(); - effect.setText("you may put a token that's a copy of {this} onto the battlefield"); + effect.setText("you may create a token that's a copy of {this}"); TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, effect, TargetController.YOU, true); this.addAbility(new ConditionalTriggeredAbility(ability, new PermanentsOnTheBattlefieldCondition(filter), rule)); diff --git a/Mage.Sets/src/mage/cards/m/Mirrorpool.java b/Mage.Sets/src/mage/cards/m/Mirrorpool.java index 835762868e6..baa09029bbb 100644 --- a/Mage.Sets/src/mage/cards/m/Mirrorpool.java +++ b/Mage.Sets/src/mage/cards/m/Mirrorpool.java @@ -80,7 +80,7 @@ public class Mirrorpool extends CardImpl { ability.addTarget(new TargetSpell(filter)); this.addAbility(ability); - // {4}{C}, {T}, Sacrifice Mirrorpool: Put a token onto the battlefield that's a copy of target creature you control. + // {4}{C}, {T}, Sacrifice Mirrorpool: Create a token that's a copy of target creature you control. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutTokenOntoBattlefieldCopyTargetEffect(), new ManaCostsImpl("{4}{C}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/m/Mirrorworks.java b/Mage.Sets/src/mage/cards/m/Mirrorworks.java index 9c8e8fe535b..b30f0b3caf8 100644 --- a/Mage.Sets/src/mage/cards/m/Mirrorworks.java +++ b/Mage.Sets/src/mage/cards/m/Mirrorworks.java @@ -57,13 +57,13 @@ public class Mirrorworks extends CardImpl { } public Mirrorworks(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{5}"); // Whenever another nontoken artifact enters the battlefield under your control, you may pay {2}. - // If you do, put a token that's a copy of that artifact onto the battlefield. + // If you do, create a token that's a copy of that artifact. Effect effect = new DoIfCostPaid(new PutTokenOntoBattlefieldCopyTargetEffect(), - new ManaCostsImpl("{2}"), "Put a token that's a copy of that artifact onto the battlefield?"); - effect.setText("you may pay {2}. If you do, put a token that's a copy of that artifact onto the battlefield"); + new ManaCostsImpl("{2}"), "Create a token that's a copy of that artifact?"); + effect.setText("you may pay {2}. If you do, create a token that's a copy of that artifact"); this.addAbility(new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, effect, filter, false, SetTargetPointer.PERMANENT, null)); } diff --git a/Mage.Sets/src/mage/cards/m/MitoticSlime.java b/Mage.Sets/src/mage/cards/m/MitoticSlime.java index 8efa4bc93da..9fc17954559 100644 --- a/Mage.Sets/src/mage/cards/m/MitoticSlime.java +++ b/Mage.Sets/src/mage/cards/m/MitoticSlime.java @@ -67,7 +67,7 @@ public class MitoticSlime extends CardImpl { class Ooze2Token extends Token { public Ooze2Token() { - super("Ooze", "2/2 green Ooze creature tokens with \"When this creature is put into a graveyard, put two 1/1 green Ooze creature tokens onto the battlefield.\""); + super("Ooze", "2/2 green Ooze creature tokens with \"When this creature is put into a graveyard, create two 1/1 green Ooze creature tokens.\""); cardType.add(CardType.CREATURE); subtype.add("Ooze"); color.setGreen(true); diff --git a/Mage.Sets/src/mage/cards/m/MoanOfTheUnhallowed.java b/Mage.Sets/src/mage/cards/m/MoanOfTheUnhallowed.java index 0723b7d4fe3..f122a3c8ec0 100644 --- a/Mage.Sets/src/mage/cards/m/MoanOfTheUnhallowed.java +++ b/Mage.Sets/src/mage/cards/m/MoanOfTheUnhallowed.java @@ -46,7 +46,7 @@ public class MoanOfTheUnhallowed extends CardImpl { public MoanOfTheUnhallowed(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{B}{B}"); - // Put two 2/2 black Zombie creature tokens onto the battlefield. + // Create two 2/2 black Zombie creature tokens. this.getSpellAbility().addEffect(new CreateTokenEffect(new ZombieToken(), 2)); // Flashback {5}{B}{B} diff --git a/Mage.Sets/src/mage/cards/m/MoggAlarm.java b/Mage.Sets/src/mage/cards/m/MoggAlarm.java index ca0cf90d07f..e31640f1059 100644 --- a/Mage.Sets/src/mage/cards/m/MoggAlarm.java +++ b/Mage.Sets/src/mage/cards/m/MoggAlarm.java @@ -55,7 +55,7 @@ public class MoggAlarm extends CardImpl { // You may sacrifice two Mountains rather than pay Mogg Alarm's mana cost. this.addAbility(new AlternativeCostSourceAbility(new SacrificeTargetCost(new TargetControlledPermanent(2, 2, filter, true)))); - // Put two 1/1 red Goblin creature tokens onto the battlefield. + // Create two 1/1 red Goblin creature tokens. this.getSpellAbility().addEffect(new CreateTokenEffect(new GoblinToken(),2)); } diff --git a/Mage.Sets/src/mage/cards/m/MoggInfestation.java b/Mage.Sets/src/mage/cards/m/MoggInfestation.java index 4006e4e3918..0378218fb5a 100644 --- a/Mage.Sets/src/mage/cards/m/MoggInfestation.java +++ b/Mage.Sets/src/mage/cards/m/MoggInfestation.java @@ -52,7 +52,7 @@ public class MoggInfestation extends CardImpl { public MoggInfestation(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{R}{R}"); - // Destroy all creatures target player controls. For each creature that died this way, put two 1/1 red Goblin creature tokens onto the battlefield under that player's control. + // Destroy all creatures target player controls. For each creature that died this way, create two 1/1 red Goblin creature tokens under that player's control. getSpellAbility().addTarget(new TargetPlayer()); getSpellAbility().addEffect(new MoggInfestationEffect()); @@ -72,7 +72,7 @@ class MoggInfestationEffect extends OneShotEffect { public MoggInfestationEffect() { super(Outcome.DestroyPermanent); - this.staticText = "Destroy all creatures target player controls. For each creature that died this way, put two 1/1 red Goblin creature tokens onto the battlefield under that player's control"; + this.staticText = "Destroy all creatures target player controls. For each creature that died this way, create two 1/1 red Goblin creature tokens under that player's control"; } public MoggInfestationEffect(final MoggInfestationEffect effect) { diff --git a/Mage.Sets/src/mage/cards/m/MoggWarMarshal.java b/Mage.Sets/src/mage/cards/m/MoggWarMarshal.java index ebfe7b78eb8..87d4eec410b 100644 --- a/Mage.Sets/src/mage/cards/m/MoggWarMarshal.java +++ b/Mage.Sets/src/mage/cards/m/MoggWarMarshal.java @@ -53,7 +53,7 @@ public class MoggWarMarshal extends CardImpl { // Echo {1}{R} this.addAbility(new EchoAbility("{1}{R}")); - // When Mogg War Marshal enters the battlefield or dies, put a 1/1 red Goblin creature token onto the battlefield. + // When Mogg War Marshal enters the battlefield or dies, create a 1/1 red Goblin creature token. this.addAbility(new EntersBattlefieldOrDiesSourceTriggeredAbility(new CreateTokenEffect(new GoblinToken(), 1), false)); } diff --git a/Mage.Sets/src/mage/cards/m/MoltenBirth.java b/Mage.Sets/src/mage/cards/m/MoltenBirth.java index c7128a63e02..92a41be61e2 100644 --- a/Mage.Sets/src/mage/cards/m/MoltenBirth.java +++ b/Mage.Sets/src/mage/cards/m/MoltenBirth.java @@ -53,7 +53,7 @@ public class MoltenBirth extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{R}{R}"); - // Put two 1/1 red Elemental creature tokens onto the battlefield. Then flip a coin. If you win the flip, return Molten Birth to its owner's hand. + // Create two 1/1 red Elemental creature tokens. Then flip a coin. If you win the flip, return Molten Birth to its owner's hand. this.getSpellAbility().addEffect(new MoltenBirthEffect()); } @@ -72,7 +72,7 @@ class MoltenBirthEffect extends OneShotEffect { public MoltenBirthEffect() { super(Outcome.PutCreatureInPlay); - staticText = "Put two 1/1 red Elemental creature tokens onto the battlefield. Then flip a coin. If you win the flip, return {this} to its owner's hand"; + staticText = "Create two 1/1 red Elemental creature tokens. Then flip a coin. If you win the flip, return {this} to its owner's hand"; } public MoltenBirthEffect(final MoltenBirthEffect effect) { diff --git a/Mage.Sets/src/mage/cards/m/MonasteryMentor.java b/Mage.Sets/src/mage/cards/m/MonasteryMentor.java index 6e17df4bc29..19bdbdf4cbb 100644 --- a/Mage.Sets/src/mage/cards/m/MonasteryMentor.java +++ b/Mage.Sets/src/mage/cards/m/MonasteryMentor.java @@ -45,14 +45,15 @@ import mage.game.permanent.token.Token; * @author fireshoes */ public class MonasteryMentor extends CardImpl { - + private static final FilterSpell filter = new FilterSpell("a noncreature spell"); + static { filter.add(Predicates.not(new CardTypePredicate(CardType.CREATURE))); } public MonasteryMentor(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}"); this.subtype.add("Human"); this.subtype.add("Monk"); this.power = new MageInt(2); @@ -60,8 +61,8 @@ public class MonasteryMentor extends CardImpl { // Prowess this.addAbility(new ProwessAbility()); - - // Whenever you cast a noncreature spell, put a 1/1 white Monk creature token with prowess onto the battlefield. + + // Whenever you cast a noncreature spell, create a 1/1 white Monk creature token with prowess. this.addAbility(new SpellCastControllerTriggeredAbility(new CreateTokenEffect(new MonasteryMentorToken()), filter, false)); } @@ -74,8 +75,9 @@ public class MonasteryMentor extends CardImpl { return new MonasteryMentor(this); } } - - class MonasteryMentorToken extends Token { + +class MonasteryMentorToken extends Token { + MonasteryMentorToken() { super("Monk", "1/1 white Monk creature token with prowess"); cardType.add(CardType.CREATURE); diff --git a/Mage.Sets/src/mage/cards/m/MongrelPack.java b/Mage.Sets/src/mage/cards/m/MongrelPack.java index 7e99557794a..c1d9fd5f445 100644 --- a/Mage.Sets/src/mage/cards/m/MongrelPack.java +++ b/Mage.Sets/src/mage/cards/m/MongrelPack.java @@ -53,7 +53,7 @@ public class MongrelPack extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(1); - // When Mongrel Pack dies during combat, put four 1/1 green Hound creature tokens onto the battlefield. + // When Mongrel Pack dies during combat, create four 1/1 green Hound creature tokens. this.addAbility(new MongrelPackAbility()); } diff --git a/Mage.Sets/src/mage/cards/m/MonkeyCage.java b/Mage.Sets/src/mage/cards/m/MonkeyCage.java index 9755a4783f5..5ddfd86eb94 100644 --- a/Mage.Sets/src/mage/cards/m/MonkeyCage.java +++ b/Mage.Sets/src/mage/cards/m/MonkeyCage.java @@ -54,7 +54,7 @@ public class MonkeyCage extends CardImpl { public MonkeyCage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); - // When a creature enters the battlefield, sacrifice Monkey Cage and put X 2/2 green Ape creature tokens onto the battlefield, where X is that creature's converted mana cost. + // When a creature enters the battlefield, sacrifice Monkey Cage and create X 2/2 green Ape creature tokens, where X is that creature's converted mana cost. Ability ability = new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceEffect(), new FilterCreaturePermanent("a creature"), false, SetTargetPointer.PERMANENT, ""); ability.addEffect(new MonkeyCageEffect()); @@ -75,7 +75,7 @@ class MonkeyCageEffect extends OneShotEffect { public MonkeyCageEffect() { super(Outcome.Benefit); - staticText = "and put X 2/2 green Ape creature tokens onto the battlefield, where X is that creature's converted mana cost"; + staticText = "and create X 2/2 green Ape creature tokens, where X is that creature's converted mana cost"; } public MonkeyCageEffect(final MonkeyCageEffect effect) { diff --git a/Mage.Sets/src/mage/cards/m/MoonsilverSpear.java b/Mage.Sets/src/mage/cards/m/MoonsilverSpear.java index f2e39aab170..9fe905c4e50 100644 --- a/Mage.Sets/src/mage/cards/m/MoonsilverSpear.java +++ b/Mage.Sets/src/mage/cards/m/MoonsilverSpear.java @@ -53,7 +53,7 @@ public class MoonsilverSpear extends CardImpl { // Equipped creature has first strike. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); - // Whenever equipped creature attacks, put a 4/4 white Angel creature token with flying onto the battlefield. + // Whenever equipped creature attacks, create a 4/4 white Angel creature token with flying. this.addAbility(new AttacksAttachedTriggeredAbility(new CreateTokenEffect(new AngelToken()))); // Equip {4} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(4))); diff --git a/Mage.Sets/src/mage/cards/m/MoorlandHaunt.java b/Mage.Sets/src/mage/cards/m/MoorlandHaunt.java index da0f9a50174..ffad3832825 100644 --- a/Mage.Sets/src/mage/cards/m/MoorlandHaunt.java +++ b/Mage.Sets/src/mage/cards/m/MoorlandHaunt.java @@ -55,7 +55,7 @@ public class MoorlandHaunt extends CardImpl { // {tap}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); - // {W}{U}, {tap}, Exile a creature card from your graveyard: Put a 1/1 white Spirit creature token with flying onto the battlefield. + // {W}{U}, {tap}, Exile a creature card from your graveyard: Create a 1/1 white Spirit creature token with flying. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SpiritWhiteToken()), new ManaCostsImpl("{W}{U}")); diff --git a/Mage.Sets/src/mage/cards/m/MorbidBloom.java b/Mage.Sets/src/mage/cards/m/MorbidBloom.java index 4c95d525b07..d46dde9ede6 100644 --- a/Mage.Sets/src/mage/cards/m/MorbidBloom.java +++ b/Mage.Sets/src/mage/cards/m/MorbidBloom.java @@ -52,7 +52,7 @@ public class MorbidBloom extends CardImpl { - // Exile target creature card from a graveyard, then put X 1/1 green Saproling creature tokens onto the battlefield, where X is the exiled card's toughness. + // Exile target creature card from a graveyard, then create X 1/1 green Saproling creature tokens, where X is the exiled card's toughness. this.getSpellAbility().addEffect(new MorbidBloomEffect()); this.getSpellAbility().addTarget(new TargetCardInGraveyard(new FilterCreatureCard("creature from a graveyard"))); @@ -72,7 +72,7 @@ class MorbidBloomEffect extends OneShotEffect { public MorbidBloomEffect() { super(Outcome.PutCreatureInPlay); - staticText = "Exile target creature card from a graveyard, then put X 1/1 green Saproling creature tokens onto the battlefield, where X is the exiled card's toughness"; + staticText = "Exile target creature card from a graveyard, then create X 1/1 green Saproling creature tokens, where X is the exiled card's toughness"; } public MorbidBloomEffect(final MorbidBloomEffect effect) { diff --git a/Mage.Sets/src/mage/cards/m/Mortarpod.java b/Mage.Sets/src/mage/cards/m/Mortarpod.java index 1c2b88056e4..deb26e74172 100644 --- a/Mage.Sets/src/mage/cards/m/Mortarpod.java +++ b/Mage.Sets/src/mage/cards/m/Mortarpod.java @@ -57,7 +57,7 @@ public class Mortarpod extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); this.subtype.add("Equipment"); - // Living weapon (When this Equipment enters the battlefield, put a 0/0 black Germ creature token onto the battlefield, then attach this to it.) + // 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." diff --git a/Mage.Sets/src/mage/cards/m/MurderInvestigation.java b/Mage.Sets/src/mage/cards/m/MurderInvestigation.java index 68d03d8ce64..a324b524aa3 100644 --- a/Mage.Sets/src/mage/cards/m/MurderInvestigation.java +++ b/Mage.Sets/src/mage/cards/m/MurderInvestigation.java @@ -63,7 +63,7 @@ public class MurderInvestigation extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // When enchanted creature dies, put X 1/1 white Soldier creature tokens onto the battlefield, where X is its power. + // When enchanted creature dies, create X 1/1 white Soldier creature tokens, where X is its power. this.addAbility(new DiesAttachedTriggeredAbility(new CreateTokenEffect(new SoldierToken(), new AttachedPermanentPowerCount()), "enchanted creature")); } diff --git a/Mage.Sets/src/mage/cards/m/Mycologist.java b/Mage.Sets/src/mage/cards/m/Mycologist.java index 70aed3e89fb..f02b732258a 100644 --- a/Mage.Sets/src/mage/cards/m/Mycologist.java +++ b/Mage.Sets/src/mage/cards/m/Mycologist.java @@ -68,7 +68,7 @@ public class Mycologist extends CardImpl { // At the beginning of your upkeep, put a spore counter on Mycologist. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()), TargetController.YOU, false)); - // Remove three spore counters from Mycologist: Put a 1/1 green Saproling creature token onto the battlefield. + // Remove three spore counters from Mycologist: Create a 1/1 green Saproling creature token. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); // Sacrifice a Saproling: You gain 2 life. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(2), diff --git a/Mage.Sets/src/mage/cards/m/Mycoloth.java b/Mage.Sets/src/mage/cards/m/Mycoloth.java index 8528e47f47b..3b7b6e36d9f 100644 --- a/Mage.Sets/src/mage/cards/m/Mycoloth.java +++ b/Mage.Sets/src/mage/cards/m/Mycoloth.java @@ -57,7 +57,7 @@ public class Mycoloth 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)); - // At the beginning of your upkeep, put a 1/1 green Saproling creature token onto the battlefield for each +1/+1 counter on Mycoloth. + // At the beginning of your upkeep, create a 1/1 green Saproling creature token for each +1/+1 counter on Mycoloth. this.addAbility(new BeginningOfUpkeepTriggeredAbility( new CreateTokenEffect(new SaprolingToken(),new CountersSourceCount(CounterType.P1P1)), TargetController.YOU, diff --git a/Mage.Sets/src/mage/cards/m/MyrBattlesphere.java b/Mage.Sets/src/mage/cards/m/MyrBattlesphere.java index d1f8644673b..d83fe1e9a2c 100644 --- a/Mage.Sets/src/mage/cards/m/MyrBattlesphere.java +++ b/Mage.Sets/src/mage/cards/m/MyrBattlesphere.java @@ -66,7 +66,7 @@ public class MyrBattlesphere extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(7); - // When Myr Battlesphere enters the battlefield, put four 1/1 colorless Myr artifact creature tokens onto the battlefield. + // When Myr Battlesphere enters the battlefield, create four 1/1 colorless Myr artifact creature tokens. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new MyrToken(), 4), false)); // Whenever Myr Battlesphere attacks, you may tap X untapped Myr you control. If you do, Myr Battlesphere gets +X/+0 until end of turn and deals X damage to defending player. diff --git a/Mage.Sets/src/mage/cards/m/MyrPropagator.java b/Mage.Sets/src/mage/cards/m/MyrPropagator.java index 7649d0a7627..6a7e2a6ef28 100644 --- a/Mage.Sets/src/mage/cards/m/MyrPropagator.java +++ b/Mage.Sets/src/mage/cards/m/MyrPropagator.java @@ -46,13 +46,13 @@ import mage.constants.Zone; public class MyrPropagator extends CardImpl { public MyrPropagator(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{3}"); + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{3}"); this.subtype.add("Myr"); this.power = new MageInt(1); this.toughness = new MageInt(1); - // {3}, {tap}: Put a token that's a copy of Myr Propagator onto the battlefield. + // {3}, {tap}: Create a token that's a copy of Myr Propagator. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutTokenOntoBattlefieldCopySourceEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/Myrsmith.java b/Mage.Sets/src/mage/cards/m/Myrsmith.java index 4488c0bd8fe..d8717731505 100644 --- a/Mage.Sets/src/mage/cards/m/Myrsmith.java +++ b/Mage.Sets/src/mage/cards/m/Myrsmith.java @@ -72,7 +72,7 @@ public class Myrsmith extends CardImpl { class MyrsmithEffect extends CreateTokenEffect { public MyrsmithEffect() { super(new MyrToken()); - staticText = "you may pay {1}. If you do, put a 1/1 colorless Myr artifact creature token onto the battlefield"; + staticText = "you may pay {1}. If you do, create a 1/1 colorless Myr artifact creature token"; } public MyrsmithEffect(final MyrsmithEffect effect) { diff --git a/Mage.Sets/src/mage/cards/m/MysticGenesis.java b/Mage.Sets/src/mage/cards/m/MysticGenesis.java index 4dbfff3ef81..ae3f392604d 100644 --- a/Mage.Sets/src/mage/cards/m/MysticGenesis.java +++ b/Mage.Sets/src/mage/cards/m/MysticGenesis.java @@ -50,7 +50,7 @@ public class MysticGenesis extends CardImpl { public MysticGenesis(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{G}{U}{U}"); - // Counter target spell. Put an X/X green Ooze creature token onto the battlefield, where X is that spell's converted mana cost. + // Counter target spell. Create an X/X green Ooze creature token, where X is that spell's converted mana cost. this.getSpellAbility().addTarget(new TargetSpell()); this.getSpellAbility().addEffect(new MysticGenesisEffect()); @@ -70,7 +70,7 @@ class MysticGenesisEffect extends OneShotEffect { public MysticGenesisEffect() { super(Outcome.Detriment); - staticText = "Counter target spell. Put an X/X green Ooze creature token onto the battlefield, where X is that spell's converted mana cost"; + staticText = "Counter target spell. Create an X/X green Ooze creature token, where X is that spell's converted mana cost"; } public MysticGenesisEffect(final MysticGenesisEffect effect) { diff --git a/Mage.Sets/src/mage/cards/n/NacatlWarPride.java b/Mage.Sets/src/mage/cards/n/NacatlWarPride.java index e89aad7d464..bb2204432d0 100644 --- a/Mage.Sets/src/mage/cards/n/NacatlWarPride.java +++ b/Mage.Sets/src/mage/cards/n/NacatlWarPride.java @@ -58,7 +58,7 @@ import mage.util.CardUtil; public class NacatlWarPride extends CardImpl { public NacatlWarPride(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{G}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{G}{G}{G}"); this.subtype.add("Cat"); this.subtype.add("Warrior"); this.power = new MageInt(3); @@ -68,7 +68,7 @@ public class NacatlWarPride extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByMoreThanOneSourceEffect())); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAtLeastOneSourceEffect())); - // Whenever Nacatl War-Pride attacks, put X tokens that are copies of Nacatl War-Pride onto the battlefield tapped and attacking, where X is the number of creatures defending player controls. Exile the tokens at the beginning of the next end step. + // Whenever Nacatl War-Pride attacks, create X tokens that are copies of Nacatl War-Pride tapped and attacking, where X is the number of creatures defending player controls. Exile the tokens at the beginning of the next end step. this.addAbility(new AttacksTriggeredAbility(new NacatlWarPrideEffect(), false)); } @@ -86,7 +86,7 @@ class NacatlWarPrideEffect extends OneShotEffect { public NacatlWarPrideEffect() { super(Outcome.Benefit); - this.staticText = "Put X tokens onto the battlefield that are copies of Nacatl War-Pride onto the battlefield tapped and attacking, where X is the number of creatures defending player controls. Exile the tokens at the beginning of the next end step."; + this.staticText = "create X tokens that are copies of Nacatl War-Pride tapped and attacking, where X is the number of creatures defending player controls. Exile the tokens at the beginning of the next end step."; } public NacatlWarPrideEffect(final NacatlWarPrideEffect effect) { diff --git a/Mage.Sets/src/mage/cards/n/NahiriTheLithomancer.java b/Mage.Sets/src/mage/cards/n/NahiriTheLithomancer.java index 67756fa43a2..5ab434ecabd 100644 --- a/Mage.Sets/src/mage/cards/n/NahiriTheLithomancer.java +++ b/Mage.Sets/src/mage/cards/n/NahiriTheLithomancer.java @@ -70,20 +70,20 @@ import mage.target.common.TargetControlledPermanent; public class NahiriTheLithomancer extends CardImpl { public NahiriTheLithomancer(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.PLANESWALKER},"{3}{W}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.PLANESWALKER}, "{3}{W}{W}"); this.subtype.add("Nahiri"); this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(3)); - // +2: Put a 1/1 white Kor Soldier creature token onto the battlefield. You may attach an Equipment you control to it. + // +2: Create a 1/1 white Kor Soldier creature token. You may attach an Equipment you control to it. this.addAbility(new LoyaltyAbility(new NahiriTheLithomancerFirstAbilityEffect(), 2)); // -2: You may put an Equipment card from your hand or graveyard onto the battlefield. this.addAbility(new LoyaltyAbility(new NahiriTheLithomancerSecondAbilityEffect(), -2)); - // -10: Put a colorless Equipment artifact token named Stoneforged Blade onto the battlefield. It has indestructible, "Equipped creature gets +5/+5 and has double strike," and equip {0}. + // -10: Create a colorless Equipment artifact token named Stoneforged Blade. It has indestructible, "Equipped creature gets +5/+5 and has double strike," and equip {0}. Effect effect = new CreateTokenEffect(new NahiriTheLithomancerEquipmentToken()); - effect.setText("Put a colorless Equipment artifact token named Stoneforged Blade onto the battlefield. It has indestructible, \"Equipped creature gets +5/+5 and has double strike,\" and equip {0}"); + effect.setText("Create a colorless Equipment artifact token named Stoneforged Blade. It has indestructible, \"Equipped creature gets +5/+5 and has double strike,\" and equip {0}"); this.addAbility(new LoyaltyAbility(effect, -10)); // Nahiri, the Lithomancer can be your commander. @@ -110,7 +110,7 @@ class NahiriTheLithomancerFirstAbilityEffect extends OneShotEffect { NahiriTheLithomancerFirstAbilityEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Put a 1/1 white Kor Soldier creature token onto the battlefield. You may attach an Equipment you control to it"; + this.staticText = "Create a 1/1 white Kor Soldier creature token. You may attach an Equipment you control to it"; } NahiriTheLithomancerFirstAbilityEffect(final NahiriTheLithomancerFirstAbilityEffect effect) { diff --git a/Mage.Sets/src/mage/cards/n/NathOfTheGiltLeaf.java b/Mage.Sets/src/mage/cards/n/NathOfTheGiltLeaf.java index c94d996c676..6bee3e7c4c0 100644 --- a/Mage.Sets/src/mage/cards/n/NathOfTheGiltLeaf.java +++ b/Mage.Sets/src/mage/cards/n/NathOfTheGiltLeaf.java @@ -65,9 +65,9 @@ public class NathOfTheGiltLeaf extends CardImpl { ability.addTarget(new TargetOpponent()); this.addAbility(ability); - // Whenever an opponent discards a card, you may put a 1/1 green Elf Warrior creature token onto the battlefield. + // Whenever an opponent discards a card, you may create a 1/1 green Elf Warrior creature token. Effect effect2 = new CreateTokenEffect(new ElfToken()); - effect2.setText("you may put a 1/1 green Elf Warrior creature token onto the battlefield"); + effect2.setText("you may create a 1/1 green Elf Warrior creature token"); this.addAbility(new DiscardsACardOpponentTriggeredAbility(effect2, true)); } diff --git a/Mage.Sets/src/mage/cards/n/NearheathChaplain.java b/Mage.Sets/src/mage/cards/n/NearheathChaplain.java index d184f31ddc5..b1c5d54c5b6 100644 --- a/Mage.Sets/src/mage/cards/n/NearheathChaplain.java +++ b/Mage.Sets/src/mage/cards/n/NearheathChaplain.java @@ -57,7 +57,7 @@ public class NearheathChaplain extends CardImpl { // Lifelink this.addAbility(LifelinkAbility.getInstance()); - // {2}{W}, Exile Neaheath Chaplain from your graveyard: Put two 1/1 white Spirit creature tokens with flying onto the battlefield. Activate this ability only any time you could cast a sorcery. + // {2}{W}, Exile Neaheath Chaplain from your graveyard: Create two 1/1 white Spirit creature tokens with flying. Activate this ability only any time you could cast a sorcery. Ability ability = new ActivateAsSorceryActivatedAbility(Zone.GRAVEYARD, new CreateTokenEffect(new SpiritWhiteToken(), 2), new ManaCostsImpl("{2}{W}")); ability.addCost(new ExileSourceFromGraveCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/Necrogenesis.java b/Mage.Sets/src/mage/cards/n/Necrogenesis.java index 2636add6168..d702423edc0 100644 --- a/Mage.Sets/src/mage/cards/n/Necrogenesis.java +++ b/Mage.Sets/src/mage/cards/n/Necrogenesis.java @@ -50,7 +50,7 @@ public class Necrogenesis extends CardImpl { public Necrogenesis(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{B}{G}"); - // {2}: Exile target creature card from a graveyard. Put a 1/1 green Saproling creature token onto the battlefield. + // {2}: Exile target creature card from a graveyard. Create a 1/1 green Saproling creature token. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new GenericManaCost(2)); ability.addTarget(new TargetCardInGraveyard(new FilterCreatureCard("creature card from a graveyard"))); ability.addEffect(new CreateTokenEffect(new SaprolingToken())); diff --git a/Mage.Sets/src/mage/cards/n/NecromancersCovenant.java b/Mage.Sets/src/mage/cards/n/NecromancersCovenant.java index 8e55b767cf0..bb49cf925a1 100644 --- a/Mage.Sets/src/mage/cards/n/NecromancersCovenant.java +++ b/Mage.Sets/src/mage/cards/n/NecromancersCovenant.java @@ -64,7 +64,7 @@ public class NecromancersCovenant extends CardImpl { public NecromancersCovenant(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{W}{B}{B}"); - // When Necromancer's Covenant enters the battlefield, exile all creature cards from target player's graveyard, then put a 2/2 black Zombie creature token onto the battlefield for each card exiled this way. + // When Necromancer's Covenant enters the battlefield, exile all creature cards from target player's graveyard, then create a 2/2 black Zombie creature token for each card exiled this way. Ability ability = new EntersBattlefieldTriggeredAbility(new NecromancersConvenantEffect(), false); ability.addTarget(new TargetPlayer()); this.addAbility(ability); @@ -87,7 +87,7 @@ class NecromancersConvenantEffect extends OneShotEffect { public NecromancersConvenantEffect() { super(Outcome.PutCreatureInPlay); - staticText = "exile all creature cards from target player's graveyard, then put a 2/2 black Zombie creature token onto the battlefield for each card exiled this way"; + staticText = "exile all creature cards from target player's graveyard, then create a 2/2 black Zombie creature token for each card exiled this way"; } public NecromancersConvenantEffect(NecromancersConvenantEffect effect) { diff --git a/Mage.Sets/src/mage/cards/n/NecromancersStockpile.java b/Mage.Sets/src/mage/cards/n/NecromancersStockpile.java index ea8295f2915..1bdb8eaa0fd 100644 --- a/Mage.Sets/src/mage/cards/n/NecromancersStockpile.java +++ b/Mage.Sets/src/mage/cards/n/NecromancersStockpile.java @@ -60,7 +60,7 @@ public class NecromancersStockpile extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{B}"); // {1}{B}, Discard a creature card: Draw a card. - // If the discarded card was a Zombie card, put a 2/2 black Zombie creature token onto the battlefield tapped. + // If the discarded card was a Zombie card, create a 2/2 black Zombie creature token tapped. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{1}{B}")); ability.addCost(new NecromancersStockpileDiscardTargetCost(new TargetCardInHand(filter))); ability.addEffect(new NecromancersStockpilePutTokenEffect()); @@ -128,7 +128,7 @@ class NecromancersStockpilePutTokenEffect extends OneShotEffect { NecromancersStockpilePutTokenEffect() { super(Outcome.Neutral); - staticText = "If the discarded card was a Zombie card, put a 2/2 black Zombie creature token onto the battlefield tapped"; + staticText = "If the discarded card was a Zombie card, create a 2/2 black Zombie creature token tapped"; } NecromancersStockpilePutTokenEffect(final NecromancersStockpilePutTokenEffect effect) { diff --git a/Mage.Sets/src/mage/cards/n/NecromasterDragon.java b/Mage.Sets/src/mage/cards/n/NecromasterDragon.java index 77bb007ab9e..3b5cdef1c2b 100644 --- a/Mage.Sets/src/mage/cards/n/NecromasterDragon.java +++ b/Mage.Sets/src/mage/cards/n/NecromasterDragon.java @@ -57,7 +57,7 @@ public class NecromasterDragon extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // Whenever Necromaster Dragon deals combat damage to a player, you may pay {2}. If you do, put a 2/2 black Zombie creature token onto the battlefield and each opponent puts the top two cards of his or her library into his or her graveyard + // Whenever Necromaster Dragon deals combat damage to a player, you may pay {2}. If you do, create a 2/2 black Zombie creature token and each opponent puts the top two cards of his or her library into his or her graveyard Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility( new DoIfCostPaid(new CreateTokenEffect(new ZombieToken(), 1), new ManaCostsImpl("{2}")), false); ability.addEffect(new PutTopCardOfLibraryIntoGraveEachPlayerEffect(2, TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/n/NemataGroveGuardian.java b/Mage.Sets/src/mage/cards/n/NemataGroveGuardian.java index 7a399e82a93..62bc6faee33 100644 --- a/Mage.Sets/src/mage/cards/n/NemataGroveGuardian.java +++ b/Mage.Sets/src/mage/cards/n/NemataGroveGuardian.java @@ -67,7 +67,7 @@ public class NemataGroveGuardian extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(5); - // {2}{G}: Put a 1/1 green Saproling creature token onto the battlefield. + // {2}{G}: Create a 1/1 green Saproling creature token. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl("{2}{G}"))); // Sacrifice a Saproling: Saproling creatures get +1/+1 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.EndOfTurn, filter, false), new SacrificeTargetCost(new TargetControlledPermanent(filter1)))); diff --git a/Mage.Sets/src/mage/cards/n/NemesisTrap.java b/Mage.Sets/src/mage/cards/n/NemesisTrap.java index b3ad5b1218f..6a261673c9f 100644 --- a/Mage.Sets/src/mage/cards/n/NemesisTrap.java +++ b/Mage.Sets/src/mage/cards/n/NemesisTrap.java @@ -73,7 +73,7 @@ public class NemesisTrap extends CardImpl { // If a white creature is attacking, you may pay {B}{B} rather than pay Nemesis Trap's mana cost. this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl("{B}{B}"), new PermanentsOnTheBattlefieldCondition(filter, PermanentsOnTheBattlefieldCondition.CountType.MORE_THAN, 0, false))); - // Exile target attacking creature. Put a token that's a copy of that creature onto the battlefield. Exile it at the beginning of the next end step. + // Exile target attacking creature. Create a token that's a copy of that creature. Exile it at the beginning of the next end step. this.getSpellAbility().addEffect(new NemesisTrapEffect()); this.getSpellAbility().addTarget(new TargetAttackingCreature()); } @@ -92,7 +92,7 @@ class NemesisTrapEffect extends OneShotEffect { public NemesisTrapEffect() { super(Outcome.Exile); - this.staticText = "Exile target attacking creature. Put a token that's a copy of that creature onto the battlefield. Exile it at the beginning of the next end step"; + this.staticText = "Exile target attacking creature. Create a token that's a copy of that creature. Exile it at the beginning of the next end step"; } public NemesisTrapEffect(final NemesisTrapEffect effect) { diff --git a/Mage.Sets/src/mage/cards/n/NestedGhoul.java b/Mage.Sets/src/mage/cards/n/NestedGhoul.java index 505e642df2f..f931a46e149 100644 --- a/Mage.Sets/src/mage/cards/n/NestedGhoul.java +++ b/Mage.Sets/src/mage/cards/n/NestedGhoul.java @@ -94,6 +94,6 @@ class NestedGhoulTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever a source deals damage to {this}, put a 2/2 black Zombie creature token onto the battlefield."; + return "Whenever a source deals damage to {this}, create a 2/2 black Zombie creature token."; } } diff --git a/Mage.Sets/src/mage/cards/n/NightSoil.java b/Mage.Sets/src/mage/cards/n/NightSoil.java index 81e56b1c2f6..abedc726f3b 100644 --- a/Mage.Sets/src/mage/cards/n/NightSoil.java +++ b/Mage.Sets/src/mage/cards/n/NightSoil.java @@ -51,7 +51,7 @@ public class NightSoil extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{G}{G}"); - // {1}, Exile two creature cards from a single graveyard: Put a 1/1 green Saproling creature token onto the battlefield. + // {1}, Exile two creature cards from a single graveyard: Create a 1/1 green Saproling creature token. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new GenericManaCost(1)); ability.addCost(new ExileFromGraveCost(new TargetCardInASingleGraveyard(2,2, new FilterCreatureCard("two creature cards from a single graveyard")))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NissaSageAnimist.java b/Mage.Sets/src/mage/cards/n/NissaSageAnimist.java index ebaf5e551dc..0c868ec8042 100644 --- a/Mage.Sets/src/mage/cards/n/NissaSageAnimist.java +++ b/Mage.Sets/src/mage/cards/n/NissaSageAnimist.java @@ -60,7 +60,7 @@ import mage.target.common.TargetLandPermanent; public class NissaSageAnimist extends CardImpl { public NissaSageAnimist(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.PLANESWALKER},""); + super(ownerId, setInfo, new CardType[]{CardType.PLANESWALKER}, ""); this.subtype.add("Nissa"); this.color.setGreen(true); @@ -71,7 +71,7 @@ public class NissaSageAnimist extends CardImpl { // +1: Reveal the top card of your library. If it's a land card, put it onto the battlefield. Otherwise, put it into your hand. this.addAbility(new LoyaltyAbility(new NissaSageAnimistPlusOneEffect(), 1)); - // -2: Put a legendary 4/4 green Elemental creature token named Ashaya, the Awoken World onto the battlefield. + // -2: Create a legendary 4/4 green Elemental creature token named Ashaya, the Awoken World. this.addAbility(new LoyaltyAbility(new CreateTokenEffect(new NissaSageAnimistToken()), -2)); // -7: Untap up to six target lands. They become 6/6 Elemental creatures. They're still lands. diff --git a/Mage.Sets/src/mage/cards/n/NissaVoiceOfZendikar.java b/Mage.Sets/src/mage/cards/n/NissaVoiceOfZendikar.java index 7f163e55d3e..fb36b40b506 100644 --- a/Mage.Sets/src/mage/cards/n/NissaVoiceOfZendikar.java +++ b/Mage.Sets/src/mage/cards/n/NissaVoiceOfZendikar.java @@ -64,7 +64,7 @@ public class NissaVoiceOfZendikar extends CardImpl { this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(3)); - // +1: Put a 0/1 green Plant creature token onto the battlefield. + // +1: Create a 0/1 green Plant creature token. this.addAbility(new LoyaltyAbility(new CreateTokenEffect(new PlantToken()), 1)); // -2: Put a +1/+1 counter on each creature you control. diff --git a/Mage.Sets/src/mage/cards/n/NoosegrafMob.java b/Mage.Sets/src/mage/cards/n/NoosegrafMob.java index 0ea33662895..fb2cd9943a7 100644 --- a/Mage.Sets/src/mage/cards/n/NoosegrafMob.java +++ b/Mage.Sets/src/mage/cards/n/NoosegrafMob.java @@ -61,7 +61,7 @@ public class NoosegrafMob extends CardImpl { // Noosegraf Mob enters the battlefield with five +1/+1 counters on it. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(5)), "with five +1/+1 counters on it")); - // Whenever a player casts a spell, remove a +1/+1 counter from Noosegraf Mob. If you do, put a 2/2 black Zombie creature token onto the battlefield. + // Whenever a player casts a spell, remove a +1/+1 counter from Noosegraf Mob. If you do, create a 2/2 black Zombie creature token. this.addAbility(new SpellCastAllTriggeredAbility(new NoosegrafMobEffect(), false)); } @@ -79,7 +79,7 @@ class NoosegrafMobEffect extends OneShotEffect { public NoosegrafMobEffect() { super(Outcome.Benefit); - staticText = "remove a +1/+1 counter from Noosegraf Mob. If you do, put a 2/2 black Zombie creature token onto the battlefield"; + staticText = "remove a +1/+1 counter from Noosegraf Mob. If you do, create a 2/2 black Zombie creature token"; } public NoosegrafMobEffect(final NoosegrafMobEffect effect) { diff --git a/Mage.Sets/src/mage/cards/n/NotForgotten.java b/Mage.Sets/src/mage/cards/n/NotForgotten.java index e8da439c115..297468ccfe2 100644 --- a/Mage.Sets/src/mage/cards/n/NotForgotten.java +++ b/Mage.Sets/src/mage/cards/n/NotForgotten.java @@ -52,7 +52,7 @@ public class NotForgotten extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{W}"); // Put target card from a graveyard on the top or bottom of its owner's library. - // Put a 1/1 white Spirit creature token with flying onto the battlefield. + // Create a 1/1 white Spirit creature token with flying. this.getSpellAbility().addEffect(new NotForgottenEffect()); this.getSpellAbility().addTarget(new TargetCardInGraveyard()); } @@ -71,7 +71,7 @@ class NotForgottenEffect extends OneShotEffect { public NotForgottenEffect() { super(Outcome.Benefit); - this.staticText = "Put target card from a graveyard on the top or bottom of its owner's library. Put a 1/1 white Spirit creature token with flying onto the battlefield."; + this.staticText = "Put target card from a graveyard on the top or bottom of its owner's library. Create a 1/1 white Spirit creature token with flying."; } public NotForgottenEffect(final NotForgottenEffect effect) { diff --git a/Mage.Sets/src/mage/cards/n/NotoriousThrong.java b/Mage.Sets/src/mage/cards/n/NotoriousThrong.java index 67dcbdc0c02..deef7475f22 100644 --- a/Mage.Sets/src/mage/cards/n/NotoriousThrong.java +++ b/Mage.Sets/src/mage/cards/n/NotoriousThrong.java @@ -57,7 +57,7 @@ public class NotoriousThrong extends CardImpl { // Prowl {5}{U} this.addAbility(new ProwlAbility(this, "{5}{U}")); - // Put X 1/1 black Faerie Rogue creature tokens with flying onto the battlefield, where X is the damage dealt to your opponents this turn. + // create X 1/1 black Faerie Rogue creature tokens with flying, where X is the damage dealt to your opponents this turn. this.getSpellAbility().addEffect(new NotoriousThrongEffect()); this.getSpellAbility().addWatcher(new AmountOfDamageAPlayerReceivedThisTurnWatcher()); // If Notorious Throng's prowl cost was paid, take an extra turn after this one. @@ -80,7 +80,7 @@ class NotoriousThrongEffect extends OneShotEffect { public NotoriousThrongEffect() { super(Outcome.PutCreatureInPlay); - staticText = "Put X 1/1 black Faerie Rogue creature tokens with flying onto the battlefield, where X is the damage dealt to your opponents this turn"; + staticText = "create X 1/1 black Faerie Rogue creature tokens with flying, where X is the damage dealt to your opponents this turn"; } public NotoriousThrongEffect(NotoriousThrongEffect effect) { diff --git a/Mage.Sets/src/mage/cards/n/NullCaller.java b/Mage.Sets/src/mage/cards/n/NullCaller.java index 2aacb873726..2deb5e5b307 100644 --- a/Mage.Sets/src/mage/cards/n/NullCaller.java +++ b/Mage.Sets/src/mage/cards/n/NullCaller.java @@ -55,7 +55,7 @@ public class NullCaller extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(4); - // {3}{B}, Exile a creature card from your graveyard: Put a 2/2 black Zombie creature token onto the battlefield tapped. + // {3}{B}, Exile a creature card from your graveyard: Create a 2/2 black Zombie creature token tapped. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ZombieToken(), 1, true, false), new ManaCostsImpl<>("{3}{B}")); diff --git a/Mage.Sets/src/mage/cards/n/NutCollector.java b/Mage.Sets/src/mage/cards/n/NutCollector.java index e8878a43deb..5a75fab7567 100644 --- a/Mage.Sets/src/mage/cards/n/NutCollector.java +++ b/Mage.Sets/src/mage/cards/n/NutCollector.java @@ -67,7 +67,7 @@ public class NutCollector extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // At the beginning of your upkeep, you may put a 1/1 green Squirrel creature token onto the battlefield. + // At the beginning of your upkeep, you may create a 1/1 green Squirrel creature token. this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SquirrelToken()), TargetController.YOU, true)); // Threshold - Squirrel creatures get +2/+2 as long as seven or more cards are in your graveyard. Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/o/OathOfGideon.java b/Mage.Sets/src/mage/cards/o/OathOfGideon.java index 4304b197008..36896055922 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfGideon.java +++ b/Mage.Sets/src/mage/cards/o/OathOfGideon.java @@ -56,7 +56,7 @@ public class OathOfGideon extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}"); this.supertype.add("Legendary"); - // When Oath of Gideon enters the battlefield, put two 1/1 Kor Ally creature tokens onto the battlefield. + // When Oath of Gideon enters the battlefield, create two 1/1 Kor Ally creature tokens. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new KorAllyToken(), 2), false)); // Each planeswalker you control enters the battlefield with an additional loyalty counter on it. diff --git a/Mage.Sets/src/mage/cards/o/OathOfLiliana.java b/Mage.Sets/src/mage/cards/o/OathOfLiliana.java index 7a3368262e3..d7d51dce1c6 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfLiliana.java +++ b/Mage.Sets/src/mage/cards/o/OathOfLiliana.java @@ -63,12 +63,12 @@ public class OathOfLiliana extends CardImpl { // When Oath of Liliana enters the battlefield, each opponent sacrifices a creature. this.addAbility(new EntersBattlefieldTriggeredAbility(new SacrificeOpponentsEffect(new FilterControlledCreaturePermanent("a creature")), false)); - // At the beginning of each end step, if a planeswalker entered the battlefield under your control this turn, put a 2/2 black Zombie creature token onto the battlefield. + // At the beginning of each end step, if a planeswalker entered the battlefield under your control this turn, create a 2/2 black Zombie creature token. this.addAbility(new ConditionalTriggeredAbility(new BeginningOfEndStepTriggeredAbility( new CreateTokenEffect(new ZombieToken()), TargetController.ANY, false), OathOfLilianaCondition.getInstance(), "At the beginning of each end step, if a planeswalker entered the battlefield under your control this turn, " - + "put a 2/2 black Zombie creature token onto the battlefield."), new OathOfLilianaWatcher()); + + "create a 2/2 black Zombie creature token."), new OathOfLilianaWatcher()); } public OathOfLiliana(final OathOfLiliana card) { diff --git a/Mage.Sets/src/mage/cards/o/ObNixilisOfTheBlackOath.java b/Mage.Sets/src/mage/cards/o/ObNixilisOfTheBlackOath.java index 77a063837ee..f0530b90f4d 100644 --- a/Mage.Sets/src/mage/cards/o/ObNixilisOfTheBlackOath.java +++ b/Mage.Sets/src/mage/cards/o/ObNixilisOfTheBlackOath.java @@ -70,7 +70,7 @@ public class ObNixilisOfTheBlackOath extends CardImpl { // +2: Each opponent loses 1 life. You gain life equal to the life lost this way. this.addAbility(new LoyaltyAbility(new ObNixilisOfTheBlackOathEffect1(), 2)); - // -2: Put a 5/5 black Demon creature token with flying onto the battlefield. You lose 2 life. + // -2: Create a 5/5 black Demon creature token with flying. You lose 2 life. LoyaltyAbility loyaltyAbility = new LoyaltyAbility(new CreateTokenEffect(new DemonToken()), -2); loyaltyAbility.addEffect(new LoseLifeSourceControllerEffect(2)); this.addAbility(loyaltyAbility); diff --git a/Mage.Sets/src/mage/cards/o/OgreSlumlord.java b/Mage.Sets/src/mage/cards/o/OgreSlumlord.java index e3138e312e6..7ee90b22ef5 100644 --- a/Mage.Sets/src/mage/cards/o/OgreSlumlord.java +++ b/Mage.Sets/src/mage/cards/o/OgreSlumlord.java @@ -72,7 +72,7 @@ public class OgreSlumlord extends CardImpl { this.toughness = new MageInt(3); - // Whenever another nontoken creature dies, you may put a 1/1 black Rat creature token onto the battlefield. + // Whenever another nontoken creature dies, you may create a 1/1 black Rat creature token. this.addAbility(new DiesCreatureTriggeredAbility(new CreateTokenEffect(new RatToken()), true, filter)); // Rats you control have deathtouch. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield, filter2))); diff --git a/Mage.Sets/src/mage/cards/o/OjutaisSummons.java b/Mage.Sets/src/mage/cards/o/OjutaisSummons.java index df2db295881..090cc37e971 100644 --- a/Mage.Sets/src/mage/cards/o/OjutaisSummons.java +++ b/Mage.Sets/src/mage/cards/o/OjutaisSummons.java @@ -46,7 +46,7 @@ public class OjutaisSummons extends CardImpl { public OjutaisSummons(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{U}{U}"); - // Put a 2/2 blue Djinn Monk creature token with flying onto the battlefield. + // Create a 2/2 blue Djinn Monk creature token with flying. this.getSpellAbility().addEffect(new CreateTokenEffect(new DjinnMonkToken())); // Rebound diff --git a/Mage.Sets/src/mage/cards/o/OmnathLocusOfRage.java b/Mage.Sets/src/mage/cards/o/OmnathLocusOfRage.java index f3c5e4369cf..cc8506120d4 100644 --- a/Mage.Sets/src/mage/cards/o/OmnathLocusOfRage.java +++ b/Mage.Sets/src/mage/cards/o/OmnathLocusOfRage.java @@ -64,7 +64,7 @@ public class OmnathLocusOfRage extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); - // Landfall - Whenever a land enters the battlefield under your control, put a 5/5 red and green Elemental creature token onto the battlefield. + // 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. diff --git a/Mage.Sets/src/mage/cards/o/OneDozenEyes.java b/Mage.Sets/src/mage/cards/o/OneDozenEyes.java index 097f52e292f..799bdda3607 100644 --- a/Mage.Sets/src/mage/cards/o/OneDozenEyes.java +++ b/Mage.Sets/src/mage/cards/o/OneDozenEyes.java @@ -51,9 +51,9 @@ public class OneDozenEyes extends CardImpl { // Choose one - this.getSpellAbility().getModes().setMinModes(1); this.getSpellAbility().getModes().setMaxModes(1); - // Put a 5/5 green Beast creature token onto the battlefield; + // Create a 5/5 green Beast creature token; this.getSpellAbility().addEffect(new CreateTokenEffect(new OneDozenEyesBeastToken())); - // or put five 1/1 green Insect creature tokens onto the battlefield. + // or create five 1/1 green Insect creature tokens. Mode mode = new Mode(); mode.getEffects().add(new CreateTokenEffect(new InsectToken(),5)); this.getSpellAbility().addMode(mode); diff --git a/Mage.Sets/src/mage/cards/o/OonaQueenOfTheFae.java b/Mage.Sets/src/mage/cards/o/OonaQueenOfTheFae.java index e776b011a46..8247fb6f97b 100644 --- a/Mage.Sets/src/mage/cards/o/OonaQueenOfTheFae.java +++ b/Mage.Sets/src/mage/cards/o/OonaQueenOfTheFae.java @@ -64,7 +64,7 @@ public class OonaQueenOfTheFae extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // {X}{UB}: Choose a color. Target opponent exiles the top X cards of his or her library. For each card of the chosen color exiled this way, put a 1/1 blue and black Faerie Rogue creature token with flying onto the battlefield. + // {X}{UB}: Choose a color. Target opponent exiles the top X cards of his or her library. For each card of the chosen color exiled this way, create a 1/1 blue and black Faerie Rogue creature token with flying. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new OonaQueenOfTheFaeEffect(), new ManaCostsImpl("{X}{U/B}")); ability.addTarget(new TargetOpponent()); this.addAbility(ability); @@ -84,7 +84,7 @@ class OonaQueenOfTheFaeEffect extends OneShotEffect { public OonaQueenOfTheFaeEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Choose a color. Target opponent exiles the top X cards of his or her library. For each card of the chosen color exiled this way, put a 1/1 blue and black Faerie Rogue creature token with flying onto the battlefield"; + this.staticText = "Choose a color. Target opponent exiles the top X cards of his or her library. For each card of the chosen color exiled this way, create a 1/1 blue and black Faerie Rogue creature token with flying"; } public OonaQueenOfTheFaeEffect(final OonaQueenOfTheFaeEffect effect) { diff --git a/Mage.Sets/src/mage/cards/o/OozeFlux.java b/Mage.Sets/src/mage/cards/o/OozeFlux.java index 93f0721804c..cdf13a335c9 100644 --- a/Mage.Sets/src/mage/cards/o/OozeFlux.java +++ b/Mage.Sets/src/mage/cards/o/OozeFlux.java @@ -54,7 +54,7 @@ public class OozeFlux extends CardImpl { public OozeFlux(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{G}"); - // {1}{G}, Remove one or more +1/+1 counters from among creatures you control: Put an X/X green Ooze creature token onto the battlefield, where X is the number of +1/+1 counters removed this way. + // {1}{G}, Remove one or more +1/+1 counters from among creatures you control: Create an X/X green Ooze creature token, where X is the number of +1/+1 counters removed this way. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new OozeFluxCreateTokenEffect(new OozeToken()),new ManaCostsImpl("{1}{G}")); ability.addCost(new RemoveVariableCountersTargetCost(new FilterControlledCreaturePermanent("creatures you control"), CounterType.P1P1, "one or more", 1)); this.addAbility(ability); @@ -77,7 +77,7 @@ class OozeFluxCreateTokenEffect extends OneShotEffect { public OozeFluxCreateTokenEffect(Token token) { super(Outcome.PutCreatureInPlay); this.token = token; - staticText = "Put an X/X green Ooze creature token onto the battlefield, where X is the number of +1/+1 counters removed this way"; + staticText = "Create an X/X green Ooze creature token, where X is the number of +1/+1 counters removed this way"; } public OozeFluxCreateTokenEffect(final OozeFluxCreateTokenEffect effect) { diff --git a/Mage.Sets/src/mage/cards/o/OozeGarden.java b/Mage.Sets/src/mage/cards/o/OozeGarden.java index 3a56f67655f..0ee1d42328d 100644 --- a/Mage.Sets/src/mage/cards/o/OozeGarden.java +++ b/Mage.Sets/src/mage/cards/o/OozeGarden.java @@ -64,7 +64,7 @@ public class OozeGarden extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{G}"); - // {1}{G}, Sacrifice a non-Ooze creature: Put an X/X green Ooze creature token onto the battlefield, where X is the sacrificed creature's power. Activate this ability only any time you could cast a sorcery. + // {1}{G}, Sacrifice a non-Ooze creature: Create an X/X green Ooze creature token, where X is the sacrificed creature's power. Activate this ability only any time you could cast a sorcery. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new OozeGardenCreateTokenEffect(), new ManaCostsImpl("{1}{G}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true))); this.addAbility(ability); @@ -84,7 +84,7 @@ class OozeGardenCreateTokenEffect extends OneShotEffect { public OozeGardenCreateTokenEffect() { super(Outcome.PutCreatureInPlay); - staticText = "Put an X/X green Ooze creature token onto the battlefield, where X is the sacrificed creature's power"; + staticText = "Create an X/X green Ooze creature token, where X is the sacrificed creature's power"; } public OozeGardenCreateTokenEffect(final OozeGardenCreateTokenEffect effect) { @@ -106,7 +106,7 @@ class OozeGardenCreateTokenEffect extends OneShotEffect { } ArrayList list = new ArrayList<>(); list.add("Ooze"); - Token token = new Token("Ooze", "X/X green Ooze creature token onto the battlefield, where X is the sacrificed creature's power", ObjectColor.GREEN, list, value, value, new AbilitiesImpl<>()) { + Token token = new Token("Ooze", "X/X green Ooze creature token, where X is the sacrificed creature's power", ObjectColor.GREEN, list, value, value, new AbilitiesImpl<>()) { }; diff --git a/Mage.Sets/src/mage/cards/o/Ophiomancer.java b/Mage.Sets/src/mage/cards/o/Ophiomancer.java index 9140a6ee22c..ddf9e606cab 100644 --- a/Mage.Sets/src/mage/cards/o/Ophiomancer.java +++ b/Mage.Sets/src/mage/cards/o/Ophiomancer.java @@ -56,11 +56,11 @@ public class Ophiomancer extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // At the beginning of each upkeep, if you control no Snakes, put a 1/1 black Snake creature token with deathtouch onto the battlefield. + // At the beginning of each upkeep, if you control no Snakes, create a 1/1 black Snake creature token with deathtouch. this.addAbility(new ConditionalTriggeredAbility( new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new OphiomancerSnakeToken()), TargetController.ANY, false), new PermanentsOnTheBattlefieldCondition(new FilterCreaturePermanent("Snake", "no Snakes"), PermanentsOnTheBattlefieldCondition.CountType.EQUAL_TO, 0), - "At the beginning of each upkeep, if you control no Snakes, put a 1/1 black Snake creature token with deathtouch onto the battlefield.")); + "At the beginning of each upkeep, if you control no Snakes, create a 1/1 black Snake creature token with deathtouch.")); } public Ophiomancer(final Ophiomancer card) { diff --git a/Mage.Sets/src/mage/cards/o/OrderedMigration.java b/Mage.Sets/src/mage/cards/o/OrderedMigration.java index cfa4a0dd18d..66c3c68451f 100644 --- a/Mage.Sets/src/mage/cards/o/OrderedMigration.java +++ b/Mage.Sets/src/mage/cards/o/OrderedMigration.java @@ -40,14 +40,14 @@ import mage.game.permanent.token.Token; /** * * @author LoneFox - + * */ public class OrderedMigration extends CardImpl { public OrderedMigration(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{W}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{W}{U}"); - // Domain - Put a 1/1 blue Bird creature token with flying onto the battlefield for each basic land type among lands you control. + // Domain - Create a 1/1 blue Bird creature token with flying for each basic land type among lands you control. this.getSpellAbility().addEffect(new CreateTokenEffect(new BirdToken(), new DomainValue())); } @@ -64,6 +64,7 @@ public class OrderedMigration extends CardImpl { // TODO: There is a player rewards token for this (http://magiccards.info/extra/token/player-rewards-2001/bird.html), // but player rewards tokens are not downloaded... class BirdToken extends Token { + public BirdToken() { super("Bird", "1/1 blue Bird creature token with flying"); cardType.add(CardType.CREATURE); diff --git a/Mage.Sets/src/mage/cards/o/Ornitharch.java b/Mage.Sets/src/mage/cards/o/Ornitharch.java index 8ea7a1182bf..a33c1a72a97 100644 --- a/Mage.Sets/src/mage/cards/o/Ornitharch.java +++ b/Mage.Sets/src/mage/cards/o/Ornitharch.java @@ -58,10 +58,10 @@ public class Ornitharch extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Tribute 2 this.addAbility(new TributeAbility(2)); - // When Ornitharch enters the battlefield, if tribute wasn't paid, put two 1/1 white Bird creature tokens with flying onto the battlefield. + // When Ornitharch enters the battlefield, if tribute wasn't paid, create two 1/1 white Bird creature tokens with flying. TriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new BirdToken(), 2), false); this.addAbility(new ConditionalTriggeredAbility(ability, TributeNotPaidCondition.getInstance(), - "When {this} enters the battlefield, if its tribute wasn't paid, put two 1/1 white Bird creature tokens with flying onto the battlefield.")); + "When {this} enters the battlefield, if its tribute wasn't paid, create two 1/1 white Bird creature tokens with flying.")); } public Ornitharch(final Ornitharch card) { diff --git a/Mage.Sets/src/mage/cards/o/OrochiEggwatcher.java b/Mage.Sets/src/mage/cards/o/OrochiEggwatcher.java index 163d7806239..79cdaa939f8 100644 --- a/Mage.Sets/src/mage/cards/o/OrochiEggwatcher.java +++ b/Mage.Sets/src/mage/cards/o/OrochiEggwatcher.java @@ -69,7 +69,7 @@ public class OrochiEggwatcher extends CardImpl { this.flipCard = true; this.flipCardName = "Shidako, Broodmistress"; - // {2}{G}, {T}: Put a 1/1 green Snake creature token onto the battlefield. If you control ten or more creatures, flip Orochi Eggwatcher. + // {2}{G}, {T}: Create a 1/1 green Snake creature token. If you control ten or more creatures, flip Orochi Eggwatcher. Ability ability; ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SnakeToken()),new ManaCostsImpl("{2}{G}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/o/OrochiHatchery.java b/Mage.Sets/src/mage/cards/o/OrochiHatchery.java index c3028024e22..f22b12476eb 100644 --- a/Mage.Sets/src/mage/cards/o/OrochiHatchery.java +++ b/Mage.Sets/src/mage/cards/o/OrochiHatchery.java @@ -54,7 +54,7 @@ public class OrochiHatchery extends CardImpl { // Orochi Hatchery enters the battlefield with X charge counters on it. this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.CHARGE.createInstance()))); - // {5}, {T}: Put a 1/1 green Snake creature token onto the battlefield for each charge counter on Orochi Hatchery. + // {5}, {T}: Create a 1/1 green Snake creature token for each charge counter on Orochi Hatchery. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SnakeToken(), new CountersSourceCount(CounterType.CHARGE)), new GenericManaCost(5)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OtherworldlyOutburst.java b/Mage.Sets/src/mage/cards/o/OtherworldlyOutburst.java index 3229d72ebd2..1681d85c027 100644 --- a/Mage.Sets/src/mage/cards/o/OtherworldlyOutburst.java +++ b/Mage.Sets/src/mage/cards/o/OtherworldlyOutburst.java @@ -55,7 +55,7 @@ public class OtherworldlyOutburst extends CardImpl { public OtherworldlyOutburst(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{R}"); - // Target creature gets +1/+0 until end of turn. When that creature dies this turn, put a 3/2 colorless Eldrazi Horror creature token onto the battlefield. + // Target creature gets +1/+0 until end of turn. When that creature dies this turn, create a 3/2 colorless Eldrazi Horror creature token. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(1, 0, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new OtherworldlyOutburstEffect()); @@ -75,7 +75,7 @@ class OtherworldlyOutburstEffect extends OneShotEffect { public OtherworldlyOutburstEffect() { super(Outcome.UnboostCreature); - this.staticText = "When that creature dies this turn, put a 3/2 colorless Eldrazi Horror creature token onto the battlefield"; + this.staticText = "When that creature dies this turn, create a 3/2 colorless Eldrazi Horror creature token"; } public OtherworldlyOutburstEffect(final OtherworldlyOutburstEffect effect) { @@ -131,6 +131,6 @@ class OtherworldlyOutburstDelayedTriggeredAbility extends DelayedTriggeredAbilit @Override public String getRule() { - return "When that creature dies this turn, put a 3/2 colorless Eldrazi Horror creature token onto the battlefield."; + return "When that creature dies this turn, create a 3/2 colorless Eldrazi Horror creature token."; } } diff --git a/Mage.Sets/src/mage/cards/o/Overburden.java b/Mage.Sets/src/mage/cards/o/Overburden.java index 3a26b21a689..8c963aec68b 100644 --- a/Mage.Sets/src/mage/cards/o/Overburden.java +++ b/Mage.Sets/src/mage/cards/o/Overburden.java @@ -28,7 +28,6 @@ package mage.cards.o; import java.util.UUID; - import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.effects.common.ReturnToHandChosenPermanentEffect; import mage.cards.CardImpl; @@ -56,18 +55,17 @@ public class Overburden extends CardImpl { } public Overburden(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); - // Whenever a player puts a nontoken creature onto the battlefield, - // that player returns a land he or she controls to its owner's hand. + // Whenever a player puts a nontoken creature onto the battlefield, that player returns a land he or she controls to its owner's hand. this.addAbility(new EntersBattlefieldAllTriggeredAbility( Zone.BATTLEFIELD, new ReturnToHandChosenPermanentEffect(RETURN_FILTER), ENTERS_BATTLEFIELD_FILTER, false, SetTargetPointer.PLAYER, - "Whenever a player puts a nontoken creature onto the battlefield," + - " that player returns a land he or she controls to its owner's hand.")); + "Whenever a player puts a nontoken creature onto the battlefield," + + " that player returns a land he or she controls to its owner's hand.")); } public Overburden(final Overburden card) { diff --git a/Mage.Sets/src/mage/cards/o/OverseerOfTheDamned.java b/Mage.Sets/src/mage/cards/o/OverseerOfTheDamned.java index cfd1b002a37..9b844e31374 100644 --- a/Mage.Sets/src/mage/cards/o/OverseerOfTheDamned.java +++ b/Mage.Sets/src/mage/cards/o/OverseerOfTheDamned.java @@ -73,7 +73,7 @@ public class OverseerOfTheDamned extends CardImpl { Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), true); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); - // Whenever a nontoken creature an opponent controls dies, put a 2/2 black Zombie creature token onto the battlefield tapped. + // Whenever a nontoken creature an opponent controls dies, create a 2/2 black Zombie creature token tapped. Token zombie = new ZombieToken(); zombie.setTokenType(2); this.addAbility(new DiesCreatureTriggeredAbility(new CreateTokenEffect(zombie, 1, true, false), false, filter)); diff --git a/Mage.Sets/src/mage/cards/o/OyobiWhoSplitTheHeavens.java b/Mage.Sets/src/mage/cards/o/OyobiWhoSplitTheHeavens.java index db8c380199d..22d0d5e2cd9 100644 --- a/Mage.Sets/src/mage/cards/o/OyobiWhoSplitTheHeavens.java +++ b/Mage.Sets/src/mage/cards/o/OyobiWhoSplitTheHeavens.java @@ -54,7 +54,7 @@ public class OyobiWhoSplitTheHeavens extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(6); this.addAbility(FlyingAbility.getInstance()); - // Whenever you cast a Spirit or Arcane spell, put a 3/3 white Spirit creature token with flying onto the battlefield. + // Whenever you cast a Spirit or Arcane spell, create a 3/3 white Spirit creature token with flying. this.addAbility(new SpellCastControllerTriggeredAbility(new CreateTokenEffect(new AnotherSpiritToken()), filter, false)); } diff --git a/Mage.Sets/src/mage/cards/p/PackGuardian.java b/Mage.Sets/src/mage/cards/p/PackGuardian.java index 381be1629fb..095a2ca0abd 100644 --- a/Mage.Sets/src/mage/cards/p/PackGuardian.java +++ b/Mage.Sets/src/mage/cards/p/PackGuardian.java @@ -56,7 +56,7 @@ public class PackGuardian extends CardImpl { // Flash this.addAbility(FlashAbility.getInstance()); - // When Pack Guardian enters the battlefield, you may discard a land card. If you do, put a 2/2 green Wolf creature token onto the battlefield. + // When Pack Guardian enters the battlefield, you may discard a land card. If you do, create a 2/2 green Wolf creature token. this.addAbility(new EntersBattlefieldTriggeredAbility(new DoIfCostPaid(new CreateTokenEffect(new WolfToken()), new DiscardCardCost(new FilterLandCard())))); } diff --git a/Mage.Sets/src/mage/cards/p/PackRat.java b/Mage.Sets/src/mage/cards/p/PackRat.java index 69e008d54d6..ae6e0a22561 100644 --- a/Mage.Sets/src/mage/cards/p/PackRat.java +++ b/Mage.Sets/src/mage/cards/p/PackRat.java @@ -81,7 +81,7 @@ public class PackRat extends CardImpl { // Pack Rat's power and toughness are each equal to the number of Rats you control. this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Duration.EndOfGame))); - // {2}{B}, Discard a card: Put a token onto the battlefield that's a copy of Pack Rat. + // {2}{B}, Discard a card: Create a token that's a copy of Pack Rat. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutTokenOntoBattlefieldCopySourceEffect(), new ManaCostsImpl("{2}{B}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PactOfTheTitan.java b/Mage.Sets/src/mage/cards/p/PactOfTheTitan.java index 15cb188fd34..5f4b5b32f8a 100644 --- a/Mage.Sets/src/mage/cards/p/PactOfTheTitan.java +++ b/Mage.Sets/src/mage/cards/p/PactOfTheTitan.java @@ -49,7 +49,7 @@ public class PactOfTheTitan extends CardImpl { this.color.setRed(true); - // Put a 4/4 red Giant creature token onto the battlefield. + // Create a 4/4 red Giant creature token. this.getSpellAbility().addEffect(new CreateTokenEffect(new GiantToken())); // At the beginning of your next upkeep, pay {4}{R}. If you don't, you lose the game. this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new PactDelayedTriggeredAbility(new ManaCostsImpl("{4}{R}")))); diff --git a/Mage.Sets/src/mage/cards/p/PallidMycoderm.java b/Mage.Sets/src/mage/cards/p/PallidMycoderm.java index aaabf6ef446..e522e707cfc 100644 --- a/Mage.Sets/src/mage/cards/p/PallidMycoderm.java +++ b/Mage.Sets/src/mage/cards/p/PallidMycoderm.java @@ -75,7 +75,7 @@ public class PallidMycoderm extends CardImpl { // At the beginning of your upkeep, put a spore counter on Pallid Mycoderm. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()), TargetController.YOU, false)); - // Remove three spore counters from Pallid Mycoderm: Put a 1/1 green Saproling creature token onto the battlefield. + // Remove three spore counters from Pallid Mycoderm: Create a 1/1 green Saproling creature token. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); // Sacrifice a Saproling: Each creature you control that's a Fungus or a Saproling gets +1/+1 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/p/ParallelEvolution.java b/Mage.Sets/src/mage/cards/p/ParallelEvolution.java index 2b39464c89e..9923541227c 100644 --- a/Mage.Sets/src/mage/cards/p/ParallelEvolution.java +++ b/Mage.Sets/src/mage/cards/p/ParallelEvolution.java @@ -56,7 +56,7 @@ public class ParallelEvolution extends CardImpl { public ParallelEvolution(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{G}{G}"); - // For each creature token on the battlefield, its controller puts a token that's a copy of that creature onto the battlefield. + // For each creature token on the battlefield, its controller creates a token that's a copy of that creature. this.getSpellAbility().addEffect(new ParallelEvolutionEffect()); // Flashback {4}{G}{G}{G} @@ -84,7 +84,7 @@ class ParallelEvolutionEffect extends OneShotEffect { public ParallelEvolutionEffect() { super(Outcome.Neutral); - this.staticText = "For each creature token on the battlefield, its controller puts a token that's a copy of that creature onto the battlefield"; + this.staticText = "For each creature token on the battlefield, its controller creates a token that's a copy of that creature"; } public ParallelEvolutionEffect(final ParallelEvolutionEffect effect) { diff --git a/Mage.Sets/src/mage/cards/p/ParallelLives.java b/Mage.Sets/src/mage/cards/p/ParallelLives.java index 28db1d2688b..196687d51cf 100644 --- a/Mage.Sets/src/mage/cards/p/ParallelLives.java +++ b/Mage.Sets/src/mage/cards/p/ParallelLives.java @@ -51,7 +51,7 @@ public class ParallelLives extends CardImpl { public ParallelLives(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{G}"); - // If an effect would put one or more tokens onto the battlefield under your control, it puts twice that many of those tokens onto the battlefield instead. + // If an effect would create one or more tokens under your control, it creates twice that many of those tokens instead. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ParallelLivesEffect())); } @@ -69,7 +69,7 @@ class ParallelLivesEffect extends ReplacementEffectImpl { public ParallelLivesEffect() { super(Duration.WhileOnBattlefield, Outcome.Copy); - staticText = "If an effect would put one or more tokens onto the battlefield under your control, it puts twice that many of those tokens onto the battlefield instead"; + staticText = "If an effect would create one or more tokens under your control, it creates twice that many of those tokens instead"; } public ParallelLivesEffect(final ParallelLivesEffect effect) { diff --git a/Mage.Sets/src/mage/cards/p/PatagiaViper.java b/Mage.Sets/src/mage/cards/p/PatagiaViper.java index 3983159bcd6..29d6cac51ba 100644 --- a/Mage.Sets/src/mage/cards/p/PatagiaViper.java +++ b/Mage.Sets/src/mage/cards/p/PatagiaViper.java @@ -57,7 +57,7 @@ public class PatagiaViper extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // When Patagia Viper enters the battlefield, put two 1/1 green and blue Snake creature tokens onto the battlefield. + // When Patagia Viper enters the battlefield, create two 1/1 green and blue Snake creature tokens. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new PatagiaViperSnakeToken(), 2), false)); // When Patagia Viper enters the battlefield, sacrifice it unless {U} was spent to cast it. diff --git a/Mage.Sets/src/mage/cards/p/PatrolSignaler.java b/Mage.Sets/src/mage/cards/p/PatrolSignaler.java index 3d1bba4e0e6..52c5d2aa997 100644 --- a/Mage.Sets/src/mage/cards/p/PatrolSignaler.java +++ b/Mage.Sets/src/mage/cards/p/PatrolSignaler.java @@ -54,7 +54,7 @@ public class PatrolSignaler extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // {1}{W}, {untap}: Put a 1/1 white Kithkin Soldier creature token onto the battlefield. + // {1}{W}, {untap}: Create a 1/1 white Kithkin Soldier creature token. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new KithkinToken()), new ManaCostsImpl("{1}{W}")); ability.addCost(new UntapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PawnOfUlamog.java b/Mage.Sets/src/mage/cards/p/PawnOfUlamog.java index 37b014bfce1..e7d2c0e1b6a 100644 --- a/Mage.Sets/src/mage/cards/p/PawnOfUlamog.java +++ b/Mage.Sets/src/mage/cards/p/PawnOfUlamog.java @@ -112,6 +112,6 @@ class PawnOfUlamogTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever Pawn of Ulamog or another nontoken creature you control dies, you may put a 0/1 colorless Eldrazi Spawn creature token onto the battlefield. It has \"Sacrifice this creature: Add {C} to your mana pool.\""; + return "Whenever Pawn of Ulamog or another nontoken creature you control dies, you may create a 0/1 colorless Eldrazi Spawn creature token. It has \"Sacrifice this creature: Add {C} to your mana pool.\""; } } diff --git a/Mage.Sets/src/mage/cards/p/PegasusRefuge.java b/Mage.Sets/src/mage/cards/p/PegasusRefuge.java index 7ecbb7750ca..b3d49c25baa 100644 --- a/Mage.Sets/src/mage/cards/p/PegasusRefuge.java +++ b/Mage.Sets/src/mage/cards/p/PegasusRefuge.java @@ -48,7 +48,7 @@ public class PegasusRefuge extends CardImpl { public PegasusRefuge(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{W}"); - // {2}, Discard a card: Put a 1/1 white Pegasus creature token with flying onto the battlefield. + // {2}, Discard a card: Create a 1/1 white Pegasus creature token with flying. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new PegasusToken()), new ManaCostsImpl("{2}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PegasusStampede.java b/Mage.Sets/src/mage/cards/p/PegasusStampede.java index 15401034238..ad2e614427b 100644 --- a/Mage.Sets/src/mage/cards/p/PegasusStampede.java +++ b/Mage.Sets/src/mage/cards/p/PegasusStampede.java @@ -50,7 +50,7 @@ public class PegasusStampede extends CardImpl { // Buyback-Sacrifice a land. this.addAbility(new BuybackAbility(new SacrificeTargetCost(new TargetControlledPermanent(1,1, new FilterControlledLandPermanent(), true)))); - // Put a 1/1 white Pegasus creature token with flying onto the battlefield. + // Create a 1/1 white Pegasus creature token with flying. this.getSpellAbility().addEffect(new CreateTokenEffect(new PegasusToken())); } diff --git a/Mage.Sets/src/mage/cards/p/Pentavus.java b/Mage.Sets/src/mage/cards/p/Pentavus.java index f4a31ddc18c..ce39ca2affc 100644 --- a/Mage.Sets/src/mage/cards/p/Pentavus.java +++ b/Mage.Sets/src/mage/cards/p/Pentavus.java @@ -71,7 +71,7 @@ public class Pentavus extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(5)), "with five +1/+1 counters on it")); - // {1}, Remove a +1/+1 counter from Pentavus: Put a 1/1 colorless Pentavite artifact creature token with flying onto the battlefield. + // {1}, Remove a +1/+1 counter from Pentavus: Create a 1/1 colorless Pentavite artifact creature token with flying. Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new PentaviteToken(), 1), new GenericManaCost(1)); firstAbility.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); this.addAbility(firstAbility); diff --git a/Mage.Sets/src/mage/cards/p/PenumbraSpider.java b/Mage.Sets/src/mage/cards/p/PenumbraSpider.java index 28ec8bae7a2..14eed30be49 100644 --- a/Mage.Sets/src/mage/cards/p/PenumbraSpider.java +++ b/Mage.Sets/src/mage/cards/p/PenumbraSpider.java @@ -52,7 +52,7 @@ public class PenumbraSpider extends CardImpl { // Reach this.addAbility(ReachAbility.getInstance()); - // When Penumbra Spider dies, put a 2/4 black Spider creature token with reach onto the battlefield. + // When Penumbra Spider dies, create a 2/4 black Spider creature token with reach. this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new SpiderToken()), false)); } diff --git a/Mage.Sets/src/mage/cards/p/PenumbraWurm.java b/Mage.Sets/src/mage/cards/p/PenumbraWurm.java index 5bb1ba31080..9f46401fbb8 100644 --- a/Mage.Sets/src/mage/cards/p/PenumbraWurm.java +++ b/Mage.Sets/src/mage/cards/p/PenumbraWurm.java @@ -53,7 +53,7 @@ public class PenumbraWurm extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); - // When Penumbra Wurm dies, put a 6/6 black Wurm creature token with trample onto the battlefield. + // When Penumbra Wurm dies, create a 6/6 black Wurm creature token with trample. this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new PenumbraWurmToken(), 1), false)); } diff --git a/Mage.Sets/src/mage/cards/p/PharikaGodOfAffliction.java b/Mage.Sets/src/mage/cards/p/PharikaGodOfAffliction.java index 8ae48c19c79..e65595e80ed 100644 --- a/Mage.Sets/src/mage/cards/p/PharikaGodOfAffliction.java +++ b/Mage.Sets/src/mage/cards/p/PharikaGodOfAffliction.java @@ -73,7 +73,7 @@ public class PharikaGodOfAffliction extends CardImpl { Effect effect = new LoseCreatureTypeSourceEffect(new DevotionCount(ColoredManaSymbol.B, ColoredManaSymbol.G), 7); effect.setText("As long as your devotion to black and green is less than seven, Pharika isn't a creature"); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); - // {B}{G}: Exile target creature card from a graveyard. It's owner puts a 1/1 black and green Snake enchantment creature token with deathtouch onto the battlefield. + // {B}{G}: Exile target creature card from a graveyard. It's owner creates a 1/1 black and green Snake enchantment creature token with deathtouch. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PharikaExileEffect(), new ManaCostsImpl("{B}{G}")); Target target = new TargetCardInGraveyard(new FilterCreatureCard("a creature card from a graveyard")); ability.addTarget(target); @@ -95,7 +95,7 @@ class PharikaExileEffect extends OneShotEffect { public PharikaExileEffect() { super(Outcome.PutCreatureInPlay); - staticText = "Exile target creature card from a graveyard. It's owner puts a 1/1 black and green Snake enchantment creature token with deathtouch onto the battlefield"; + staticText = "Exile target creature card from a graveyard. It's owner creates a 1/1 black and green Snake enchantment creature token with deathtouch"; } public PharikaExileEffect(final PharikaExileEffect effect) { diff --git a/Mage.Sets/src/mage/cards/p/Phelddagrif.java b/Mage.Sets/src/mage/cards/p/Phelddagrif.java index ebb57ef14ac..3a27933023c 100644 --- a/Mage.Sets/src/mage/cards/p/Phelddagrif.java +++ b/Mage.Sets/src/mage/cards/p/Phelddagrif.java @@ -61,7 +61,7 @@ public class Phelddagrif extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); - // {G}: Phelddagrif gains trample until end of turn. Target opponent puts a 1/1 green Hippo creature token onto the battlefield. + // {G}: Phelddagrif gains trample until end of turn. Target opponent creates a 1/1 green Hippo creature token. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn),new ManaCostsImpl("{G}")); ability.addEffect(new CreateTokenTargetEffect(new HippoToken())); ability.addTarget(new TargetOpponent()); diff --git a/Mage.Sets/src/mage/cards/p/PheresBandRaiders.java b/Mage.Sets/src/mage/cards/p/PheresBandRaiders.java index d0829d1a3ca..fd6d8f34c56 100644 --- a/Mage.Sets/src/mage/cards/p/PheresBandRaiders.java +++ b/Mage.Sets/src/mage/cards/p/PheresBandRaiders.java @@ -52,7 +52,7 @@ public class PheresBandRaiders extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); - // Inspired - Whenever Pheres-Band Raiders becomes untapped, you may pay {2}{G}. If you do, put a 3/3 green Centaur enchantment creature token onto the battlefield. + // Inspired - Whenever Pheres-Band Raiders becomes untapped, you may pay {2}{G}. If you do, create a 3/3 green Centaur enchantment creature token. this.addAbility(new InspiredAbility(new DoIfCostPaid(new CreateTokenEffect(new CentaurEnchantmentCreatureToken()), new ManaCostsImpl("{2}{G}")))); } diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianProcessor.java b/Mage.Sets/src/mage/cards/p/PhyrexianProcessor.java index a0073a121e5..862e1416a89 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianProcessor.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianProcessor.java @@ -56,7 +56,7 @@ public class PhyrexianProcessor extends CardImpl { // As {this} enters the battlefield, pay any amount of life. this.addAbility(new EntersBattlefieldTriggeredAbility(new PhyrexianProcessorEffect())); - // {4}, {tap}: Put an X/X black Minion creature token onto the battlefield, where X is the life paid as {this} entered the battlefield. + // {4}, {tap}: Create an X/X black Minion creature token, where X is the life paid as {this} entered the battlefield. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PhyrexianProcessorCreateTokenEffect(), new ManaCostsImpl("{4}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); @@ -109,7 +109,7 @@ class PhyrexianProcessorCreateTokenEffect extends OneShotEffect { public PhyrexianProcessorCreateTokenEffect() { super(Outcome.PutCreatureInPlay); - staticText = "Put an X/X black Minion creature token onto the battlefield"; + staticText = "Create an X/X black Minion creature token"; } public PhyrexianProcessorCreateTokenEffect(PhyrexianProcessorCreateTokenEffect ability) { diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianRebirth.java b/Mage.Sets/src/mage/cards/p/PhyrexianRebirth.java index 7363795af46..8870e2879bd 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianRebirth.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianRebirth.java @@ -49,7 +49,7 @@ public class PhyrexianRebirth extends CardImpl { public PhyrexianRebirth(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{W}{W}"); - // Destroy all creatures, then put an X/X colorless Horror artifact creature token onto the battlefield, where X is the number of creatures destroyed this way. + // Destroy all creatures, then create an X/X colorless Horror artifact creature token, where X is the number of creatures destroyed this way. this.getSpellAbility().addEffect(new PhyrexianRebirthEffect()); } @@ -66,7 +66,7 @@ public class PhyrexianRebirth extends CardImpl { public PhyrexianRebirthEffect() { super(Outcome.DestroyPermanent); - staticText = "Destroy all creatures, then put an X/X colorless Horror artifact creature token onto the battlefield, where X is the number of creatures destroyed this way"; + staticText = "Destroy all creatures, then create an X/X colorless Horror artifact creature token, where X is the number of creatures destroyed this way"; } public PhyrexianRebirthEffect(PhyrexianRebirthEffect ability) { diff --git a/Mage.Sets/src/mage/cards/p/PiaAndKiranNalaar.java b/Mage.Sets/src/mage/cards/p/PiaAndKiranNalaar.java index 7d2ee80ec6d..d1a794487f9 100644 --- a/Mage.Sets/src/mage/cards/p/PiaAndKiranNalaar.java +++ b/Mage.Sets/src/mage/cards/p/PiaAndKiranNalaar.java @@ -60,9 +60,9 @@ public class PiaAndKiranNalaar extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // When Pia and Kiran Nalaar enters the battlefield, put two 1/1 colorless Thopter artifact creature tokens with flying onto the battlefield. + // When Pia and Kiran Nalaar enters the battlefield, create two 1/1 colorless Thopter artifact creature tokens with flying. Effect effect = new CreateTokenEffect(new ThopterColorlessToken(), 2); - effect.setText("put two 1/1 colorless Thopter artifact creature tokens with flying onto the battlefield"); + 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. diff --git a/Mage.Sets/src/mage/cards/p/PlagueOfVermin.java b/Mage.Sets/src/mage/cards/p/PlagueOfVermin.java index d4c784fafce..a116e5869ac 100644 --- a/Mage.Sets/src/mage/cards/p/PlagueOfVermin.java +++ b/Mage.Sets/src/mage/cards/p/PlagueOfVermin.java @@ -52,7 +52,7 @@ public class PlagueOfVermin extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{6}{B}"); - // Starting with you, each player may pay any amount of life. Repeat this process until no one pays life. Each player puts a 1/1 black Rat creature token onto the battlefield for each 1 life he or she paid this way. + // Starting with you, each player may pay any amount of life. Repeat this process until no one pays life. Each player creates a 1/1 black Rat creature token for each 1 life he or she paid this way. this.getSpellAbility().addEffect(new PlagueOfVerminEffect()); } @@ -71,7 +71,7 @@ class PlagueOfVerminEffect extends OneShotEffect { public PlagueOfVerminEffect() { super(Outcome.PutCardInPlay); - this.staticText = "Starting with you, each player may pay any amount of life. Repeat this process until no one pays life. Each player puts a 1/1 black Rat creature token onto the battlefield for each 1 life he or she paid this way."; + this.staticText = "Starting with you, each player may pay any amount of life. Repeat this process until no one pays life. Each player creates a 1/1 black Rat creature token for each 1 life he or she paid this way."; } public PlagueOfVerminEffect(final PlagueOfVerminEffect effect) { diff --git a/Mage.Sets/src/mage/cards/p/PollenbrightWings.java b/Mage.Sets/src/mage/cards/p/PollenbrightWings.java index 5c3092c91cb..9ad21ff9061 100644 --- a/Mage.Sets/src/mage/cards/p/PollenbrightWings.java +++ b/Mage.Sets/src/mage/cards/p/PollenbrightWings.java @@ -73,7 +73,7 @@ public class PollenbrightWings extends CardImpl { this.addAbility(ability); // Enchanted creature has flying. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield))); - // Whenever enchanted creature deals combat damage to a player, put that many 1/1 green Saproling creature tokens onto the battlefield. + // Whenever enchanted creature deals combat damage to a player, create that many 1/1 green Saproling creature tokens. this.addAbility(new PollenbrightWingsAbility()); } @@ -121,7 +121,7 @@ class PollenbrightWingsAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever enchanted creature deals combat damage to a player, put that many 1/1 green Saproling creature tokens onto the battlefield."; + return "Whenever enchanted creature deals combat damage to a player, create that many 1/1 green Saproling creature tokens."; } } @@ -129,7 +129,7 @@ class PollenbrightWingsEffect extends OneShotEffect { public PollenbrightWingsEffect() { super(Outcome.Benefit); - this.staticText = "put that many 1/1 green Saproling creature tokens onto the battlefield"; + this.staticText = "create that many 1/1 green Saproling creature tokens"; } public PollenbrightWingsEffect(final PollenbrightWingsEffect effect) { diff --git a/Mage.Sets/src/mage/cards/p/Pongify.java b/Mage.Sets/src/mage/cards/p/Pongify.java index 49c9f32ba8f..a0f9369650e 100644 --- a/Mage.Sets/src/mage/cards/p/Pongify.java +++ b/Mage.Sets/src/mage/cards/p/Pongify.java @@ -52,7 +52,7 @@ public class Pongify extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{U}"); - // Destroy target creature. It can't be regenerated. That creature's controller puts a 3/3 green Ape creature token onto the battlefield. + // Destroy target creature. It can't be regenerated. That creature's controller creates a 3/3 green Ape creature token. this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); this.getSpellAbility().addEffect(new PongifyEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); @@ -72,7 +72,7 @@ class PongifyEffect extends OneShotEffect { public PongifyEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "That creature's controller puts a 3/3 green Ape creature token onto the battlefield"; + this.staticText = "That creature's controller creates a 3/3 green Ape creature token"; } public PongifyEffect(final PongifyEffect effect) { diff --git a/Mage.Sets/src/mage/cards/p/PonybackBrigade.java b/Mage.Sets/src/mage/cards/p/PonybackBrigade.java index 172de96bf14..1707a729d41 100644 --- a/Mage.Sets/src/mage/cards/p/PonybackBrigade.java +++ b/Mage.Sets/src/mage/cards/p/PonybackBrigade.java @@ -58,7 +58,7 @@ public class PonybackBrigade extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // When Ponyback Brigade enters the battlefield or is turned face up, put three 1/1 red Goblin creature tokens onto the battlefield. + // When Ponyback Brigade enters the battlefield or is turned face up, create three 1/1 red Goblin creature tokens. this.addAbility(new PonybackBrigadeAbility(new GoblinToken())); // Morph {2}{R}{W}{B} diff --git a/Mage.Sets/src/mage/cards/p/PrecinctCaptain.java b/Mage.Sets/src/mage/cards/p/PrecinctCaptain.java index 01298e81139..6caa2b3c828 100644 --- a/Mage.Sets/src/mage/cards/p/PrecinctCaptain.java +++ b/Mage.Sets/src/mage/cards/p/PrecinctCaptain.java @@ -28,13 +28,13 @@ package mage.cards.p; import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.permanent.token.SoldierToken; /** @@ -44,7 +44,7 @@ import mage.game.permanent.token.SoldierToken; public class PrecinctCaptain extends CardImpl { public PrecinctCaptain(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{W}{W}"); this.subtype.add("Human"); this.subtype.add("Soldier"); @@ -53,7 +53,7 @@ public class PrecinctCaptain extends CardImpl { // First strike this.addAbility(FirstStrikeAbility.getInstance()); - // Whenever Precinct Captain deals combat damage to a player, put a 1/1 white Soldier creature token onto the battlefield. + // Whenever Precinct Captain deals combat damage to a player, create a 1/1 white Soldier creature token. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new CreateTokenEffect(new SoldierToken()), false)); } diff --git a/Mage.Sets/src/mage/cards/p/PrecursorGolem.java b/Mage.Sets/src/mage/cards/p/PrecursorGolem.java index f88ece0abe6..edfbb4d109e 100644 --- a/Mage.Sets/src/mage/cards/p/PrecursorGolem.java +++ b/Mage.Sets/src/mage/cards/p/PrecursorGolem.java @@ -62,7 +62,7 @@ public class PrecursorGolem extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - // When Precursor Golem enters the battlefield, put two 3/3 colorless Golem artifact creature tokens onto the battlefield. + // When Precursor Golem enters the battlefield, create two 3/3 colorless Golem artifact creature tokens. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new GolemToken(), 2), false)); // Whenever a player casts an instant or sorcery spell that targets only a single Golem, that player copies that spell for each other Golem that spell could target. Each copy targets a different one of those Golems. diff --git a/Mage.Sets/src/mage/cards/p/PredatorsHowl.java b/Mage.Sets/src/mage/cards/p/PredatorsHowl.java index 7975458193c..8ed951092c6 100644 --- a/Mage.Sets/src/mage/cards/p/PredatorsHowl.java +++ b/Mage.Sets/src/mage/cards/p/PredatorsHowl.java @@ -46,13 +46,13 @@ public class PredatorsHowl extends CardImpl { public PredatorsHowl(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{G}"); - // Put a 2/2 green Wolf creature token onto the battlefield. - // Morbid - Put three 2/2 green Wolf creature tokens onto the battlefield instead if a creature died this turn. + // Create a 2/2 green Wolf creature token. + // Morbid - Create three 2/2 green Wolf creature tokens instead if a creature died this turn. Effect effect = new ConditionalOneShotEffect( new CreateTokenEffect(new WolfToken(), 3), new CreateTokenEffect(new WolfToken(), 1), new MorbidCondition(), - "Put a 2/2 green Wolf creature token onto the battlefield.

Morbid - Put three 2/2 green Wolf creature tokens onto the battlefield instead if a creature died this turn."); + "Create a 2/2 green Wolf creature token.

Morbid - Create three 2/2 green Wolf creature tokens instead if a creature died this turn."); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/cards/p/PredatoryAdvantage.java b/Mage.Sets/src/mage/cards/p/PredatoryAdvantage.java index 756579f5186..2a0ef2c0045 100644 --- a/Mage.Sets/src/mage/cards/p/PredatoryAdvantage.java +++ b/Mage.Sets/src/mage/cards/p/PredatoryAdvantage.java @@ -58,7 +58,7 @@ public class PredatoryAdvantage extends CardImpl { - // At the beginning of each opponent's end step, if that player didn't cast a creature spell this turn, put a 2/2 green Lizard creature token onto the battlefield. + // At the beginning of each opponent's end step, if that player didn't cast a creature spell this turn, create a 2/2 green Lizard creature token. this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new LizardToken()), TargetController.OPPONENT, new DidNotCastCreatureCondition(), false), new CastCreatureWatcher()); } @@ -124,7 +124,7 @@ class CastCreatureWatcher extends Watcher { class LizardToken extends Token { public LizardToken() { - super("Lizard", "2/2 green Lizard creature token onto the battlefield"); + super("Lizard", "2/2 green Lizard creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add("Lizard"); diff --git a/Mage.Sets/src/mage/cards/p/PresenceOfGond.java b/Mage.Sets/src/mage/cards/p/PresenceOfGond.java index 0e6c9dd1a2d..a8bb0854413 100644 --- a/Mage.Sets/src/mage/cards/p/PresenceOfGond.java +++ b/Mage.Sets/src/mage/cards/p/PresenceOfGond.java @@ -65,10 +65,10 @@ public class PresenceOfGond extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // Enchanted creature has "{tap}: Put a 1/1 green Elf Warrior creature token onto the battlefield." + // Enchanted creature has "{tap}: Create a 1/1 green Elf Warrior creature token." Ability abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ElfToken()), new TapSourceCost()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(abilityToGain, AttachmentType.AURA, Duration.WhileOnBattlefield, - "Enchanted creature has \"{t}: Put a 1/1 green Elf Warrior creature token onto the battlefield.\""))); + "Enchanted creature has \"{t}: Create a 1/1 green Elf Warrior creature token.\""))); } public PresenceOfGond(final PresenceOfGond card) { diff --git a/Mage.Sets/src/mage/cards/p/PressForAnswers.java b/Mage.Sets/src/mage/cards/p/PressForAnswers.java index 6372d2b7a07..5a9aece4e0e 100644 --- a/Mage.Sets/src/mage/cards/p/PressForAnswers.java +++ b/Mage.Sets/src/mage/cards/p/PressForAnswers.java @@ -51,9 +51,9 @@ public class PressForAnswers extends CardImpl { this.getSpellAbility().addEffect(new TapTargetEffect()); this.getSpellAbility().addEffect(new DontUntapInControllersNextUntapStepTargetEffect("It")); - // Investigate. (Put a colorless Clue artifact token onto the battlefield with "2, Sacrifice this artifact: Draw a card.") + // Investigate. (Create a colorless Clue artifact token with "2, Sacrifice this artifact: Draw a card.") Effect effect = new InvestigateEffect(); - effect.setText("
Investigate. (Put a colorless Clue artifact token onto the battlefield with \"2, Sacrifice this artifact: Draw a card.\")"); + effect.setText("
Investigate. (Create a colorless Clue artifact token with \"2, Sacrifice this artifact: Draw a card.\")"); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/cards/p/PrideOfTheClouds.java b/Mage.Sets/src/mage/cards/p/PrideOfTheClouds.java index 233f951da61..91db4b1cae5 100644 --- a/Mage.Sets/src/mage/cards/p/PrideOfTheClouds.java +++ b/Mage.Sets/src/mage/cards/p/PrideOfTheClouds.java @@ -73,7 +73,7 @@ public class PrideOfTheClouds extends CardImpl { DynamicValue xValue = new PermanentsOnBattlefieldCount(filter); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(xValue, xValue, Duration.WhileOnBattlefield))); - // Forecast - {2}{W}{U}, Reveal Pride of the Clouds from your hand: Put a 1/1 white and blue Bird creature token with flying onto the battlefield. + // Forecast - {2}{W}{U}, Reveal Pride of the Clouds from your hand: Create a 1/1 white and blue Bird creature token with flying. this.addAbility(new ForecastAbility(new CreateTokenEffect(new BirdToken()), new ManaCostsImpl("{2}{W}{U}"))); } diff --git a/Mage.Sets/src/mage/cards/p/PriestOfTheBloodRite.java b/Mage.Sets/src/mage/cards/p/PriestOfTheBloodRite.java index 97a673acb2d..6f2b6b4057c 100644 --- a/Mage.Sets/src/mage/cards/p/PriestOfTheBloodRite.java +++ b/Mage.Sets/src/mage/cards/p/PriestOfTheBloodRite.java @@ -52,7 +52,7 @@ public class PriestOfTheBloodRite extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // When Priest of the Blood Rite enters the battlefield, put a 5/5 black Demon creature token with flying onto the battlefield. + // When Priest of the Blood Rite enters the battlefield, create a 5/5 black Demon creature token with flying. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new DemonToken()))); // At the beginning of your upkeep, you lose 2 life. diff --git a/Mage.Sets/src/mage/cards/p/PrimalVigor.java b/Mage.Sets/src/mage/cards/p/PrimalVigor.java index ef42b6fbf5b..8e00f33422c 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalVigor.java +++ b/Mage.Sets/src/mage/cards/p/PrimalVigor.java @@ -50,7 +50,7 @@ public class PrimalVigor extends CardImpl { public PrimalVigor(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{4}{G}"); - // If one or more tokens would be put onto the battlefield, twice that many of those tokens are put onto the battlefield instead. + // If one or more tokens would be created, twice that many of those tokens are created instead. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PrimalVigorTokenEffect())); // If one or more +1/+1 counters would be placed on a creature, twice that many +1/+1 counters are placed on that creature instead. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PrimalVigorCounterEffect())); @@ -71,7 +71,7 @@ class PrimalVigorTokenEffect extends ReplacementEffectImpl { public PrimalVigorTokenEffect() { super(Duration.WhileOnBattlefield, Outcome.Copy); - staticText = "If one or more tokens would be put onto the battlefield, twice that many of those tokens are put onto the battlefield instead"; + staticText = "If one or more tokens would be created, twice that many of those tokens are created instead"; } public PrimalVigorTokenEffect(final PrimalVigorTokenEffect effect) { diff --git a/Mage.Sets/src/mage/cards/p/PrimevalBounty.java b/Mage.Sets/src/mage/cards/p/PrimevalBounty.java index 516df04ff67..d99777cb01f 100644 --- a/Mage.Sets/src/mage/cards/p/PrimevalBounty.java +++ b/Mage.Sets/src/mage/cards/p/PrimevalBounty.java @@ -63,7 +63,7 @@ public class PrimevalBounty extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{5}{G}"); - // Whenever you cast a creature spell, put a 3/3 green Beast creature token onto the battlefield. + // Whenever you cast a creature spell, create a 3/3 green Beast creature token. this.addAbility(new SpellCastControllerTriggeredAbility(new CreateTokenEffect(new BeastToken()), filterCreature, false)); // Whenever you cast a noncreature spell, put three +1/+1 counters on target creature you control. diff --git a/Mage.Sets/src/mage/cards/p/ProgenitorMimic.java b/Mage.Sets/src/mage/cards/p/ProgenitorMimic.java index 2d7bfabf030..09301b3f9b4 100644 --- a/Mage.Sets/src/mage/cards/p/ProgenitorMimic.java +++ b/Mage.Sets/src/mage/cards/p/ProgenitorMimic.java @@ -66,18 +66,18 @@ public class ProgenitorMimic extends CardImpl { // You may have Progenitor Mimic enter the battlefield as a copy of any creature on the battlefield // except it gains "At the beginning of your upkeep, if this creature isn't a token, - // put a token onto the battlefield that's a copy of this creature." + // create a token that's a copy of this creature." Effect effect = new PutTokenOntoBattlefieldCopySourceEffect(); - effect.setText("put a token onto the battlefield that's a copy of this creature"); + effect.setText("create a token that's a copy of this creature"); AbilityApplier applier = new AbilityApplier( new ConditionalTriggeredAbility( new BeginningOfUpkeepTriggeredAbility(effect, TargetController.YOU, false), new SourceMatchesFilterCondition(filter), - "At the beginning of your upkeep, if this creature isn't a token, put a token onto the battlefield that's a copy of this creature.") + "At the beginning of your upkeep, if this creature isn't a token, create a token that's a copy of this creature.") ); effect = new CopyPermanentEffect(applier); - effect.setText("as a copy of any creature on the battlefield except it gains \"At the beginning of your upkeep, if this creature isn't a token, put a token onto the battlefield that's a copy of this creature.\""); + effect.setText("as a copy of any creature on the battlefield except it gains \"At the beginning of your upkeep, if this creature isn't a token, create a token that's a copy of this creature.\""); this.addAbility(new EntersBattlefieldAbility(effect, true)); } diff --git a/Mage.Sets/src/mage/cards/p/PromiseOfBunrei.java b/Mage.Sets/src/mage/cards/p/PromiseOfBunrei.java index a07118567b1..7b19a4568c0 100644 --- a/Mage.Sets/src/mage/cards/p/PromiseOfBunrei.java +++ b/Mage.Sets/src/mage/cards/p/PromiseOfBunrei.java @@ -59,7 +59,7 @@ public class PromiseOfBunrei extends CardImpl { public PromiseOfBunrei(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}"); - // When a creature you control dies, sacrifice Promise of Bunrei. If you do, put four 1/1 colorless Spirit creature tokens onto the battlefield. + // When a creature you control dies, sacrifice Promise of Bunrei. If you do, create four 1/1 colorless Spirit creature tokens. this.addAbility(new DiesCreatureTriggeredAbility(new PromiseOfBunreiEffect(), false, filter)); } @@ -77,7 +77,7 @@ class PromiseOfBunreiEffect extends OneShotEffect { public PromiseOfBunreiEffect() { super(Outcome.Benefit); - this.staticText = "sacrifice {this}. If you do, put four 1/1 colorless Spirit creature tokens onto the battlefield"; + this.staticText = "sacrifice {this}. If you do, create four 1/1 colorless Spirit creature tokens"; } public PromiseOfBunreiEffect(final PromiseOfBunreiEffect effect) { diff --git a/Mage.Sets/src/mage/cards/p/PromiseOfPower.java b/Mage.Sets/src/mage/cards/p/PromiseOfPower.java index 42c7c6b3d1b..e57cfe62479 100644 --- a/Mage.Sets/src/mage/cards/p/PromiseOfPower.java +++ b/Mage.Sets/src/mage/cards/p/PromiseOfPower.java @@ -68,7 +68,7 @@ public class PromiseOfPower extends CardImpl { effect.setText("and you lose 5 life"); this.getSpellAbility().addEffect(effect); - // - Put an X/X black Demon creature token with flying onto the battlefield, where X is the number of cards in your hand. + // - Create an X/X black Demon creature token with flying, where X is the number of cards in your hand. Mode mode = new Mode(); mode.getEffects().add(new PromiseOfPowerEffect()); this.getSpellAbility().getModes().addMode(mode); @@ -91,7 +91,7 @@ class PromiseOfPowerEffect extends OneShotEffect { public PromiseOfPowerEffect() { super(Outcome.DestroyPermanent); - staticText = "Put an X/X black Demon creature token with flying onto the battlefield, where X is the number of cards in your hand"; + staticText = "Create an X/X black Demon creature token with flying, where X is the number of cards in your hand"; } public PromiseOfPowerEffect(PromiseOfPowerEffect ability) { diff --git a/Mage.Sets/src/mage/cards/p/ProsshSkyraiderOfKher.java b/Mage.Sets/src/mage/cards/p/ProsshSkyraiderOfKher.java index 0432b2ec6ca..0fcf5e5e2ec 100644 --- a/Mage.Sets/src/mage/cards/p/ProsshSkyraiderOfKher.java +++ b/Mage.Sets/src/mage/cards/p/ProsshSkyraiderOfKher.java @@ -53,12 +53,13 @@ import mage.target.common.TargetControlledCreaturePermanent; public class ProsshSkyraiderOfKher extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another creature"); + static { filter.add(new AnotherPredicate()); } public ProsshSkyraiderOfKher(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{R}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}{R}{G}"); this.supertype.add("Legendary"); this.subtype.add("Dragon"); @@ -67,10 +68,10 @@ public class ProsshSkyraiderOfKher extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // When you cast Prossh, Skyraider of Kher, put X 0/1 red Kobold creature tokens named Kobolds of Kher Keep onto the battlefield, where X is the amount of mana spent to cast Prossh. + // When you cast Prossh, Skyraider of Kher, create X 0/1 red Kobold creature tokens named Kobolds of Kher Keep, where X is the amount of mana spent to cast Prossh. this.addAbility(new CastSourceTriggeredAbility(new CreateTokenEffect(new ProsshKoboldToken(), new ManaSpentToCastCount()), false)); // Sacrifice another creature: Prossh gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1,filter, true)))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true)))); } public ProsshSkyraiderOfKher(final ProsshSkyraiderOfKher card) { diff --git a/Mage.Sets/src/mage/cards/p/PrototypePortal.java b/Mage.Sets/src/mage/cards/p/PrototypePortal.java index f01c31aac84..a6e710e4dae 100644 --- a/Mage.Sets/src/mage/cards/p/PrototypePortal.java +++ b/Mage.Sets/src/mage/cards/p/PrototypePortal.java @@ -63,7 +63,7 @@ public class PrototypePortal extends CardImpl { // Imprint - When Prototype Portal enters the battlefield, you may exile an artifact card from your hand. this.addAbility(new EntersBattlefieldTriggeredAbility(new PrototypePortalEffect(), true)); - // {X}, {tap}: Put a token that's a copy of the exiled card onto the battlefield. X is the converted mana cost of that card. + // {X}, {tap}: Create a token that's a copy of the exiled card. X is the converted mana cost of that card. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PrototypePortalCreateTokenEffect(), new ManaCostsImpl("{X}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); @@ -143,7 +143,7 @@ class PrototypePortalCreateTokenEffect extends OneShotEffect { public PrototypePortalCreateTokenEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Put a token that's a copy of the exiled card onto the battlefield. X is the converted mana cost of that card"; + this.staticText = "Create a token that's a copy of the exiled card. X is the converted mana cost of that card"; } public PrototypePortalCreateTokenEffect(final PrototypePortalCreateTokenEffect effect) { diff --git a/Mage.Sets/src/mage/cards/p/ProwessOfTheFair.java b/Mage.Sets/src/mage/cards/p/ProwessOfTheFair.java index d35d027e73e..958f155032f 100644 --- a/Mage.Sets/src/mage/cards/p/ProwessOfTheFair.java +++ b/Mage.Sets/src/mage/cards/p/ProwessOfTheFair.java @@ -58,7 +58,7 @@ public class ProwessOfTheFair extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.ENCHANTMENT},"{1}{B}"); this.subtype.add("Elf"); - // Whenever another nontoken Elf is put into your graveyard from the battlefield, you may put a 1/1 green Elf Warrior creature token onto the battlefield. + // Whenever another nontoken Elf is put into your graveyard from the battlefield, you may create a 1/1 green Elf Warrior creature token. this.addAbility(new PutIntoGraveFromBattlefieldAllTriggeredAbility(new CreateTokenEffect(new ElfToken()), true, filter, false, true)); } diff --git a/Mage.Sets/src/mage/cards/p/PsychotropeThallid.java b/Mage.Sets/src/mage/cards/p/PsychotropeThallid.java index f8fd9bf5fc1..87623fa0965 100644 --- a/Mage.Sets/src/mage/cards/p/PsychotropeThallid.java +++ b/Mage.Sets/src/mage/cards/p/PsychotropeThallid.java @@ -68,7 +68,7 @@ public class PsychotropeThallid extends CardImpl { // At the beginning of your upkeep, put a spore counter on Psychotrope Thallid. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()), TargetController.YOU, false)); - // Remove three spore counters from Psychotrope Thallid: Put a 1/1 green Saproling creature token onto the battlefield. + // Remove three spore counters from Psychotrope Thallid: Create a 1/1 green Saproling creature token. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); diff --git a/Mage.Sets/src/mage/cards/p/PulseOfTheTangle.java b/Mage.Sets/src/mage/cards/p/PulseOfTheTangle.java index a968504adbe..7345c5a9e21 100644 --- a/Mage.Sets/src/mage/cards/p/PulseOfTheTangle.java +++ b/Mage.Sets/src/mage/cards/p/PulseOfTheTangle.java @@ -56,7 +56,7 @@ public class PulseOfTheTangle extends CardImpl { public PulseOfTheTangle(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{G}{G}"); - // Put a 3/3 green Beast creature token onto the battlefield. Then if an opponent controls more creatures than you, return Pulse of the Tangle to its owner's hand. + // Create a 3/3 green Beast creature token. Then if an opponent controls more creatures than you, return Pulse of the Tangle to its owner's hand. this.getSpellAbility().addEffect(new CreateTokenEffect(new BeastToken())); this.getSpellAbility().addEffect(new PulseOfTheTangleReturnToHandEffect()); } diff --git a/Mage.Sets/src/mage/cards/p/PuppetConjurer.java b/Mage.Sets/src/mage/cards/p/PuppetConjurer.java index 67a2b9fbdb8..c85aa831966 100644 --- a/Mage.Sets/src/mage/cards/p/PuppetConjurer.java +++ b/Mage.Sets/src/mage/cards/p/PuppetConjurer.java @@ -65,7 +65,7 @@ public class PuppetConjurer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - // {U}, {tap}: Put a 0/1 blue Homunculus artifact creature token onto the battlefield. + // {U}, {tap}: Create a 0/1 blue Homunculus artifact creature token. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HomunculusToken()), new ManaCostsImpl("{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/q/QuestForTheGravelord.java b/Mage.Sets/src/mage/cards/q/QuestForTheGravelord.java index ac6ba7873ba..6db43486551 100644 --- a/Mage.Sets/src/mage/cards/q/QuestForTheGravelord.java +++ b/Mage.Sets/src/mage/cards/q/QuestForTheGravelord.java @@ -53,7 +53,7 @@ public class QuestForTheGravelord extends CardImpl { // Whenever a creature dies, you may put a quest counter on Quest for the Gravelord. this.addAbility(new DiesCreatureTriggeredAbility(new AddCountersSourceEffect(CounterType.QUEST.createInstance()), true)); - // Remove three quest counters from Quest for the Gravelord and sacrifice it: Put a 5/5 black Zombie Giant creature token onto the battlefield. + // Remove three quest counters from Quest for the Gravelord and sacrifice it: Create a 5/5 black Zombie Giant creature token. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ZombieToken()), new RemoveCountersSourceCost(CounterType.QUEST.createInstance(3))); diff --git a/Mage.Sets/src/mage/cards/q/QuestingPhelddagrif.java b/Mage.Sets/src/mage/cards/q/QuestingPhelddagrif.java index c2291d13b47..c2d9ebf4758 100644 --- a/Mage.Sets/src/mage/cards/q/QuestingPhelddagrif.java +++ b/Mage.Sets/src/mage/cards/q/QuestingPhelddagrif.java @@ -70,7 +70,7 @@ public class QuestingPhelddagrif extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); - // {G}: Questing Phelddagrif gets +1/+1 until end of turn. Target opponent puts a 1/1 green Hippo creature token onto the battlefield. + // {G}: Questing Phelddagrif gets +1/+1 until end of turn. Target opponent creates a 1/1 green Hippo creature token. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{G}")); ability.addEffect(new CreateTokenTargetEffect(new HippoToken())); diff --git a/Mage.Sets/src/mage/cards/r/RaisedByWolves.java b/Mage.Sets/src/mage/cards/r/RaisedByWolves.java index 1e1b319c2cd..a09b63c9104 100644 --- a/Mage.Sets/src/mage/cards/r/RaisedByWolves.java +++ b/Mage.Sets/src/mage/cards/r/RaisedByWolves.java @@ -73,7 +73,7 @@ public class RaisedByWolves extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // When Raised by Wolves enters the battlefield, put two 2/2 green Wolf creature tokens onto the battlefield. + // When Raised by Wolves enters the battlefield, create two 2/2 green Wolf creature tokens. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new WolfToken(), 2))); // Enchanted creature gets +1/+1 for each Wolf you control. DynamicValue amountOfWolves = new PermanentsOnBattlefieldCount(filter); diff --git a/Mage.Sets/src/mage/cards/r/RakdosGuildmage.java b/Mage.Sets/src/mage/cards/r/RakdosGuildmage.java index 56f3ec9228d..8a41605e11b 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosGuildmage.java +++ b/Mage.Sets/src/mage/cards/r/RakdosGuildmage.java @@ -70,7 +70,7 @@ public class RakdosGuildmage extends CardImpl { ability.addCost(new DiscardCardCost()); this.addAbility(ability); - // {3}{R}: Put a 2/1 red Goblin creature token with haste onto the battlefield. Exile it at the beginning of the next end step. + // {3}{R}: Create a 2/1 red Goblin creature token with haste. Exile it at the beginning of the next end step. SimpleActivatedAbility ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RakdosGuildmageEffect(), new ManaCostsImpl("{3}{R}")); this.addAbility(ability2); } @@ -89,7 +89,7 @@ class RakdosGuildmageEffect extends OneShotEffect { public RakdosGuildmageEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Put a 2/1 red Goblin creature token with haste onto the battlefield. Exile it at the beginning of the next end step"; + this.staticText = "Create a 2/1 red Goblin creature token with haste. Exile it at the beginning of the next end step"; } public RakdosGuildmageEffect(final RakdosGuildmageEffect effect) { diff --git a/Mage.Sets/src/mage/cards/r/RakshasaGravecaller.java b/Mage.Sets/src/mage/cards/r/RakshasaGravecaller.java index 9a8d7472c06..5f9ba35f548 100644 --- a/Mage.Sets/src/mage/cards/r/RakshasaGravecaller.java +++ b/Mage.Sets/src/mage/cards/r/RakshasaGravecaller.java @@ -53,7 +53,7 @@ public class RakshasaGravecaller extends CardImpl { // Exploit this.addAbility(new ExploitAbility()); - // When Rakshasa Gravecaller exploits a creature, put two 2/2 black Zombie creature tokens onto the battlefield. + // When Rakshasa Gravecaller exploits a creature, create two 2/2 black Zombie creature tokens. this.addAbility(new ExploitCreatureTriggeredAbility(new CreateTokenEffect(new ZombieToken(), 2), false)); } diff --git a/Mage.Sets/src/mage/cards/r/RallyTheHorde.java b/Mage.Sets/src/mage/cards/r/RallyTheHorde.java index 3742be007f4..b3d73bb8fa5 100644 --- a/Mage.Sets/src/mage/cards/r/RallyTheHorde.java +++ b/Mage.Sets/src/mage/cards/r/RallyTheHorde.java @@ -52,7 +52,7 @@ public class RallyTheHorde extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{5}{R}"); - // Exile the top card of your library. Exile the top card of your library. Exile the top card of your library. If the last card exiled isn't a land, repeat this process. Put a 1/1 red Warrior creature token onto the battlefield for each nonland card exiled this way. + // Exile the top card of your library. Exile the top card of your library. Exile the top card of your library. If the last card exiled isn't a land, repeat this process. Create a 1/1 red Warrior creature token for each nonland card exiled this way. this.getSpellAbility().addEffect(new RallyTheHordeEffect()); } @@ -70,7 +70,7 @@ class RallyTheHordeEffect extends OneShotEffect { public RallyTheHordeEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Exile the top card of your library. Exile the top card of your library. Exile the top card of your library. If the last card exiled isn't a land, repeat this process. Put a 1/1 red Warrior creature token onto the battlefield for each nonland card exiled this way"; + this.staticText = "Exile the top card of your library. Exile the top card of your library. Exile the top card of your library. If the last card exiled isn't a land, repeat this process. Create a 1/1 red Warrior creature token for each nonland card exiled this way"; } public RallyTheHordeEffect(final RallyTheHordeEffect effect) { diff --git a/Mage.Sets/src/mage/cards/r/RapaciousOne.java b/Mage.Sets/src/mage/cards/r/RapaciousOne.java index df28f8ccfc3..da72946c8fc 100644 --- a/Mage.Sets/src/mage/cards/r/RapaciousOne.java +++ b/Mage.Sets/src/mage/cards/r/RapaciousOne.java @@ -49,7 +49,7 @@ import mage.game.permanent.token.EldraziSpawnToken; public class RapaciousOne extends CardImpl { public RapaciousOne(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{R}"); this.subtype.add("Eldrazi"); this.subtype.add("Drone"); @@ -102,6 +102,6 @@ class RapaciousOneTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever {this} deals combat damage to a player, put that many 0/1 colorless Eldrazi Spawn creature tokens onto the battlefield. They have \"Sacrifice this creature: Add {C} to your mana pool.\""; + return "Whenever {this} deals combat damage to a player, create that many 0/1 colorless Eldrazi Spawn creature tokens. They have \"Sacrifice this creature: Add {C} to your mana pool.\""; } } diff --git a/Mage.Sets/src/mage/cards/r/RapidHybridization.java b/Mage.Sets/src/mage/cards/r/RapidHybridization.java index 2ecf9d3d454..6e033f730ce 100644 --- a/Mage.Sets/src/mage/cards/r/RapidHybridization.java +++ b/Mage.Sets/src/mage/cards/r/RapidHybridization.java @@ -50,7 +50,7 @@ public class RapidHybridization extends CardImpl { public RapidHybridization(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{U}"); - // Destroy target creature. It can't be regenerated. That creature's controller puts a 3/3 green Frog Lizard creature token onto the battlefield. + // Destroy target creature. It can't be regenerated. That creature's controller creates a 3/3 green Frog Lizard creature token. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); this.getSpellAbility().addEffect(new RapidHybridizationEffect()); @@ -70,7 +70,7 @@ class RapidHybridizationEffect extends OneShotEffect { public RapidHybridizationEffect() { super(Outcome.PutCreatureInPlay); - staticText = "That creature's controller puts a 3/3 green Frog Lizard creature token onto the battlefield"; + staticText = "That creature's controller creates a 3/3 green Frog Lizard creature token"; } public RapidHybridizationEffect(final RapidHybridizationEffect effect) { @@ -97,7 +97,7 @@ class RapidHybridizationEffect extends OneShotEffect { class RapidHybridizationToken extends Token { public RapidHybridizationToken() { - super("Frog Lizard", "3/3 green Frog Lizard creature token onto the battlefield"); + super("Frog Lizard", "3/3 green Frog Lizard creature token"); this.setOriginalExpansionSetCode("GTC"); cardType.add(CardType.CREATURE); diff --git a/Mage.Sets/src/mage/cards/r/ReachOfBranches.java b/Mage.Sets/src/mage/cards/r/ReachOfBranches.java index 6c845837383..eaa25b81ce4 100644 --- a/Mage.Sets/src/mage/cards/r/ReachOfBranches.java +++ b/Mage.Sets/src/mage/cards/r/ReachOfBranches.java @@ -59,7 +59,7 @@ public class ReachOfBranches extends CardImpl { this.subtype.add("Treefolk"); - // Put a 2/5 green Treefolk Shaman creature token onto the battlefield. + // Create a 2/5 green Treefolk Shaman creature token. this.getSpellAbility().addEffect(new CreateTokenEffect(new TreefolkShamanToken())); // Whenever a Forest enters the battlefield under your control, you may return Reach of Branches from your graveyard to your hand. this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(),filter, true, "", true)); diff --git a/Mage.Sets/src/mage/cards/r/RebellionOfTheFlamekin.java b/Mage.Sets/src/mage/cards/r/RebellionOfTheFlamekin.java index 11d8ab354d7..f69c26319db 100644 --- a/Mage.Sets/src/mage/cards/r/RebellionOfTheFlamekin.java +++ b/Mage.Sets/src/mage/cards/r/RebellionOfTheFlamekin.java @@ -61,7 +61,7 @@ public class RebellionOfTheFlamekin extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.ENCHANTMENT},"{3}{R}"); this.subtype.add("Elemental"); - // Whenever you clash, you may pay {1}. If you do put a 3/1 Red Elemental Shaman creature token in play. If you won that token gains haste + // Whenever you clash, you may pay {1}. If you do create a 3/1 Red Elemental Shaman creature token in play. If you won that token gains haste this.addAbility(new RebellionOfTheFlamekinTriggeredAbility()); } @@ -112,7 +112,7 @@ class RebellionOfTheFlamekinTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever you clash, you may pay {1}. If you do put a 3/1 Red Elemental Shaman creature token in play. If you won that token gains haste until end of turn"; + return "Whenever you clash, you may pay {1}. If you do create a 3/1 Red Elemental Shaman creature token in play. If you won that token gains haste until end of turn"; } } diff --git a/Mage.Sets/src/mage/cards/r/ReefWorm.java b/Mage.Sets/src/mage/cards/r/ReefWorm.java index a1e602def19..8b885f50ca8 100644 --- a/Mage.Sets/src/mage/cards/r/ReefWorm.java +++ b/Mage.Sets/src/mage/cards/r/ReefWorm.java @@ -49,7 +49,7 @@ public class ReefWorm extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(1); - // When Reef Worm dies, put a 3/3 blue Fish creature token onto the battlefield with "When this creature dies, put a 6/6 blue Whale creature token onto the battlefield with "When this creature dies, put a 9/9 blue Kraken creature token onto the battlefield."" + // When Reef Worm dies, create a 3/3 blue Fish creature token with "When this creature dies, create a 6/6 blue Whale creature token with "When this creature dies, create a 9/9 blue Kraken creature token."" addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new ReefWormFishToken()))); } @@ -66,7 +66,7 @@ public class ReefWorm extends CardImpl { class ReefWormFishToken extends Token { ReefWormFishToken() { - super("Fish", "a 3/3 blue Fish creature token onto the battlefield with \"When this creature dies, put a 6/6 blue Whale creature token onto the battlefield with \"When this creature dies, put a 9/9 blue Kraken creature token onto the battlefield.\"\""); + super("Fish", "a 3/3 blue Fish creature token with \"When this creature dies, create a 6/6 blue Whale creature token with \"When this creature dies, create a 9/9 blue Kraken creature token.\"\""); setOriginalExpansionSetCode("C14"); cardType.add(CardType.CREATURE); color.setBlue(true); @@ -81,7 +81,7 @@ class ReefWormFishToken extends Token { class ReefWormWhaleToken extends Token { ReefWormWhaleToken() { - super("Whale", "a 6/6 blue Whale creature token with \"When this creature dies, put a 9/9 blue Kraken creature token onto the battlefield.\""); + super("Whale", "a 6/6 blue Whale creature token with \"When this creature dies, create a 9/9 blue Kraken creature token.\""); setOriginalExpansionSetCode("C14"); cardType.add(CardType.CREATURE); color.setBlue(true); diff --git a/Mage.Sets/src/mage/cards/r/ReignOfThePit.java b/Mage.Sets/src/mage/cards/r/ReignOfThePit.java index eec736e21a3..9a1b794e1b4 100644 --- a/Mage.Sets/src/mage/cards/r/ReignOfThePit.java +++ b/Mage.Sets/src/mage/cards/r/ReignOfThePit.java @@ -55,7 +55,7 @@ public class ReignOfThePit extends CardImpl { public ReignOfThePit(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{B}{B}"); - // Each player sacrifices a creature. Put an X/X black Demon creature token with flying onto the battlefield, where X is the total power of the creatures sacrificed this way. + // Each player sacrifices a creature. Create an X/X black Demon creature token with flying, where X is the total power of the creatures sacrificed this way. this.getSpellAbility().addEffect(new ReignOfThePitEffect()); } @@ -73,7 +73,7 @@ class ReignOfThePitEffect extends OneShotEffect { ReignOfThePitEffect() { super(Outcome.Sacrifice); - this.staticText = "Each player sacrifices a creature. Put an X/X black Demon creature token with flying onto the battlefield, where X is the total power of the creatures sacrificed this way"; + this.staticText = "Each player sacrifices a creature. Create an X/X black Demon creature token with flying, where X is the total power of the creatures sacrificed this way"; } ReignOfThePitEffect(final ReignOfThePitEffect effect) { diff --git a/Mage.Sets/src/mage/cards/r/RenownedWeaver.java b/Mage.Sets/src/mage/cards/r/RenownedWeaver.java index 9c48b5ed590..251f9a7a6e6 100644 --- a/Mage.Sets/src/mage/cards/r/RenownedWeaver.java +++ b/Mage.Sets/src/mage/cards/r/RenownedWeaver.java @@ -49,18 +49,18 @@ import mage.game.permanent.token.Token; public class RenownedWeaver extends CardImpl { public RenownedWeaver(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{G}"); this.subtype.add("Human"); this.subtype.add("Shaman"); this.power = new MageInt(1); this.toughness = new MageInt(1); - // {1}{G}, Sacrifice Renowned Weaver: Put a 1/3 green Spider enchantment creature token with reach onto the battlefield. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new RenownedWeaverSpiderToken(), 1), new ManaCostsImpl("{1}{G}")) ; + // {1}{G}, Sacrifice Renowned Weaver: Create a 1/3 green Spider enchantment creature token with reach. + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new RenownedWeaverSpiderToken(), 1), new ManaCostsImpl("{1}{G}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); - + } public RenownedWeaver(final RenownedWeaver card) { @@ -79,7 +79,7 @@ class RenownedWeaverSpiderToken extends Token { super("Spider", "1/3 green Spider enchantment creature token with reach"); this.setOriginalExpansionSetCode("JOU"); cardType.add(CardType.ENCHANTMENT); - cardType.add(CardType.CREATURE); + cardType.add(CardType.CREATURE); color.setColor(ObjectColor.GREEN); subtype.add("Spider"); power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/r/RepelIntruders.java b/Mage.Sets/src/mage/cards/r/RepelIntruders.java index 69f104ff635..ad748231f1f 100644 --- a/Mage.Sets/src/mage/cards/r/RepelIntruders.java +++ b/Mage.Sets/src/mage/cards/r/RepelIntruders.java @@ -52,12 +52,12 @@ public class RepelIntruders extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{W/U}"); - // Put two 1/1 white Kithkin Soldier creature tokens onto the battlefield if {W} was spent to cast Repel Intruders. Counter up to one target creature spell if {U} was spent to cast Repel Intruders. + // Create two 1/1 white Kithkin Soldier creature tokens if {W} was spent to cast Repel Intruders. Counter up to one target creature spell if {U} was spent to cast Repel Intruders. TargetSpell target = new TargetSpell(0,1, new FilterCreatureSpell()); target.setRequired(false); this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new CreateTokenEffect(new KithkinToken(), 2), - new ManaWasSpentCondition(ColoredManaSymbol.W), "Put two 1/1 white Kithkin Soldier creature tokens onto the battlefield if {W} was spent to cast {this}")); + new ManaWasSpentCondition(ColoredManaSymbol.W), "Create two 1/1 white Kithkin Soldier creature tokens if {W} was spent to cast {this}")); this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new CounterTargetEffect(), new ManaWasSpentCondition(ColoredManaSymbol.U), " Counter up to one target creature spell if {U} was spent to cast {this}")); diff --git a/Mage.Sets/src/mage/cards/r/RequiemAngel.java b/Mage.Sets/src/mage/cards/r/RequiemAngel.java index 6100a4bce0e..3c516f91117 100644 --- a/Mage.Sets/src/mage/cards/r/RequiemAngel.java +++ b/Mage.Sets/src/mage/cards/r/RequiemAngel.java @@ -65,7 +65,7 @@ public class RequiemAngel extends CardImpl { this.addAbility(FlyingAbility.getInstance()); - // Whenever another non-Spirit creature you control dies, put a 1/1 white Spirit creature token with flying onto the battlefield. + // Whenever another non-Spirit creature you control dies, create a 1/1 white Spirit creature token with flying. this.addAbility(new DiesCreatureTriggeredAbility(new CreateTokenEffect(new SpiritWhiteToken("ISD"), 1), false, filter)); } diff --git a/Mage.Sets/src/mage/cards/r/ResearchDevelopment.java b/Mage.Sets/src/mage/cards/r/ResearchDevelopment.java index b027da03cf9..9601fb20d38 100644 --- a/Mage.Sets/src/mage/cards/r/ResearchDevelopment.java +++ b/Mage.Sets/src/mage/cards/r/ResearchDevelopment.java @@ -58,7 +58,7 @@ public class ResearchDevelopment extends SplitCard { // Choose up to four cards you own from outside the game and shuffle them into your library. getLeftHalfCard().getSpellAbility().addEffect(new ResearchEffect()); - // Put a 3/1 red Elemental creature token onto the battlefield unless any opponent has you draw a card. Repeat this process two more times. + // Create a 3/1 red Elemental creature token unless any opponent has you draw a card. Repeat this process two more times. getRightHalfCard().getSpellAbility().addEffect(new DevelopmentEffect()); } @@ -153,7 +153,7 @@ class DevelopmentEffect extends OneShotEffect { public DevelopmentEffect() { super(Outcome.Benefit); - staticText = "Put a 3/1 red Elemental creature token onto the battlefield unless any opponent has you draw a card. Repeat this process two more times."; + staticText = "Create a 3/1 red Elemental creature token unless any opponent has you draw a card. Repeat this process two more times."; } DevelopmentEffect(final DevelopmentEffect effect) { diff --git a/Mage.Sets/src/mage/cards/r/RetreatToEmeria.java b/Mage.Sets/src/mage/cards/r/RetreatToEmeria.java index 00716dbcb23..28e4315a976 100644 --- a/Mage.Sets/src/mage/cards/r/RetreatToEmeria.java +++ b/Mage.Sets/src/mage/cards/r/RetreatToEmeria.java @@ -27,6 +27,7 @@ */ package mage.cards.r; +import java.util.UUID; import mage.abilities.Mode; import mage.abilities.common.LandfallAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -37,8 +38,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.game.permanent.token.KorAllyToken; -import java.util.UUID; - /** * * @author fireshoes @@ -46,9 +45,9 @@ import java.util.UUID; public class RetreatToEmeria extends CardImpl { public RetreatToEmeria(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); - // Landfall - Whenever a land enters the battlefield under you control, choose one - Put a 1/1 white Kor Ally creature token onto the battlefield; or Creatures you control get +1/+1 until end of turn. + // Landfall - Whenever a land enters the battlefield under you control, choose one - Create a 1/1 white Kor Ally creature token; or Creatures you control get +1/+1 until end of turn. LandfallAbility ability = new LandfallAbility(new CreateTokenEffect(new KorAllyToken()), false); Mode mode = new Mode(); mode.getEffects().add(new BoostControlledEffect(1, 1, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/cards/r/RevelOfTheFallenGod.java b/Mage.Sets/src/mage/cards/r/RevelOfTheFallenGod.java index bf2635b033d..9fa1f44ed7f 100644 --- a/Mage.Sets/src/mage/cards/r/RevelOfTheFallenGod.java +++ b/Mage.Sets/src/mage/cards/r/RevelOfTheFallenGod.java @@ -47,7 +47,7 @@ public class RevelOfTheFallenGod extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{R}{R}{G}{G}"); - // Put four 2/2 red and green Satyr creature tokens with haste onto the battlefield. + // Create four 2/2 red and green Satyr creature tokens with haste. this.getSpellAbility().addEffect(new CreateTokenEffect(new RevelOfTheFallenGodSatyrToken(), 4)); } diff --git a/Mage.Sets/src/mage/cards/r/RhysTheRedeemed.java b/Mage.Sets/src/mage/cards/r/RhysTheRedeemed.java index a34ee13f234..9544159c16d 100644 --- a/Mage.Sets/src/mage/cards/r/RhysTheRedeemed.java +++ b/Mage.Sets/src/mage/cards/r/RhysTheRedeemed.java @@ -65,12 +65,12 @@ public class RhysTheRedeemed extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // {2}{GW}, {tap}: Put a 1/1 green and white Elf Warrior creature token onto the battlefield. + // {2}{GW}, {tap}: Create a 1/1 green and white Elf Warrior creature token. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new RhysTheRedeemedToken()), new ManaCostsImpl("{2}{G/W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); - // {4}{GW}{GW}, {tap}: For each creature token you control, put a token that's a copy of that creature onto the battlefield. + // {4}{GW}{GW}, {tap}: For each creature token you control, create a token that's a copy of that creature. Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RhysTheRedeemedEffect(), new ManaCostsImpl("{4}{G/W}{G/W}")); ability2.addCost(new TapSourceCost()); this.addAbility(ability2); @@ -98,7 +98,7 @@ class RhysTheRedeemedEffect extends OneShotEffect { public RhysTheRedeemedEffect() { super(Outcome.Neutral); - this.staticText = "For each creature token you control, put a token that's a copy of that creature onto the battlefield"; + this.staticText = "For each creature token you control, create a token that's a copy of that creature"; } public RhysTheRedeemedEffect(final RhysTheRedeemedEffect effect) { diff --git a/Mage.Sets/src/mage/cards/r/RighteousConfluence.java b/Mage.Sets/src/mage/cards/r/RighteousConfluence.java index 30f9a509d1e..f4599293116 100644 --- a/Mage.Sets/src/mage/cards/r/RighteousConfluence.java +++ b/Mage.Sets/src/mage/cards/r/RighteousConfluence.java @@ -52,7 +52,7 @@ public class RighteousConfluence extends CardImpl { this.getSpellAbility().getModes().setMaxModes(3); this.getSpellAbility().getModes().setEachModeMoreThanOnce(true); - // - Put a 2/2 white Knight creature token with vigilance onto the battlefield; + // - Create a 2/2 white Knight creature token with vigilance; this.getSpellAbility().addEffect(new CreateTokenEffect(new KnightToken())); // - Exile target enchantment; diff --git a/Mage.Sets/src/mage/cards/r/RikuOfTwoReflections.java b/Mage.Sets/src/mage/cards/r/RikuOfTwoReflections.java index fa835d70e18..a757e902532 100644 --- a/Mage.Sets/src/mage/cards/r/RikuOfTwoReflections.java +++ b/Mage.Sets/src/mage/cards/r/RikuOfTwoReflections.java @@ -80,10 +80,10 @@ public class RikuOfTwoReflections extends CardImpl { effect.setText("copy that spell. You may choose new targets for the copy"); this.addAbility(new SpellCastControllerTriggeredAbility(new DoIfCostPaid(effect, new ManaCostsImpl("{U}{R}")), filter, false, true)); - // Whenever another nontoken creature enters the battlefield under your control, you may pay {G}{U}. If you do, put a token that's a copy of that creature onto the battlefield. + // Whenever another nontoken creature enters the battlefield under your control, you may pay {G}{U}. If you do, create a token that's a copy of that creature. effect = new DoIfCostPaid(new PutTokenOntoBattlefieldCopyTargetEffect(), - new ManaCostsImpl("{G}{U}"), "Put a token that's a copy of that creature onto the battlefield?"); - effect.setText("you may pay {G}{U}. If you do, put a token that's a copy of that creature onto the battlefield"); + new ManaCostsImpl("{G}{U}"), "Create a token that's a copy of that creature?"); + effect.setText("you may pay {G}{U}. If you do, create a token that's a copy of that creature"); this.addAbility(new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, effect, filterPermanent, false, SetTargetPointer.PERMANENT, null)); } diff --git a/Mage.Sets/src/mage/cards/r/RiptideReplicator.java b/Mage.Sets/src/mage/cards/r/RiptideReplicator.java index 066b6474fc1..ea8056323ba 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideReplicator.java +++ b/Mage.Sets/src/mage/cards/r/RiptideReplicator.java @@ -69,7 +69,7 @@ public class RiptideReplicator extends CardImpl { // Riptide Replicator enters the battlefield with X charge counters on it. this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.CHARGE.createInstance()))); - // {4}, {T}: Put an X/X creature token of the chosen color and type onto the battlefield, where X is the number of charge counters on Riptide Replicator. + // {4}, {T}: Create an X/X creature token of the chosen color and type, where X is the number of charge counters on Riptide Replicator. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RiptideReplicatorEffect(), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); this.addAbility(ability); @@ -89,7 +89,7 @@ class RiptideReplicatorEffect extends OneShotEffect { RiptideReplicatorEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Put an X/X creature token of the chosen color and type onto the battlefield, where X is the number of charge counters on {this}."; + this.staticText = "Create an X/X creature token of the chosen color and type, where X is the number of charge counters on {this}."; } RiptideReplicatorEffect(final RiptideReplicatorEffect effect) { diff --git a/Mage.Sets/src/mage/cards/r/RiseFromTheTides.java b/Mage.Sets/src/mage/cards/r/RiseFromTheTides.java index 0363b5a5d93..8c5ac2662fd 100644 --- a/Mage.Sets/src/mage/cards/r/RiseFromTheTides.java +++ b/Mage.Sets/src/mage/cards/r/RiseFromTheTides.java @@ -45,7 +45,7 @@ public class RiseFromTheTides extends CardImpl { public RiseFromTheTides(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{5}{U}"); - // Put a 2/2 black Zombie creature token onto the battlefield tapped for each instant and sorcery card in your graveyard. + // Create a 2/2 black Zombie creature token tapped for each instant and sorcery card in your graveyard. CardsInControllerGraveyardCount value = new CardsInControllerGraveyardCount(new FilterInstantOrSorceryCard()); this.getSpellAbility().addEffect(new CreateTokenEffect(new ZombieToken(), value, true, false)); } diff --git a/Mage.Sets/src/mage/cards/r/RiseOfEagles.java b/Mage.Sets/src/mage/cards/r/RiseOfEagles.java index 44bcc2cc903..b854f14a35a 100644 --- a/Mage.Sets/src/mage/cards/r/RiseOfEagles.java +++ b/Mage.Sets/src/mage/cards/r/RiseOfEagles.java @@ -48,7 +48,7 @@ public class RiseOfEagles extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{U}{U}"); - // Put two 2/2 blue Bird enchantment creature tokens with flying onto the battlefield. Scry 1. + // Create two 2/2 blue Bird enchantment creature tokens with flying. Scry 1. this.getSpellAbility().addEffect(new CreateTokenEffect(new RiseOfEaglesBirdToken(), 2)); this.getSpellAbility().addEffect(new ScryEffect(1)); } diff --git a/Mage.Sets/src/mage/cards/r/RiseOfTheHobgoblins.java b/Mage.Sets/src/mage/cards/r/RiseOfTheHobgoblins.java index ace396b81b5..81c5c4c8fcc 100644 --- a/Mage.Sets/src/mage/cards/r/RiseOfTheHobgoblins.java +++ b/Mage.Sets/src/mage/cards/r/RiseOfTheHobgoblins.java @@ -77,7 +77,7 @@ public class RiseOfTheHobgoblins extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{R/W}{R/W}"); - // When Rise of the Hobgoblins enters the battlefield, you may pay {X}. If you do, put X 1/1 red and white Goblin Soldier creature tokens onto the battlefield. + // When Rise of the Hobgoblins enters the battlefield, you may pay {X}. If you do, create X 1/1 red and white Goblin Soldier creature tokens. this.addAbility(new EntersBattlefieldTriggeredAbility(new RiseOfTheHobgoblinsEffect())); // {RW}: Red creatures and white creatures you control gain first strike until end of turn. @@ -99,7 +99,7 @@ class RiseOfTheHobgoblinsEffect extends OneShotEffect { public RiseOfTheHobgoblinsEffect() { super(Outcome.PutCreatureInPlay); - staticText = "you may pay {X}. If you do, put X 1/1 red and white Goblin Soldier creature tokens onto the battlefield"; + staticText = "you may pay {X}. If you do, create X 1/1 red and white Goblin Soldier creature tokens"; } public RiseOfTheHobgoblinsEffect(final RiseOfTheHobgoblinsEffect effect) { diff --git a/Mage.Sets/src/mage/cards/r/RiteOfReplication.java b/Mage.Sets/src/mage/cards/r/RiteOfReplication.java index 2487d507143..9d16ed8fdb2 100644 --- a/Mage.Sets/src/mage/cards/r/RiteOfReplication.java +++ b/Mage.Sets/src/mage/cards/r/RiteOfReplication.java @@ -49,11 +49,11 @@ public class RiteOfReplication extends CardImpl { // Kicker {5} this.addAbility(new KickerAbility("{5}")); - // Put a token that's a copy of target creature onto the battlefield. If Rite of Replication was kicked, put five of those tokens onto the battlefield instead. + // Create a token that's a copy of target creature. If Rite of Replication was kicked, create five of those tokens instead. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new PutTokenOntoBattlefieldCopyTargetEffect(null, null, false, 5), new PutTokenOntoBattlefieldCopyTargetEffect(), KickedCondition.getInstance(), - "Put a token that's a copy of target creature onto the battlefield. If {this} was kicked, put five of those tokens onto the battlefield instead")); + "Create a token that's a copy of target creature. If {this} was kicked, create five of those tokens instead")); } public RiteOfReplication(final RiteOfReplication card) { diff --git a/Mage.Sets/src/mage/cards/r/RiteOfTheRagingStorm.java b/Mage.Sets/src/mage/cards/r/RiteOfTheRagingStorm.java index 6057b9f956b..cd883841dfc 100644 --- a/Mage.Sets/src/mage/cards/r/RiteOfTheRagingStorm.java +++ b/Mage.Sets/src/mage/cards/r/RiteOfTheRagingStorm.java @@ -65,14 +65,14 @@ public class RiteOfTheRagingStorm extends CardImpl { } public RiteOfTheRagingStorm(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{R}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}{R}"); // Creatures named Lightning Rager can't attack you or planeswalkers you control. Effect effect = new CantAttackYouOrPlaneswalkerAllEffect(Duration.WhileOnBattlefield, filter); effect.setText("Creatures named Lightning Rager can't attack you or planeswalkers you control"); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); - // At the beginning of each player's upkeep, that player puts a 5/1 red Elemental creature token named Lightning Rager onto the battlefield. + // At the beginning of each player's upkeep, that player creates a 5/1 red Elemental creature token named Lightning Rager. // It has trample, haste, and "At the beginning of the end step, sacrifice this creature." this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new RiteOfTheRagingStormEffect(), TargetController.ANY, false)); } @@ -89,7 +89,7 @@ public class RiteOfTheRagingStorm extends CardImpl { class RiteOfTheRagingStormEffect extends OneShotEffect { - private static final String effectText = "that player puts a 5/1 red Elemental creature token named Lightning Rager onto the battlefield. " + private static final String effectText = "that player creates a 5/1 red Elemental creature token named Lightning Rager. " + "It has trample, haste, and \"At the beginning of the end step, sacrifice this creature.\""; RiteOfTheRagingStormEffect() { @@ -120,7 +120,7 @@ class RiteOfTheRagingStormEffect extends OneShotEffect { class LightningRagerToken extends Token { LightningRagerToken() { - super("Lightning Rager", "5/1 red Elemental creature token named Lightning Rager onto the battlefield." + super("Lightning Rager", "5/1 red Elemental creature token named Lightning Rager." + "It has trample, haste, and \"At the beginning of the end step, sacrifice this creature.\""); this.setOriginalExpansionSetCode("C15"); cardType.add(CardType.CREATURE); diff --git a/Mage.Sets/src/mage/cards/r/RiteOfTheSerpent.java b/Mage.Sets/src/mage/cards/r/RiteOfTheSerpent.java index 4188c01522c..40669cd088c 100644 --- a/Mage.Sets/src/mage/cards/r/RiteOfTheSerpent.java +++ b/Mage.Sets/src/mage/cards/r/RiteOfTheSerpent.java @@ -52,7 +52,7 @@ public class RiteOfTheSerpent extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{B}{B}"); - // Destroy target creature. If that creature had a +1/+1 counter on it, put a 1/1 green Snake creature token onto the battlefield. + // Destroy target creature. If that creature had a +1/+1 counter on it, create a 1/1 green Snake creature token. this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new RiteOfTheSerpentEffect()); @@ -72,7 +72,7 @@ class RiteOfTheSerpentEffect extends OneShotEffect { public RiteOfTheSerpentEffect() { super(Outcome.Benefit); - this.staticText = "If that creature had a +1/+1 counter on it, put a 1/1 green Snake creature token onto the battlefield"; + this.staticText = "If that creature had a +1/+1 counter on it, create a 1/1 green Snake creature token"; } public RiteOfTheSerpentEffect(final RiteOfTheSerpentEffect effect) { diff --git a/Mage.Sets/src/mage/cards/r/RithTheAwakener.java b/Mage.Sets/src/mage/cards/r/RithTheAwakener.java index 3bf58ec94cd..b54620ce2c9 100644 --- a/Mage.Sets/src/mage/cards/r/RithTheAwakener.java +++ b/Mage.Sets/src/mage/cards/r/RithTheAwakener.java @@ -63,7 +63,7 @@ public class RithTheAwakener extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // Whenever Rith, the Awakener deals combat damage to a player, you may pay {2}{G}. If you do, choose a color, then put a 1/1 green Saproling creature token onto the battlefield for each permanent of that color. + // Whenever Rith, the Awakener deals combat damage to a player, you may pay {2}{G}. If you do, choose a color, then create a 1/1 green Saproling creature token for each permanent of that color. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility( new DoIfCostPaid(new RithTheAwakenerEffect(), new ManaCostsImpl("{2}{G}")), false)); } @@ -82,7 +82,7 @@ class RithTheAwakenerEffect extends OneShotEffect { public RithTheAwakenerEffect() { super(Outcome.Benefit); - this.staticText = "choose a color, then put a 1/1 green Saproling creature token onto the battlefield for each permanent of that color"; + this.staticText = "choose a color, then create a 1/1 green Saproling creature token for each permanent of that color"; } public RithTheAwakenerEffect(final RithTheAwakenerEffect effect) { diff --git a/Mage.Sets/src/mage/cards/r/RithsCharm.java b/Mage.Sets/src/mage/cards/r/RithsCharm.java index df3a33ea8c6..d31c6abfa25 100644 --- a/Mage.Sets/src/mage/cards/r/RithsCharm.java +++ b/Mage.Sets/src/mage/cards/r/RithsCharm.java @@ -51,7 +51,7 @@ public class RithsCharm extends CardImpl { this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetNonBasicLandPermanent()); - // or put three 1/1 green Saproling creature tokens onto the battlefield; + // or create three 1/1 green Saproling creature tokens; Mode mode = new Mode(); mode.getEffects().add(new CreateTokenEffect(new SaprolingToken(), 3)); this.getSpellAbility().addMode(mode); diff --git a/Mage.Sets/src/mage/cards/r/RitualOfTheReturned.java b/Mage.Sets/src/mage/cards/r/RitualOfTheReturned.java index dc6e3dfbc53..5390f4747f6 100644 --- a/Mage.Sets/src/mage/cards/r/RitualOfTheReturned.java +++ b/Mage.Sets/src/mage/cards/r/RitualOfTheReturned.java @@ -54,7 +54,7 @@ public class RitualOfTheReturned extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{B}"); - // Exile target creature card from your graveyard. Put a black Zombie creature token onto the battlefield with power equal to the exiled card's power and toughness equal to the exiled card's toughness. + // Exile target creature card from your graveyard. Create a black Zombie creature token with power equal to the exiled card's power and toughness equal to the exiled card's toughness. this.getSpellAbility().addEffect(new RitualOfTheReturnedExileEffect()); this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard())); } @@ -73,7 +73,7 @@ class RitualOfTheReturnedExileEffect extends OneShotEffect { public RitualOfTheReturnedExileEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Exile target creature card from your graveyard. Put a black Zombie creature token onto the battlefield with power equal to the exiled card's power and toughness equal to the exiled card's toughness"; + this.staticText = "Exile target creature card from your graveyard. Create a black Zombie creature token with power equal to the exiled card's power and toughness equal to the exiled card's toughness"; } public RitualOfTheReturnedExileEffect(final RitualOfTheReturnedExileEffect effect) { @@ -103,7 +103,7 @@ class RitualOfTheReturnedExileEffect extends OneShotEffect { class RitualOfTheReturnedZombieToken extends Token { public RitualOfTheReturnedZombieToken(int power, int toughness) { - super("Zombie", "black Zombie creature token onto the battlefield with power equal to the exiled card's power and toughness equal to the exiled card's toughness"); + super("Zombie", "black Zombie creature token with power equal to the exiled card's power and toughness equal to the exiled card's toughness"); this.setOriginalExpansionSetCode("JOU"); cardType.add(CardType.CREATURE); color.setBlack(true); diff --git a/Mage.Sets/src/mage/cards/r/RoarOfTheWurm.java b/Mage.Sets/src/mage/cards/r/RoarOfTheWurm.java index 6fa0f6b8279..98a8fcf1a9c 100644 --- a/Mage.Sets/src/mage/cards/r/RoarOfTheWurm.java +++ b/Mage.Sets/src/mage/cards/r/RoarOfTheWurm.java @@ -48,7 +48,7 @@ public class RoarOfTheWurm extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{6}{G}"); - // Put a 6/6 green Wurm creature token onto the battlefield. + // Create a 6/6 green Wurm creature token. this.getSpellAbility().addEffect(new CreateTokenEffect(new WurmToken())); // Flashback {3}{G} diff --git a/Mage.Sets/src/mage/cards/r/RootOut.java b/Mage.Sets/src/mage/cards/r/RootOut.java index d8b6bdfdebf..bb6f18008b3 100644 --- a/Mage.Sets/src/mage/cards/r/RootOut.java +++ b/Mage.Sets/src/mage/cards/r/RootOut.java @@ -51,7 +51,7 @@ public class RootOut extends CardImpl { this.getSpellAbility().addTarget(new TargetPermanent(new FilterArtifactOrEnchantmentPermanent())); // Investigate. Effect effect = new InvestigateEffect(); - effect.setText("
Investigate. (Put a colorless Clue artifact token onto the battlefield with \"{2}, Sacrifice this artifact: Draw a card.\")"); + effect.setText("
Investigate. (Create a colorless Clue artifact token with \"{2}, Sacrifice this artifact: Draw a card.\")"); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/cards/r/RootbornDefenses.java b/Mage.Sets/src/mage/cards/r/RootbornDefenses.java index 95176fae880..2627b4e0a0e 100644 --- a/Mage.Sets/src/mage/cards/r/RootbornDefenses.java +++ b/Mage.Sets/src/mage/cards/r/RootbornDefenses.java @@ -49,7 +49,7 @@ public class RootbornDefenses extends CardImpl { // Populate. Creatures you control are indestructible this turn. - // (To populate, put a token onto the battlefield that's a copy of a creature + // (To populate, create a token that's a copy of a creature // token you control. Damage and effects that say "destroy" don't destroy // indestructible creatures.) this.getSpellAbility().addEffect(new PopulateEffect()); diff --git a/Mage.Sets/src/mage/cards/r/RotlungReanimator.java b/Mage.Sets/src/mage/cards/r/RotlungReanimator.java index 8e99d60ea29..64225385010 100644 --- a/Mage.Sets/src/mage/cards/r/RotlungReanimator.java +++ b/Mage.Sets/src/mage/cards/r/RotlungReanimator.java @@ -57,7 +57,7 @@ public class RotlungReanimator extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // Whenever Rotlung Reanimator or another Cleric dies, put a 2/2 black Zombie creature token onto the battlefield. + // Whenever Rotlung Reanimator or another Cleric dies, create a 2/2 black Zombie creature token. this.addAbility(new DiesThisOrAnotherCreatureTriggeredAbility(new CreateTokenEffect(new ZombieToken()), false, filter)); } diff --git a/Mage.Sets/src/mage/cards/r/RousingOfSouls.java b/Mage.Sets/src/mage/cards/r/RousingOfSouls.java index b5ff5747a88..61124fc0e5a 100644 --- a/Mage.Sets/src/mage/cards/r/RousingOfSouls.java +++ b/Mage.Sets/src/mage/cards/r/RousingOfSouls.java @@ -52,7 +52,7 @@ public class RousingOfSouls extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{W}"); // Parley - Each player reveals the top card of his or her library. For each nonland card revealed this way, - // you put a 1/1 white Spirit creature token with flying onto the battlefield. Then each player draws a card. + // you create a 1/1 white Spirit creature token with flying. Then each player draws a card. this.getSpellAbility().addEffect(new RousingOfSoulsEffect()); Effect effect = new DrawCardAllEffect(1); effect.setText("Then each player draws a card"); @@ -73,7 +73,7 @@ class RousingOfSoulsEffect extends OneShotEffect { public RousingOfSoulsEffect() { super(Outcome.Benefit); - this.staticText = "Parley — Each player reveals the top card of his or her library. For each nonland card revealed this way, you put a 1/1 white Spirit creature token with flying onto the battlefield"; + this.staticText = "Parley — Each player reveals the top card of his or her library. For each nonland card revealed this way, you create a 1/1 white Spirit creature token with flying"; } public RousingOfSoulsEffect(final RousingOfSoulsEffect effect) { diff --git a/Mage.Sets/src/mage/cards/r/RukhEgg.java b/Mage.Sets/src/mage/cards/r/RukhEgg.java index 337d32a18f6..b925a7b653a 100644 --- a/Mage.Sets/src/mage/cards/r/RukhEgg.java +++ b/Mage.Sets/src/mage/cards/r/RukhEgg.java @@ -48,14 +48,14 @@ import mage.game.permanent.token.Token; public class RukhEgg extends CardImpl { public RukhEgg(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}"); this.subtype.add("Bird"); this.power = new MageInt(0); this.toughness = new MageInt(3); - // When Rukh Egg dies, put a 4/4 red Bird creature token with flying onto the battlefield at the beginning of the next end step. + // When Rukh Egg dies, create a 4/4 red Bird creature token with flying at the beginning of the next end step. Effect effect = new CreateDelayedTriggeredAbilityEffect(new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new CreateTokenEffect(new BirdToken()))); - effect.setText("put a 4/4 red Bird creature token with flying onto the battlefield at the beginning of the next end step"); + effect.setText("create a 4/4 red Bird creature token with flying at the beginning of the next end step"); Ability ability = new DiesTriggeredAbility(effect); this.addAbility(ability); } @@ -71,9 +71,9 @@ public class RukhEgg extends CardImpl { } class BirdToken extends Token { - + public BirdToken() { - this("ARN"); //there is no such token in either ARN, 8ED or 9ED + this("ARN"); //there is no such token in either ARN, 8ED or 9ED } public BirdToken(String setCode) { diff --git a/Mage.Sets/src/mage/cards/s/SaberAnts.java b/Mage.Sets/src/mage/cards/s/SaberAnts.java index 6b82346185c..24d245d3743 100644 --- a/Mage.Sets/src/mage/cards/s/SaberAnts.java +++ b/Mage.Sets/src/mage/cards/s/SaberAnts.java @@ -55,7 +55,7 @@ public class SaberAnts extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(3); - // Whenever Saber Ants is dealt damage, you may put that many 1/1 green Insect creature tokens onto the battlefield. + // Whenever Saber Ants is dealt damage, you may create that many 1/1 green Insect creature tokens. this.addAbility(new DealtDamageToSourceTriggeredAbility(Zone.BATTLEFIELD, new SaberAntsEffect(), true)); } @@ -73,7 +73,7 @@ class SaberAntsEffect extends OneShotEffect { public SaberAntsEffect() { super(Outcome.Benefit); - this.staticText = "you may put that many 1/1 green Insect creature tokens onto the battlefield"; + this.staticText = "you may create that many 1/1 green Insect creature tokens"; } public SaberAntsEffect(final SaberAntsEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SacredMesa.java b/Mage.Sets/src/mage/cards/s/SacredMesa.java index b3755c9bad7..8f37975c14a 100644 --- a/Mage.Sets/src/mage/cards/s/SacredMesa.java +++ b/Mage.Sets/src/mage/cards/s/SacredMesa.java @@ -61,7 +61,7 @@ public class SacredMesa extends CardImpl { // At the beginning of your upkeep, sacrifice Sacred Mesa unless you sacrifice a Pegasus. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new SacrificeTargetCost(new TargetControlledPermanent(filter))), TargetController.YOU, false)); - // {1}{W}: Put a 1/1 white Pegasus creature token with flying onto the battlefield. + // {1}{W}: Create a 1/1 white Pegasus creature token with flying. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new PegasusToken()), new ManaCostsImpl<>("{1}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/s/SanctifierOfSouls.java b/Mage.Sets/src/mage/cards/s/SanctifierOfSouls.java index 272e4d39846..75e9f3d2f13 100644 --- a/Mage.Sets/src/mage/cards/s/SanctifierOfSouls.java +++ b/Mage.Sets/src/mage/cards/s/SanctifierOfSouls.java @@ -69,7 +69,7 @@ public class SanctifierOfSouls extends CardImpl { // Whenever another creature enters the battlefield under your control, Sanctifier of Souls gets +1/+1 until end of turn. this.addAbility(new EntersBattlefieldControlledTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), filter)); - // {2}{W}, Exile a creature card from your graveyard: Put a 1/1 white Spirit creature token with flying onto the battlefield. + // {2}{W}, Exile a creature card from your graveyard: Create a 1/1 white Spirit creature token with flying. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SpiritWhiteToken()), new ManaCostsImpl("{2}{W}")); diff --git a/Mage.Sets/src/mage/cards/s/SandsteppeOutcast.java b/Mage.Sets/src/mage/cards/s/SandsteppeOutcast.java index 2e938d54ddb..ec798c25405 100644 --- a/Mage.Sets/src/mage/cards/s/SandsteppeOutcast.java +++ b/Mage.Sets/src/mage/cards/s/SandsteppeOutcast.java @@ -57,7 +57,7 @@ public class SandsteppeOutcast extends CardImpl { // * Put a +1/+1 counter on Sandsteppe Outcast. Ability ability = new EntersBattlefieldTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance())); - // * Put a 1/1 white Spirit creature token with flying onto the battlefield. + // * Create a 1/1 white Spirit creature token with flying. Mode mode = new Mode(); mode.getEffects().add(new CreateTokenEffect(new SpiritWhiteToken("FRF"))); ability.addMode(mode); diff --git a/Mage.Sets/src/mage/cards/s/SaprolingBurst.java b/Mage.Sets/src/mage/cards/s/SaprolingBurst.java index 363e32243f6..c9e1f31808a 100644 --- a/Mage.Sets/src/mage/cards/s/SaprolingBurst.java +++ b/Mage.Sets/src/mage/cards/s/SaprolingBurst.java @@ -61,15 +61,15 @@ import mage.util.CardUtil; public class SaprolingBurst extends CardImpl { public SaprolingBurst(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{4}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{G}"); // Fading 7 this.addAbility(new FadingAbility(7, this)); - - // Remove a fade counter from Saproling Burst: Put a green Saproling creature token onto the battlefield. It has "This creature's power and toughness are each equal to the number of fade counters on Saproling Burst." + + // Remove a fade counter from Saproling Burst: create a green Saproling creature token. It has "This creature's power and toughness are each equal to the number of fade counters on Saproling Burst." this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SaprolingBurstCreateTokenEffect(), new RemoveCountersSourceCost(CounterType.FADE.createInstance()))); - - // When Saproling Burst leaves the battlefield, destroy all tokens put onto the battlefield with Saproling Burst. They can't be regenerated. + + // When Saproling Burst leaves the battlefield, destroy all tokens created with Saproling Burst. They can't be regenerated. this.addAbility(new SaprolingBurstLeavesBattlefieldTriggeredAbility()); } @@ -84,21 +84,21 @@ public class SaprolingBurst extends CardImpl { } class SaprolingBurstCreateTokenEffect extends OneShotEffect { - + SaprolingBurstCreateTokenEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Put a green Saproling creature token onto the battlefield. It has \"This creature's power and toughness are each equal to the number of fade counters on {this}.\""; + this.staticText = "create a green Saproling creature token. It has \"This creature's power and toughness are each equal to the number of fade counters on {this}.\""; } - + SaprolingBurstCreateTokenEffect(final SaprolingBurstCreateTokenEffect effect) { super(effect); } - + @Override public SaprolingBurstCreateTokenEffect copy() { return new SaprolingBurstCreateTokenEffect(this); } - + @Override @SuppressWarnings("unchecked") public boolean apply(Game game, Ability source) { @@ -110,8 +110,7 @@ class SaprolingBurstCreateTokenEffect extends OneShotEffect { Set tokensCreated; if (object != null) { tokensCreated = (Set) object; - } - else { + } else { tokensCreated = new HashSet<>(); } for (UUID tokenId : token.getLastAddedTokenIds()) { @@ -124,7 +123,7 @@ class SaprolingBurstCreateTokenEffect extends OneShotEffect { } class SaprolingBurstToken extends Token { - + SaprolingBurstToken(MageObjectReference saprolingBurstMOR) { super("Saproling", "green Saproling creature token with \"This creature's power and toughness are each equal to the number of fade counters on Saproling Burst.\""); this.color.setGreen(true); @@ -201,24 +200,24 @@ class SaprolingBurstLeavesBattlefieldTriggeredAbility extends ZoneChangeTriggere } class SaprolingBurstDestroyEffect extends OneShotEffect { - + private String cardZoneString; - + SaprolingBurstDestroyEffect() { super(Outcome.Benefit); - this.staticText = "destroy all tokens put onto the battlefield with {this}. They can't be regenerated"; + this.staticText = "destroy all tokens created with {this}. They can't be regenerated"; } - + SaprolingBurstDestroyEffect(final SaprolingBurstDestroyEffect effect) { super(effect); this.cardZoneString = effect.cardZoneString; } - + @Override public SaprolingBurstDestroyEffect copy() { return new SaprolingBurstDestroyEffect(this); } - + @Override @SuppressWarnings("unchecked") public boolean apply(Game game, Ability source) { @@ -234,7 +233,7 @@ class SaprolingBurstDestroyEffect extends OneShotEffect { } return true; } - + public void setCardZoneString(String cardZoneString) { this.cardZoneString = cardZoneString; } diff --git a/Mage.Sets/src/mage/cards/s/SaprolingCluster.java b/Mage.Sets/src/mage/cards/s/SaprolingCluster.java index a836711bfe5..5a94d9e01c2 100644 --- a/Mage.Sets/src/mage/cards/s/SaprolingCluster.java +++ b/Mage.Sets/src/mage/cards/s/SaprolingCluster.java @@ -49,7 +49,7 @@ public class SaprolingCluster extends CardImpl { public SaprolingCluster(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{G}"); - // {1}, Discard a card: Put a 1/1 green Saproling creature token onto the battlefield. Any player may activate this ability. + // {1}, Discard a card: Create a 1/1 green Saproling creature token. Any player may activate this ability. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()) , new GenericManaCost(1)); ability.addCost(new DiscardCardCost()); ability.setMayActivate(TargetController.ANY); diff --git a/Mage.Sets/src/mage/cards/s/SaprolingSymbiosis.java b/Mage.Sets/src/mage/cards/s/SaprolingSymbiosis.java index 1ccba3f7d98..77c70ea0e26 100644 --- a/Mage.Sets/src/mage/cards/s/SaprolingSymbiosis.java +++ b/Mage.Sets/src/mage/cards/s/SaprolingSymbiosis.java @@ -55,7 +55,7 @@ public class SaprolingSymbiosis extends CardImpl { Ability ability = new PayMoreToCastAsThoughtItHadFlashAbility(this, new ManaCostsImpl("{2}")); ability.addEffect(effect); this.addAbility(ability); - // Put a 1/1 green Saproling creature token onto the battlefield for each creature you control. + // Create a 1/1 green Saproling creature token for each creature you control. this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/cards/s/Sarcomancy.java b/Mage.Sets/src/mage/cards/s/Sarcomancy.java index 5b47de3290c..56ae426deaf 100644 --- a/Mage.Sets/src/mage/cards/s/Sarcomancy.java +++ b/Mage.Sets/src/mage/cards/s/Sarcomancy.java @@ -52,7 +52,7 @@ public class Sarcomancy extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{B}"); - // When Sarcomancy enters the battlefield, put a 2/2 black Zombie creature token onto the battlefield. + // When Sarcomancy enters the battlefield, create a 2/2 black Zombie creature token. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new ZombieToken(), 1), false)); // At the beginning of your upkeep, if there are no Zombies on the battlefield, Sarcomancy deals 1 damage to you. this.addAbility(new ConditionalTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/s/SarkhanTheMad.java b/Mage.Sets/src/mage/cards/s/SarkhanTheMad.java index c02a62497b8..deca28c3f90 100644 --- a/Mage.Sets/src/mage/cards/s/SarkhanTheMad.java +++ b/Mage.Sets/src/mage/cards/s/SarkhanTheMad.java @@ -128,7 +128,7 @@ class SarkhanTheMadRevealAndDrawEffect extends OneShotEffect { class SarkhanTheMadSacEffect extends OneShotEffect { - private static final String effectText = "Target creature's controller sacrifices it, then that player puts a 5/5 red Dragon creature token with flying onto the battlefield"; + private static final String effectText = "Target creature's controller sacrifices it, then that player creates a 5/5 red Dragon creature token with flying"; SarkhanTheMadSacEffect() { super(Outcome.Sacrifice); diff --git a/Mage.Sets/src/mage/cards/s/SarkhanUnbroken.java b/Mage.Sets/src/mage/cards/s/SarkhanUnbroken.java index 133aad625ed..18ff9650307 100644 --- a/Mage.Sets/src/mage/cards/s/SarkhanUnbroken.java +++ b/Mage.Sets/src/mage/cards/s/SarkhanUnbroken.java @@ -70,7 +70,7 @@ public class SarkhanUnbroken extends CardImpl { // +1: Draw a card, then add one mana of any color to your mana pool. this.addAbility(new LoyaltyAbility(new SarkhanUnbrokenAbility1(), 1)); - // -2: Put a 4/4 red Dragon creature token with flying onto the battlefield. + // -2: Create a 4/4 red Dragon creature token with flying. this.addAbility(new LoyaltyAbility(new CreateTokenEffect(new DragonToken(), 1), -2)); // -8: Search your library for any number of Dragon creature cards and put them onto the battlefield. Then shuffle your library. this.addAbility(new LoyaltyAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, Integer.MAX_VALUE, dragonFilter)), -8)); diff --git a/Mage.Sets/src/mage/cards/s/SarkhanVol.java b/Mage.Sets/src/mage/cards/s/SarkhanVol.java index e71ce157387..40e0391f5dd 100644 --- a/Mage.Sets/src/mage/cards/s/SarkhanVol.java +++ b/Mage.Sets/src/mage/cards/s/SarkhanVol.java @@ -75,7 +75,7 @@ public class SarkhanVol extends CardImpl { ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); - // -6: Put five 4/4 red Dragon creature tokens with flying onto the battlefield. + // -6: Create five 4/4 red Dragon creature tokens with flying. this.addAbility(new LoyaltyAbility(new CreateTokenEffect(dragonToken, 5), -6)); } diff --git a/Mage.Sets/src/mage/cards/s/SarpadianEmpiresVolVii.java b/Mage.Sets/src/mage/cards/s/SarpadianEmpiresVolVii.java index 0c8d186d732..f205359c8ac 100644 --- a/Mage.Sets/src/mage/cards/s/SarpadianEmpiresVolVii.java +++ b/Mage.Sets/src/mage/cards/s/SarpadianEmpiresVolVii.java @@ -61,7 +61,7 @@ public class SarpadianEmpiresVolVii extends CardImpl { // As Sarpadian Empires, Vol. VII enters the battlefield, choose white Citizen, blue Camarid, black Thrull, red Goblin, or green Saproling. this.addAbility(new AsEntersBattlefieldAbility(new ChooseTokenEffect())); - // {3}, {T}: Put a 1/1 creature token of the chosen color and type onto the battlefield. + // {3}, {T}: Create a 1/1 creature token of the chosen color and type. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateSelectedTokenEffect(), new ManaCostsImpl("{3}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); @@ -119,7 +119,7 @@ class CreateSelectedTokenEffect extends OneShotEffect { public CreateSelectedTokenEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "put a 1/1 creature token of the chosen color and type onto the battlefield"; + this.staticText = "create a 1/1 creature token of the chosen color and type"; } public CreateSelectedTokenEffect(final CreateSelectedTokenEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SatyrNyxSmith.java b/Mage.Sets/src/mage/cards/s/SatyrNyxSmith.java index b7e933b002f..f757d39fd2f 100644 --- a/Mage.Sets/src/mage/cards/s/SatyrNyxSmith.java +++ b/Mage.Sets/src/mage/cards/s/SatyrNyxSmith.java @@ -55,7 +55,7 @@ public class SatyrNyxSmith extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); - // Inspired - Whenever Satyr Nyx-Smith becomes untapped, you may pay {2}{R}. If you do, put a 3/1 red Elemental enchantment creature token with haste onto the battlefield. + // Inspired - Whenever Satyr Nyx-Smith becomes untapped, you may pay {2}{R}. If you do, create a 3/1 red Elemental enchantment creature token with haste. this.addAbility(new InspiredAbility(new DoIfCostPaid(new CreateTokenEffect(new SatyrNyxSmithElementalToken()), new ManaCostsImpl("{2}{R}")))); } diff --git a/Mage.Sets/src/mage/cards/s/SavageConception.java b/Mage.Sets/src/mage/cards/s/SavageConception.java index a04d089fc4f..af5c677c780 100644 --- a/Mage.Sets/src/mage/cards/s/SavageConception.java +++ b/Mage.Sets/src/mage/cards/s/SavageConception.java @@ -45,7 +45,7 @@ public class SavageConception extends CardImpl { public SavageConception(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{G}{G}"); - // Put a 3/3 green Beast creature token onto the battlefield. + // Create a 3/3 green Beast creature token. this.getSpellAbility().addEffect(new CreateTokenEffect(new BeastToken())); // Retrace this.addAbility(new RetraceAbility(this)); diff --git a/Mage.Sets/src/mage/cards/s/SavageThallid.java b/Mage.Sets/src/mage/cards/s/SavageThallid.java index 946eaf1ccd8..b883b9a92ca 100644 --- a/Mage.Sets/src/mage/cards/s/SavageThallid.java +++ b/Mage.Sets/src/mage/cards/s/SavageThallid.java @@ -76,7 +76,7 @@ public class SavageThallid extends CardImpl { // At the beginning of your upkeep, put a spore counter on Savage Thallid. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()), TargetController.YOU, false)); - // Remove three spore counters from Savage Thallid: Put a 1/1 green Saproling creature token onto the battlefield. + // Remove three spore counters from Savage Thallid: Create a 1/1 green Saproling creature token. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); // Sacrifice a Saproling: Regenerate target Fungus. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/s/ScatterTheSeeds.java b/Mage.Sets/src/mage/cards/s/ScatterTheSeeds.java index 377c5190c0e..7348daed9d4 100644 --- a/Mage.Sets/src/mage/cards/s/ScatterTheSeeds.java +++ b/Mage.Sets/src/mage/cards/s/ScatterTheSeeds.java @@ -47,7 +47,7 @@ public class ScatterTheSeeds extends CardImpl { // Convoke this.addAbility(new ConvokeAbility()); - // Put three 1/1 green Saproling creature tokens onto the battlefield. + // Create three 1/1 green Saproling creature tokens. this.getSpellAbility().addEffect(new CreateTokenEffect(new SaprolingToken(), 3)); } diff --git a/Mage.Sets/src/mage/cards/s/ScionOfVituGhazi.java b/Mage.Sets/src/mage/cards/s/ScionOfVituGhazi.java index d5e4daa9866..aa1b2680679 100644 --- a/Mage.Sets/src/mage/cards/s/ScionOfVituGhazi.java +++ b/Mage.Sets/src/mage/cards/s/ScionOfVituGhazi.java @@ -57,7 +57,7 @@ public class ScionOfVituGhazi extends CardImpl { TriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new BirdToken()), false); ability.addEffect(new PopulateEffect("then")); this.addAbility(new ConditionalTriggeredAbility(ability, new CastFromHandSourceCondition(), - "When {this} enters the battlefield, if you cast it from your hand, put a 1/1 white Bird creature token with flying onto the battlefield, then populate."), + "When {this} enters the battlefield, if you cast it from your hand, create a 1/1 white Bird creature token with flying, then populate."), new CastFromHandWatcher()); } diff --git a/Mage.Sets/src/mage/cards/s/ScionSummoner.java b/Mage.Sets/src/mage/cards/s/ScionSummoner.java index 1ea1df98c54..a3d9b92649a 100644 --- a/Mage.Sets/src/mage/cards/s/ScionSummoner.java +++ b/Mage.Sets/src/mage/cards/s/ScionSummoner.java @@ -54,10 +54,10 @@ public class ScionSummoner extends CardImpl { // Devoid this.addAbility(new DevoidAbility(this.color)); - // When Scion Summoner enters the battlefield, put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. + // When Scion Summoner enters the battlefield, create a 1/1 colorless Eldrazi Scion creature token. // It has "Sacrifice this creature: Add {C} to your mana pool." Effect effect = new CreateTokenEffect(new EldraziScionToken()); - effect.setText("put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has \"Sacrifice this creature: Add {C} to your mana pool.\""); + effect.setText("create a 1/1 colorless Eldrazi Scion creature token. It has \"Sacrifice this creature: Add {C} to your mana pool.\""); this.addAbility(new EntersBattlefieldTriggeredAbility(effect, false)); } diff --git a/Mage.Sets/src/mage/cards/s/Seance.java b/Mage.Sets/src/mage/cards/s/Seance.java index 93bb3a8e0d5..b612367fb7b 100644 --- a/Mage.Sets/src/mage/cards/s/Seance.java +++ b/Mage.Sets/src/mage/cards/s/Seance.java @@ -58,7 +58,7 @@ public class Seance extends CardImpl { public Seance(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}{W}"); - // At the beginning of each upkeep, you may exile target creature card from your graveyard. If you do, put a token onto the battlefield that's a copy of that card except it's a Spirit in addition to its other types. Exile it at the beginning of the next end step. + // At the beginning of each upkeep, you may exile target creature card from your graveyard. If you do, create a token that's a copy of that card except it's a Spirit in addition to its other types. Exile it at the beginning of the next end step. Ability ability = new BeginningOfUpkeepTriggeredAbility(new SeanceEffect(), TargetController.ANY, true); ability.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard())); this.addAbility(ability); @@ -78,7 +78,7 @@ class SeanceEffect extends OneShotEffect { public SeanceEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "you may exile target creature card from your graveyard. If you do, put a token onto the battlefield that's a copy of that card except it's a Spirit in addition to its other types. Exile it at the beginning of the next end step"; + this.staticText = "you may exile target creature card from your graveyard. If you do, create a token that's a copy of that card except it's a Spirit in addition to its other types. Exile it at the beginning of the next end step"; } public SeanceEffect(final SeanceEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SecondHarvest.java b/Mage.Sets/src/mage/cards/s/SecondHarvest.java index b5bc4eadad9..8350f3fa3be 100644 --- a/Mage.Sets/src/mage/cards/s/SecondHarvest.java +++ b/Mage.Sets/src/mage/cards/s/SecondHarvest.java @@ -51,7 +51,7 @@ public class SecondHarvest extends CardImpl { public SecondHarvest(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{G}{G}"); - // For each token you control, put a token onto the battlefield that's a copy of that permanent. + // For each token you control, create a token that's a copy of that permanent. this.getSpellAbility().addEffect(new SecondHarvestEffect()); } @@ -69,7 +69,7 @@ class SecondHarvestEffect extends OneShotEffect { public SecondHarvestEffect() { super(Outcome.Benefit); - this.staticText = "For each token you control, put a token onto the the battlefield that's a copy of that permanent"; + this.staticText = "For each token you control, create a token that's a copy of that permanent"; } public SecondHarvestEffect(final SecondHarvestEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SecureTheWastes.java b/Mage.Sets/src/mage/cards/s/SecureTheWastes.java index a2ab723edc1..cb24c0c5ee9 100644 --- a/Mage.Sets/src/mage/cards/s/SecureTheWastes.java +++ b/Mage.Sets/src/mage/cards/s/SecureTheWastes.java @@ -44,7 +44,7 @@ public class SecureTheWastes extends CardImpl { public SecureTheWastes(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{X}{W}"); - // Put X 1/1 white Warrior creature tokens onto the battlefield. + // create X 1/1 white Warrior creature tokens. this.getSpellAbility().addEffect(new CreateTokenEffect(new WarriorToken(), new ManacostVariableValue())); } diff --git a/Mage.Sets/src/mage/cards/s/SecurityBlockade.java b/Mage.Sets/src/mage/cards/s/SecurityBlockade.java index fb39eb7512c..8eb67b5301d 100644 --- a/Mage.Sets/src/mage/cards/s/SecurityBlockade.java +++ b/Mage.Sets/src/mage/cards/s/SecurityBlockade.java @@ -72,7 +72,7 @@ public class SecurityBlockade extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // When Security Blockade enters the battlefield, put a 2/2 white Knight creature token with vigilance onto the battlefield. + // When Security Blockade enters the battlefield, create a 2/2 white Knight creature token with vigilance. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new KnightToken()))); // Enchanted land has "{T}: Prevent the next 1 damage that would be dealt to you this turn." diff --git a/Mage.Sets/src/mage/cards/s/SeedGuardian.java b/Mage.Sets/src/mage/cards/s/SeedGuardian.java index 9d1a0a9644f..7d8f6cfe092 100644 --- a/Mage.Sets/src/mage/cards/s/SeedGuardian.java +++ b/Mage.Sets/src/mage/cards/s/SeedGuardian.java @@ -57,7 +57,7 @@ public class SeedGuardian extends CardImpl { // Reach this.addAbility(ReachAbility.getInstance()); - // When Seed Guardian dies, put an X/X green Elemental creature token onto the battlefield, where X is the number of creature cards in your graveyard. + // When Seed Guardian dies, create an X/X green Elemental creature token, where X is the number of creature cards in your graveyard. this.addAbility(new DiesTriggeredAbility(new SeedGuardianEffect(), false)); } @@ -75,7 +75,7 @@ class SeedGuardianEffect extends OneShotEffect { public SeedGuardianEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "put an X/X green Elemental creature token onto the battlefield, where X is the number of creature cards in your graveyard"; + this.staticText = "create an X/X green Elemental creature token, where X is the number of creature cards in your graveyard"; } public SeedGuardianEffect(final SeedGuardianEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SeedSpark.java b/Mage.Sets/src/mage/cards/s/SeedSpark.java index 5bd5600d82a..34760eed63a 100644 --- a/Mage.Sets/src/mage/cards/s/SeedSpark.java +++ b/Mage.Sets/src/mage/cards/s/SeedSpark.java @@ -53,10 +53,10 @@ public class SeedSpark extends CardImpl { this.getSpellAbility().addTarget(new TargetPermanent(new FilterArtifactOrEnchantmentPermanent())); this.getSpellAbility().addEffect(new DestroyTargetEffect()); - //If {G} was spent to cast Seed Spark, put two 1/1 green Saproling creature tokens onto the battlefield. + //If {G} was spent to cast Seed Spark, create two 1/1 green Saproling creature tokens. this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new CreateTokenEffect(new SaprolingToken(), 2), - new ManaWasSpentCondition(ColoredManaSymbol.G), "If {G} was spent to cast {this}, put two 1/1 green Saproling creature tokens onto the battlefield")); + new ManaWasSpentCondition(ColoredManaSymbol.G), "If {G} was spent to cast {this}, create two 1/1 green Saproling creature tokens")); } public SeedSpark(final SeedSpark card) { diff --git a/Mage.Sets/src/mage/cards/s/SeedTheLand.java b/Mage.Sets/src/mage/cards/s/SeedTheLand.java index 44c34276e98..c1d4b76abc3 100644 --- a/Mage.Sets/src/mage/cards/s/SeedTheLand.java +++ b/Mage.Sets/src/mage/cards/s/SeedTheLand.java @@ -47,10 +47,10 @@ public class SeedTheLand extends CardImpl { public SeedTheLand(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{G}{G}"); - // Whenever a land enters the battlefield, its controller puts a 1/1 green Snake creature token onto the battlefield. + // Whenever a land enters the battlefield, its controller creates a 1/1 green Snake creature token. this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new CreateTokenTargetEffect(new SnakeToken()), new FilterLandPermanent(), false, SetTargetPointer.PLAYER, - "Whenever a land enters the battlefield, its controller puts a 1/1 green Snake creature token onto the battlefield.")); + "Whenever a land enters the battlefield, its controller creates a 1/1 green Snake creature token.")); } public SeedTheLand(final SeedTheLand card) { diff --git a/Mage.Sets/src/mage/cards/s/SekKuarDeathkeeper.java b/Mage.Sets/src/mage/cards/s/SekKuarDeathkeeper.java index 089abde2634..7a26d72f96e 100644 --- a/Mage.Sets/src/mage/cards/s/SekKuarDeathkeeper.java +++ b/Mage.Sets/src/mage/cards/s/SekKuarDeathkeeper.java @@ -65,7 +65,7 @@ public class SekKuarDeathkeeper extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(3); - // Whenever another nontoken creature you control dies, put a 3/1 black and red Graveborn creature token with haste onto the battlefield. + // Whenever another nontoken creature you control dies, create a 3/1 black and red Graveborn creature token with haste. this.addAbility(new DiesCreatureTriggeredAbility(new CreateTokenEffect(new SekKuarDeathkeeperGravebornToken()),false, filter)); } diff --git a/Mage.Sets/src/mage/cards/s/SekkiSeasonsGuide.java b/Mage.Sets/src/mage/cards/s/SekkiSeasonsGuide.java index 4977f0c099f..c19798d3723 100644 --- a/Mage.Sets/src/mage/cards/s/SekkiSeasonsGuide.java +++ b/Mage.Sets/src/mage/cards/s/SekkiSeasonsGuide.java @@ -75,7 +75,7 @@ public class SekkiSeasonsGuide extends CardImpl { // Sekki, Seasons' Guide enters the battlefield with eight +1/+1 counters on it. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(8)), "with eight +1/+1 counters on it")); - // If damage would be dealt to Sekki, prevent that damage, remove that many +1/+1 counters from Sekki, and put that many 1/1 colorless Spirit creature tokens onto the battlefield. + // If damage would be dealt to Sekki, prevent that damage, remove that many +1/+1 counters from Sekki, and create that many 1/1 colorless Spirit creature tokens. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SekkiSeasonsGuideEffect())); // Sacrifice eight Spirits: Return Sekki from your graveyard to the battlefield. @@ -99,7 +99,7 @@ class SekkiSeasonsGuideEffect extends PreventionEffectImpl { public SekkiSeasonsGuideEffect() { super(Duration.WhileOnBattlefield, Integer.MAX_VALUE, false, false); - staticText = "If damage would be dealt to {this}, prevent that damage, remove that many +1/+1 counters from {this}, and put that many 1/1 colorless Spirit creature tokens onto the battlefield"; + staticText = "If damage would be dealt to {this}, prevent that damage, remove that many +1/+1 counters from {this}, and create that many 1/1 colorless Spirit creature tokens"; } public SekkiSeasonsGuideEffect(final SekkiSeasonsGuideEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SelesnyaCharm.java b/Mage.Sets/src/mage/cards/s/SelesnyaCharm.java index d00ecf75762..1b90c7e4622 100644 --- a/Mage.Sets/src/mage/cards/s/SelesnyaCharm.java +++ b/Mage.Sets/src/mage/cards/s/SelesnyaCharm.java @@ -76,7 +76,7 @@ public class SelesnyaCharm extends CardImpl { mode.getTargets().add(new TargetCreaturePermanent(filter)); this.getSpellAbility().addMode(mode); - // or put a 2/2 white Knight creature token with vigilance onto the battlefield. + // or create a 2/2 white Knight creature token with vigilance. mode = new Mode(); mode.getEffects().add(new CreateTokenEffect(new KnightToken())); this.getSpellAbility().addMode(mode); diff --git a/Mage.Sets/src/mage/cards/s/SelesnyaEvangel.java b/Mage.Sets/src/mage/cards/s/SelesnyaEvangel.java index b234d23d980..2b54af1aa07 100644 --- a/Mage.Sets/src/mage/cards/s/SelesnyaEvangel.java +++ b/Mage.Sets/src/mage/cards/s/SelesnyaEvangel.java @@ -66,7 +66,7 @@ public class SelesnyaEvangel extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - // {1}, {tap}, Tap an untapped creature you control: Put a 1/1 green Saproling creature token onto the battlefield. + // {1}, {tap}, Tap an untapped creature you control: Create a 1/1 green Saproling creature token. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true))); diff --git a/Mage.Sets/src/mage/cards/s/SelesnyaGuildmage.java b/Mage.Sets/src/mage/cards/s/SelesnyaGuildmage.java index 9480a5e3d1f..1b159ab379d 100644 --- a/Mage.Sets/src/mage/cards/s/SelesnyaGuildmage.java +++ b/Mage.Sets/src/mage/cards/s/SelesnyaGuildmage.java @@ -57,7 +57,7 @@ public class SelesnyaGuildmage extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // {3}{G}: Put a 1/1 green Saproling creature token onto the battlefield. + // {3}{G}: Create a 1/1 green Saproling creature token. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl("{3}{G}"))); // {3}{W}: Creatures you control get +1/+1 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{3}{W}"))); diff --git a/Mage.Sets/src/mage/cards/s/SellerOfSongbirds.java b/Mage.Sets/src/mage/cards/s/SellerOfSongbirds.java index a87f86f4711..34aaa2a7c50 100644 --- a/Mage.Sets/src/mage/cards/s/SellerOfSongbirds.java +++ b/Mage.Sets/src/mage/cards/s/SellerOfSongbirds.java @@ -49,7 +49,7 @@ public class SellerOfSongbirds extends CardImpl { this.toughness = new MageInt(2); - // When Seller of Songbirds enters the battlefield, put a 1/1 white Bird creature token with flying onto the battlefield. + // When Seller of Songbirds enters the battlefield, create a 1/1 white Bird creature token with flying. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new BirdToken()))); } diff --git a/Mage.Sets/src/mage/cards/s/SelvalasCharge.java b/Mage.Sets/src/mage/cards/s/SelvalasCharge.java index 55d504b61e9..24380534add 100644 --- a/Mage.Sets/src/mage/cards/s/SelvalasCharge.java +++ b/Mage.Sets/src/mage/cards/s/SelvalasCharge.java @@ -51,7 +51,7 @@ public class SelvalasCharge extends CardImpl { public SelvalasCharge(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{G}"); - // Parley - Each player reveals the top card of his or her library. For each nonland card revealed this way, you put a 3/3 green Elephant creature token onto the battlefield. Then each player draws a card. + // Parley - Each player reveals the top card of his or her library. For each nonland card revealed this way, you create a 3/3 green Elephant creature token. Then each player draws a card. this.getSpellAbility().addEffect(new SelvalasChargeEffect()); Effect effect = new DrawCardAllEffect(1); effect.setText("Then each player draws a card"); @@ -72,7 +72,7 @@ class SelvalasChargeEffect extends OneShotEffect { public SelvalasChargeEffect() { super(Outcome.Benefit); - this.staticText = "Parley — Each player reveals the top card of his or her library. For each nonland card revealed this way, you put a 3/3 green Elephant creature token onto the battlefield"; + this.staticText = "Parley — Each player reveals the top card of his or her library. For each nonland card revealed this way, you create a 3/3 green Elephant creature token"; } public SelvalasChargeEffect(final SelvalasChargeEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SengirAutocrat.java b/Mage.Sets/src/mage/cards/s/SengirAutocrat.java index 74aa3901db8..4b8d2452732 100644 --- a/Mage.Sets/src/mage/cards/s/SengirAutocrat.java +++ b/Mage.Sets/src/mage/cards/s/SengirAutocrat.java @@ -62,7 +62,7 @@ public class SengirAutocrat extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // When Sengir Autocrat enters the battlefield, put three 0/1 black Serf creature tokens onto the battlefield. + // When Sengir Autocrat enters the battlefield, create three 0/1 black Serf creature tokens. Ability ability = new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new SerfToken(), 3)); this.addAbility(ability); // When Sengir Autocrat leaves the battlefield, exile all Serf tokens. diff --git a/Mage.Sets/src/mage/cards/s/SengirNosferatu.java b/Mage.Sets/src/mage/cards/s/SengirNosferatu.java index 3a29175b742..187080fd67c 100644 --- a/Mage.Sets/src/mage/cards/s/SengirNosferatu.java +++ b/Mage.Sets/src/mage/cards/s/SengirNosferatu.java @@ -67,9 +67,9 @@ public class SengirNosferatu extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // {1}{B}, Exile Sengir Nosferatu: Put a 1/2 black Bat creature token with flying onto the battlefield. It has "{1}{B}, Sacrifice this creature: Return an exiled card named Sengir Nosferatu to the battlefield under its owner's control." + // {1}{B}, Exile Sengir Nosferatu: Create a 1/2 black Bat creature token with flying. It has "{1}{B}, Sacrifice this creature: Return an exiled card named Sengir Nosferatu to the battlefield under its owner's control." Effect effect = new CreateTokenEffect(new SengirNosferatuBatToken(), 1); - effect.setText("Put a 1/2 black Bat creature token with flying onto the battlefield. It has \"{1}{B}, Sacrifice this creature: Return an exiled card named Sengir Nosferatu to the battlefield under its owner's control.\""); + effect.setText("Create a 1/2 black Bat creature token with flying. It has \"{1}{B}, Sacrifice this creature: Return an exiled card named Sengir Nosferatu to the battlefield under its owner's control.\""); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{1}{B}")); ability.addCost(new ExileSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SensorSplicer.java b/Mage.Sets/src/mage/cards/s/SensorSplicer.java index e241533b7ad..0a92f6d22c4 100644 --- a/Mage.Sets/src/mage/cards/s/SensorSplicer.java +++ b/Mage.Sets/src/mage/cards/s/SensorSplicer.java @@ -64,7 +64,7 @@ public class SensorSplicer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // When Sensor Splicer enters the battlefield, put a 3/3 colorless Golem artifact creature token onto the battlefield. + // When Sensor Splicer enters the battlefield, create a 3/3 colorless Golem artifact creature token. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new GolemToken(expansionSetCode)))); // Golem creatures you control have vigilance. diff --git a/Mage.Sets/src/mage/cards/s/SerpentGenerator.java b/Mage.Sets/src/mage/cards/s/SerpentGenerator.java index 35b11443623..dee8e1f3cd4 100644 --- a/Mage.Sets/src/mage/cards/s/SerpentGenerator.java +++ b/Mage.Sets/src/mage/cards/s/SerpentGenerator.java @@ -52,9 +52,9 @@ public class SerpentGenerator extends CardImpl { public SerpentGenerator(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{6}"); - // {4}, {tap}: Put a 1/1 colorless Snake artifact creature token onto the battlefield. It has "Whenever this creature deals damage to a player, that player gets a poison counter." + // {4}, {tap}: Create a 1/1 colorless Snake artifact creature token. It has "Whenever this creature deals damage to a player, that player gets a poison counter." Effect effect = new CreateTokenEffect(new SnakeToken()); - effect.setText("Put a 1/1 colorless Snake artifact creature token onto the battlefield. It has \"Whenever this creature deals damage to a player, that player gets a poison counter.\""); + effect.setText("Create a 1/1 colorless Snake artifact creature token. It has \"Whenever this creature deals damage to a player, that player gets a poison counter.\""); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{4}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ShambleBack.java b/Mage.Sets/src/mage/cards/s/ShambleBack.java index c0bc83ea00b..05234899ae4 100644 --- a/Mage.Sets/src/mage/cards/s/ShambleBack.java +++ b/Mage.Sets/src/mage/cards/s/ShambleBack.java @@ -47,7 +47,7 @@ public class ShambleBack extends CardImpl { public ShambleBack(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{B}"); - // Exile target creature card from a graveyard. Put a 2/2 black Zombie creature token onto the battlefield. You gain 2 life. + // Exile target creature card from a graveyard. Create a 2/2 black Zombie creature token. You gain 2 life. this.getSpellAbility().addEffect(new ExileTargetEffect()); this.getSpellAbility().addTarget(new TargetCardInGraveyard(new FilterCreatureCard("creature card from a graveyard"))); this.getSpellAbility().addEffect(new CreateTokenEffect(new ZombieToken())); diff --git a/Mage.Sets/src/mage/cards/s/ShardingSphinx.java b/Mage.Sets/src/mage/cards/s/ShardingSphinx.java index 8f608b8cc5a..e53e5a10794 100644 --- a/Mage.Sets/src/mage/cards/s/ShardingSphinx.java +++ b/Mage.Sets/src/mage/cards/s/ShardingSphinx.java @@ -62,7 +62,7 @@ public class ShardingSphinx extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // Whenever an artifact creature you control deals combat damage to a player, you may put a 1/1 blue Thopter artifact creature token with flying onto the battlefield. + // Whenever an artifact creature you control deals combat damage to a player, you may create a 1/1 blue Thopter artifact creature token with flying. this.addAbility(new DealsDamageToAPlayerAllTriggeredAbility( new CreateTokenEffect(new ThopterToken()), filter, true, SetTargetPointer.NONE, true)); diff --git a/Mage.Sets/src/mage/cards/s/SidisiBroodTyrant.java b/Mage.Sets/src/mage/cards/s/SidisiBroodTyrant.java index 78f3dda74aa..242aa8bf52f 100644 --- a/Mage.Sets/src/mage/cards/s/SidisiBroodTyrant.java +++ b/Mage.Sets/src/mage/cards/s/SidisiBroodTyrant.java @@ -61,7 +61,7 @@ public class SidisiBroodTyrant extends CardImpl { // Whenever Sidisi, Brood Tyrant enters the battlefield or attacks, put the top three cards of your library into your graveyard. this.addAbility(new SidisiBroodTyrantAbility()); - // Whenever one or more creature cards are put into your graveyard from your library, put a 2/2 black Zombie creature token onto the battlefield. + // Whenever one or more creature cards are put into your graveyard from your library, create a 2/2 black Zombie creature token. this.addAbility(new SidisiBroodTyrantTriggeredAbility()); } @@ -154,6 +154,6 @@ class SidisiBroodTyrantTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever one or more creature cards are put into your graveyard from your library, put a 2/2 black Zombie creature token onto the battlefield."; + return "Whenever one or more creature cards are put into your graveyard from your library, create a 2/2 black Zombie creature token."; } } diff --git a/Mage.Sets/src/mage/cards/s/SifterOfSkulls.java b/Mage.Sets/src/mage/cards/s/SifterOfSkulls.java index cd9ee871999..cdabd7cfaa8 100644 --- a/Mage.Sets/src/mage/cards/s/SifterOfSkulls.java +++ b/Mage.Sets/src/mage/cards/s/SifterOfSkulls.java @@ -66,10 +66,10 @@ public class SifterOfSkulls extends CardImpl { // Devoid this.addAbility(new DevoidAbility(this.color)); - // Whenever another nontoken creature you control dies, put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. + // Whenever another nontoken creature you control dies, create a 1/1 colorless Eldrazi Scion creature token. // It has "Sacrifice this creature: Add {C} to your mana pool." Effect effect = new CreateTokenEffect(new EldraziScionToken()); - effect.setText("put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has \"Sacrifice this creature: Add {C} to your mana pool.\""); + effect.setText("create a 1/1 colorless Eldrazi Scion creature token. It has \"Sacrifice this creature: Add {C} to your mana pool.\""); this.addAbility(new DiesCreatureTriggeredAbility(effect, false, filter)); } diff --git a/Mage.Sets/src/mage/cards/s/SigardaHeronsGrace.java b/Mage.Sets/src/mage/cards/s/SigardaHeronsGrace.java index 4cfb7617a8c..2f7ee13739e 100644 --- a/Mage.Sets/src/mage/cards/s/SigardaHeronsGrace.java +++ b/Mage.Sets/src/mage/cards/s/SigardaHeronsGrace.java @@ -82,7 +82,7 @@ public class SigardaHeronsGrace extends CardImpl { ability.addEffect(effect); this.addAbility(ability); - // {2}, Exile a card from your graveyard: Put a 1/1 white Human Soldier creature token onto the battlefield. + // {2}, Exile a card from your graveyard: Create a 1/1 white Human Soldier creature token. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HumanSoldierToken()), new GenericManaCost(2)); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SilverfurPartisan.java b/Mage.Sets/src/mage/cards/s/SilverfurPartisan.java index 2ccbb6c83b3..4594da938ad 100644 --- a/Mage.Sets/src/mage/cards/s/SilverfurPartisan.java +++ b/Mage.Sets/src/mage/cards/s/SilverfurPartisan.java @@ -62,7 +62,7 @@ public class SilverfurPartisan extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); - // Whenever a Wolf or Werewolf you control becomes the target of an instant or sorcery spell, put a 2/2 green Wolf creature token onto the battlefield. + // Whenever a Wolf or Werewolf you control becomes the target of an instant or sorcery spell, create a 2/2 green Wolf creature token. this.addAbility(new CreaturesYouControlBecomesTargetTriggeredAbility(new CreateTokenEffect(new WolfToken()))); } @@ -118,6 +118,6 @@ class CreaturesYouControlBecomesTargetTriggeredAbility extends TriggeredAbilityI @Override public String getRule() { - return "Whenever a Wolf or Werewolf you control becomes the target of an instant or sorcery spell, put a 2/2 green Wolf creature token onto the battlefield."; + return "Whenever a Wolf or Werewolf you control becomes the target of an instant or sorcery spell, create a 2/2 green Wolf creature token."; } } diff --git a/Mage.Sets/src/mage/cards/s/SkeletalVampire.java b/Mage.Sets/src/mage/cards/s/SkeletalVampire.java index cfe37d6a96c..60925bde554 100644 --- a/Mage.Sets/src/mage/cards/s/SkeletalVampire.java +++ b/Mage.Sets/src/mage/cards/s/SkeletalVampire.java @@ -68,9 +68,9 @@ public class SkeletalVampire extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // When Skeletal Vampire enters the battlefield, put two 1/1 black Bat creature tokens with flying onto the battlefield. + // When Skeletal Vampire enters the battlefield, create two 1/1 black Bat creature tokens with flying. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new BatToken(), 2))); - // {3}{B}{B}, Sacrifice a Bat: Put two 1/1 black Bat creature tokens with flying onto the battlefield. + // {3}{B}{B}, Sacrifice a Bat: Create two 1/1 black Bat creature tokens with flying. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new BatToken(), 2), new ManaCostsImpl("{3}{B}{B}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/Skeletonize.java b/Mage.Sets/src/mage/cards/s/Skeletonize.java index 2f8fe4551ca..db616aafb8a 100644 --- a/Mage.Sets/src/mage/cards/s/Skeletonize.java +++ b/Mage.Sets/src/mage/cards/s/Skeletonize.java @@ -59,7 +59,7 @@ public class Skeletonize extends CardImpl { // Skeletonize deals 3 damage to target creature. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - // When a creature dealt damage this way dies this turn, put a 1/1 black Skeleton creature token onto the battlefield with "{B}: Regenerate this creature." + // When a creature dealt damage this way dies this turn, create a 1/1 black Skeleton creature token with "{B}: Regenerate this creature." this.getSpellAbility().addEffect(new SkeletonizeEffect()); this.getSpellAbility().addWatcher(new DamagedByWatcher()); } @@ -78,7 +78,7 @@ class SkeletonizeEffect extends OneShotEffect { public SkeletonizeEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "When a creature dealt damage this way dies this turn, put a 1/1 black Skeleton creature token onto the battlefield with \"{B}: Regenerate this creature\""; + this.staticText = "When a creature dealt damage this way dies this turn, create a 1/1 black Skeleton creature token with \"{B}: Regenerate this creature\""; } public SkeletonizeEffect(final SkeletonizeEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SkirkRidgeExhumer.java b/Mage.Sets/src/mage/cards/s/SkirkRidgeExhumer.java index c0ad3c08464..ee1e5227b6a 100644 --- a/Mage.Sets/src/mage/cards/s/SkirkRidgeExhumer.java +++ b/Mage.Sets/src/mage/cards/s/SkirkRidgeExhumer.java @@ -52,13 +52,13 @@ import mage.target.common.TargetCreaturePermanent; public class SkirkRidgeExhumer extends CardImpl { public SkirkRidgeExhumer(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B}"); this.subtype.add("Zombie"); this.subtype.add("Spellshaper"); this.power = new MageInt(1); this.toughness = new MageInt(1); - // {B}, {tap}, Discard a card: Put a 1/1 black Zombie Goblin creature token named Festering Goblin onto the battlefield. It has "When Festering Goblin dies, target creature gets -1/-1 until end of turn." + // {B}, {tap}, Discard a card: Create a 1/1 black Zombie Goblin creature token named Festering Goblin. It has "When Festering Goblin dies, target creature gets -1/-1 until end of turn." Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new FesteringGoblinToken()), new ManaCostsImpl("{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); diff --git a/Mage.Sets/src/mage/cards/s/SkirsdagHighPriest.java b/Mage.Sets/src/mage/cards/s/SkirsdagHighPriest.java index 42b16ab5c8a..fc9abce36c1 100644 --- a/Mage.Sets/src/mage/cards/s/SkirsdagHighPriest.java +++ b/Mage.Sets/src/mage/cards/s/SkirsdagHighPriest.java @@ -66,7 +66,7 @@ public class SkirsdagHighPriest extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - // Morbid - {tap}, Tap two untapped creatures you control: Put a 5/5 black Demon creature token with flying onto the battlefield. Activate this ability only if a creature died this turn. + // Morbid - {tap}, Tap two untapped creatures you control: Create a 5/5 black Demon creature token with flying. Activate this ability only if a creature died this turn. Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new DemonToken()), new TapSourceCost(), MorbidCondition.getInstance()); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, false))); diff --git a/Mage.Sets/src/mage/cards/s/SkywiseTeachings.java b/Mage.Sets/src/mage/cards/s/SkywiseTeachings.java index 3807091bd0f..dd877d089e3 100644 --- a/Mage.Sets/src/mage/cards/s/SkywiseTeachings.java +++ b/Mage.Sets/src/mage/cards/s/SkywiseTeachings.java @@ -57,7 +57,7 @@ public class SkywiseTeachings extends CardImpl { public SkywiseTeachings(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{U}"); - // Whenever you cast a noncreature spell, you may pay {1}{U}. If you do, put a 2/2 blue Djinn Monk creature token with flying onto the battlefield. + // Whenever you cast a noncreature spell, you may pay {1}{U}. If you do, create a 2/2 blue Djinn Monk creature token with flying. this.addAbility(new SpellCastControllerTriggeredAbility(new DoIfCostPaid(new CreateTokenEffect(new SkywiseTeachingsToken()), new ManaCostsImpl("{1}{U}")), filter, false)); } diff --git a/Mage.Sets/src/mage/cards/s/SlayersPlate.java b/Mage.Sets/src/mage/cards/s/SlayersPlate.java index e01c36b9d58..f69c706f173 100644 --- a/Mage.Sets/src/mage/cards/s/SlayersPlate.java +++ b/Mage.Sets/src/mage/cards/s/SlayersPlate.java @@ -59,7 +59,7 @@ public class SlayersPlate extends CardImpl { // Equipped creature gets +4/+2. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(4, 2))); - // Whenever equipped creature dies, if it was a Human, put a 1/1 white Spirit creature token with flying onto the battlefield. + // Whenever equipped creature dies, if it was a Human, create a 1/1 white Spirit creature token with flying. this.addAbility(new SlayersPlateTriggeredAbility()); // Equip {3} @@ -109,6 +109,6 @@ class SlayersPlateTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever equipped creature dies, if it was a Human, put a 1/1 white Spirit creature token with flying onto the battlefield."; + return "Whenever equipped creature dies, if it was a Human, create a 1/1 white Spirit creature token with flying."; } } diff --git a/Mage.Sets/src/mage/cards/s/SlimeMolding.java b/Mage.Sets/src/mage/cards/s/SlimeMolding.java index dd10c2c5210..1bff4754c6f 100644 --- a/Mage.Sets/src/mage/cards/s/SlimeMolding.java +++ b/Mage.Sets/src/mage/cards/s/SlimeMolding.java @@ -48,7 +48,7 @@ public class SlimeMolding extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{X}{G}"); - // Put an X/X green Ooze creature token onto the battlefield. + // Create an X/X green Ooze creature token. this.getSpellAbility().addEffect(new SlimeMoldingEffect()); } @@ -66,7 +66,7 @@ class SlimeMoldingEffect extends OneShotEffect { public SlimeMoldingEffect() { super(Outcome.PutCreatureInPlay); - staticText = "Put an X/X green Ooze creature token onto the battlefield"; + staticText = "Create an X/X green Ooze creature token"; } public SlimeMoldingEffect(SlimeMoldingEffect ability) { diff --git a/Mage.Sets/src/mage/cards/s/SliverHive.java b/Mage.Sets/src/mage/cards/s/SliverHive.java index 7b4ae6395bf..83d51a30fbd 100644 --- a/Mage.Sets/src/mage/cards/s/SliverHive.java +++ b/Mage.Sets/src/mage/cards/s/SliverHive.java @@ -79,10 +79,10 @@ public class SliverHive extends CardImpl { // {T}: Add one mana of any color to your mana pool. Spend this mana only to cast a Sliver spell. this.addAbility(new ConditionalAnyColorManaAbility(new TapSourceCost(), 1, new ConditionalSpellManaBuilder(filterSpell), true)); - // {5}, {T}: Put a 1/1 colorless Sliver creature token onto the battlefield. Activate this ability only if you control a Sliver. + // {5}, {T}: Create a 1/1 colorless Sliver creature token. Activate this ability only if you control a Sliver. Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SliverToken()), new TapSourceCost(), new PermanentsOnTheBattlefieldCondition(filter), - "{5}, {T}: Put a 1/1 colorless Sliver creature token onto the battlefield. Activate this ability only if you control a Sliver."); + "{5}, {T}: Create a 1/1 colorless Sliver creature token. Activate this ability only if you control a Sliver."); ability.addCost(new GenericManaCost(5)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SliverQueen.java b/Mage.Sets/src/mage/cards/s/SliverQueen.java index 35a37620f82..908753ee2c1 100644 --- a/Mage.Sets/src/mage/cards/s/SliverQueen.java +++ b/Mage.Sets/src/mage/cards/s/SliverQueen.java @@ -52,7 +52,7 @@ public class SliverQueen extends CardImpl { this.power = new MageInt(7); this.toughness = new MageInt(7); - // {2}: Put a 1/1 colorless Sliver creature token onto the battlefield. + // {2}: Create a 1/1 colorless Sliver creature token. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SliverToken()), new ManaCostsImpl("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/s/Sliversmith.java b/Mage.Sets/src/mage/cards/s/Sliversmith.java index dc858663119..a9af0befb78 100644 --- a/Mage.Sets/src/mage/cards/s/Sliversmith.java +++ b/Mage.Sets/src/mage/cards/s/Sliversmith.java @@ -48,12 +48,12 @@ import mage.game.permanent.token.Token; public class Sliversmith extends CardImpl { public Sliversmith(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{2}"); + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{2}"); this.subtype.add("Spellshaper"); this.power = new MageInt(1); this.toughness = new MageInt(1); - // {1}, {tap}, Discard a card: Put a 1/1 colorless Sliver artifact creature token named Metallic Sliver onto the battlefield. + // {1}, {tap}, Discard a card: Create a 1/1 colorless Sliver artifact creature token named Metallic Sliver. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SliversmithToken()), new ManaCostsImpl("{1}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); diff --git a/Mage.Sets/src/mage/cards/s/SnakeBasket.java b/Mage.Sets/src/mage/cards/s/SnakeBasket.java index 953e9005560..6aeac03493f 100644 --- a/Mage.Sets/src/mage/cards/s/SnakeBasket.java +++ b/Mage.Sets/src/mage/cards/s/SnakeBasket.java @@ -50,7 +50,7 @@ public class SnakeBasket extends CardImpl { public SnakeBasket(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); - // {X}, Sacrifice Snake Basket: Put X 1/1 green Snake creature tokens onto the battlefield. Activate this ability only any time you could cast a sorcery. + // {X}, Sacrifice Snake Basket: create X 1/1 green Snake creature tokens. Activate this ability only any time you could cast a sorcery. Effect effect = new CreateTokenEffect(new SnakeToken(), new ManacostVariableValue()); Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{X}")); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/s/SnakePit.java b/Mage.Sets/src/mage/cards/s/SnakePit.java index 2f1c937939c..e0b616aff8b 100644 --- a/Mage.Sets/src/mage/cards/s/SnakePit.java +++ b/Mage.Sets/src/mage/cards/s/SnakePit.java @@ -54,7 +54,7 @@ public class SnakePit extends CardImpl { public SnakePit(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{G}"); - // Whenever an opponent casts a blue or black spell, you may put a 1/1 green Snake creature token onto the battlefield. + // Whenever an opponent casts a blue or black spell, you may create a 1/1 green Snake creature token. this.addAbility(new SpellCastOpponentTriggeredAbility(new CreateTokenEffect(new SnakeToken()), filter, true)); } diff --git a/Mage.Sets/src/mage/cards/s/SorinGrimNemesis.java b/Mage.Sets/src/mage/cards/s/SorinGrimNemesis.java index 3285931fc97..4e835ebe62f 100644 --- a/Mage.Sets/src/mage/cards/s/SorinGrimNemesis.java +++ b/Mage.Sets/src/mage/cards/s/SorinGrimNemesis.java @@ -28,7 +28,6 @@ package mage.cards.s; import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.PlanswalkerEntersWithLoyalityCountersAbility; @@ -61,7 +60,7 @@ import mage.target.common.TargetCreatureOrPlaneswalker; public class SorinGrimNemesis extends CardImpl { public SorinGrimNemesis(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.PLANESWALKER},"{4}{W}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.PLANESWALKER}, "{4}{W}{B}"); this.subtype.add("Sorin"); this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(6)); @@ -75,7 +74,7 @@ public class SorinGrimNemesis extends CardImpl { ability.addEffect(new GainLifeEffect(SorinXValue.getDefault())); this.addAbility(ability); - // -9: Put a number of 1/1 black Vampire Knight creature tokens with lifelink onto the battlefield equal to the highest life total among all players. + // -9: Create a number of 1/1 black Vampire Knight creature tokens with lifelink equal to the highest life total among all players. this.addAbility(new LoyaltyAbility(new SorinTokenEffect(), -9)); } @@ -118,8 +117,8 @@ class SorinGrimNemesisRevealEffect extends OneShotEffect { cards.add(card); player.revealCards("Sorin, Grim Nemesis", cards, game); - if (card != null && - card.moveToZone(Zone.HAND, source.getSourceId(), game, false)) { + if (card != null + && card.moveToZone(Zone.HAND, source.getSourceId(), game, false)) { for (UUID playerId : game.getOpponents(source.getControllerId())) { if (card.getConvertedManaCost() > 0) { Player opponent = game.getPlayer(playerId); @@ -128,7 +127,7 @@ class SorinGrimNemesisRevealEffect extends OneShotEffect { } } } - return true; + return true; } } return false; @@ -170,12 +169,13 @@ class SorinXValue implements DynamicValue { } class SorinTokenEffect extends OneShotEffect { - SorinTokenEffect() { + + SorinTokenEffect() { super(Outcome.GainLife); - staticText = "Put a number of 1/1 black Vampire Knight creature tokens with lifelink onto the battlefield equal to the highest life total among all players"; + staticText = "Create a number of 1/1 black Vampire Knight creature tokens with lifelink equal to the highest life total among all players"; } - SorinTokenEffect(final SorinTokenEffect effect) { + SorinTokenEffect(final SorinTokenEffect effect) { super(effect); } @@ -200,4 +200,3 @@ class SorinTokenEffect extends OneShotEffect { return new SorinTokenEffect(this); } } - diff --git a/Mage.Sets/src/mage/cards/s/SorinLordOfInnistrad.java b/Mage.Sets/src/mage/cards/s/SorinLordOfInnistrad.java index 58b2e063f37..99b68cefe8d 100644 --- a/Mage.Sets/src/mage/cards/s/SorinLordOfInnistrad.java +++ b/Mage.Sets/src/mage/cards/s/SorinLordOfInnistrad.java @@ -70,12 +70,12 @@ public class SorinLordOfInnistrad extends CardImpl { } public SorinLordOfInnistrad(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.PLANESWALKER},"{2}{W}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.PLANESWALKER}, "{2}{W}{B}"); this.subtype.add("Sorin"); this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(3)); - // +1: Put a 1/1 black Vampire creature token with lifelink onto the battlefield. + // +1: Create a 1/1 black Vampire creature token with lifelink. this.addAbility(new LoyaltyAbility(new CreateTokenEffect(new VampireToken()), 1)); // -2: You get an emblem with "Creatures you control get +1/+0." @@ -97,6 +97,7 @@ public class SorinLordOfInnistrad extends CardImpl { } class VampireToken extends Token { + VampireToken() { super("Vampire", "a 1/1 black Vampire creature token with lifelink"); cardType.add(CardType.CREATURE); diff --git a/Mage.Sets/src/mage/cards/s/SorinSolemnVisitor.java b/Mage.Sets/src/mage/cards/s/SorinSolemnVisitor.java index 9de9617e73f..396e6ac5839 100644 --- a/Mage.Sets/src/mage/cards/s/SorinSolemnVisitor.java +++ b/Mage.Sets/src/mage/cards/s/SorinSolemnVisitor.java @@ -72,7 +72,7 @@ public class SorinSolemnVisitor extends CardImpl { loyaltyAbility.addEffect(effect); this.addAbility(loyaltyAbility); - // -2: Put a 2/2 black Vampire creature token with flying onto the battlefield. + // -2: Create a 2/2 black Vampire creature token with flying. this.addAbility(new LoyaltyAbility(new CreateTokenEffect(new SorinSolemnVisitorVampireToken()), -2)); // -6: You get an emblem with "At the beginning of each opponent's upkeep, that player sacrifices a creature." diff --git a/Mage.Sets/src/mage/cards/s/SosukesSummons.java b/Mage.Sets/src/mage/cards/s/SosukesSummons.java index 5a045807aa6..d1b2b5b89fc 100644 --- a/Mage.Sets/src/mage/cards/s/SosukesSummons.java +++ b/Mage.Sets/src/mage/cards/s/SosukesSummons.java @@ -58,7 +58,7 @@ public class SosukesSummons extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{G}"); - // Put two 1/1 green Snake creature tokens onto the battlefield. + // Create two 1/1 green Snake creature tokens. this.getSpellAbility().addEffect(new CreateTokenEffect(new SnakeToken(), 2)); // Whenever a nontoken Snake enters the battlefield under your control, you may return Sosuke's Summons from your graveyard to your hand. diff --git a/Mage.Sets/src/mage/cards/s/SoulFoundry.java b/Mage.Sets/src/mage/cards/s/SoulFoundry.java index 5fd63c33f24..4d8651a89ad 100644 --- a/Mage.Sets/src/mage/cards/s/SoulFoundry.java +++ b/Mage.Sets/src/mage/cards/s/SoulFoundry.java @@ -60,12 +60,12 @@ import mage.util.CardUtil; public class SoulFoundry extends CardImpl { public SoulFoundry(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // Imprint - When Soul Foundry enters the battlefield, you may exile a creature card from your hand. this.addAbility(new EntersBattlefieldTriggeredAbility(new SoulFoundryImprintEffect(), true, "Imprint - ")); - // {X}, {T}: Put a token that's a copy of the exiled card onto the battlefield. X is the converted mana cost of that card. + // {X}, {T}: Create a token that's a copy of the exiled card. X is the converted mana cost of that card. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SoulFoundryEffect(), new ManaCostsImpl("{X}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); @@ -157,7 +157,7 @@ class SoulFoundryEffect extends OneShotEffect { public SoulFoundryEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Put a token that's a copy of the exiled card onto the battlefield. X is the converted mana cost of that card"; + this.staticText = "Create a token that's a copy of the exiled card. X is the converted mana cost of that card"; } public SoulFoundryEffect(final SoulFoundryEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SoulOfZendikar.java b/Mage.Sets/src/mage/cards/s/SoulOfZendikar.java index b2f55acafc4..4bf795bce09 100644 --- a/Mage.Sets/src/mage/cards/s/SoulOfZendikar.java +++ b/Mage.Sets/src/mage/cards/s/SoulOfZendikar.java @@ -56,9 +56,9 @@ public class SoulOfZendikar extends CardImpl { // Reach this.addAbility(ReachAbility.getInstance()); - // {3}{G}{G}: Put a 3/3 green Beast creature token onto the battlefield. + // {3}{G}{G}: Create a 3/3 green Beast creature token. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new BeastToken()), new ManaCostsImpl("{3}{G}{G}"))); - // {3}{G}{G}, Exile Soul of Zendikar from your graveyard: Put a 3/3 green Beast creature token onto the battlefield. + // {3}{G}{G}, Exile Soul of Zendikar from your graveyard: Create a 3/3 green Beast creature token. Ability ability = new SimpleActivatedAbility(Zone.GRAVEYARD, new CreateTokenEffect(new BeastToken()), new ManaCostsImpl("{3}{G}{G}")); ability.addCost(new ExileSourceFromGraveCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SoulSeparator.java b/Mage.Sets/src/mage/cards/s/SoulSeparator.java index 3ba6675c11e..bc2548513ca 100644 --- a/Mage.Sets/src/mage/cards/s/SoulSeparator.java +++ b/Mage.Sets/src/mage/cards/s/SoulSeparator.java @@ -57,11 +57,11 @@ public class SoulSeparator extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // {5}, {T}, Sacrifice Soul Separator: Exile target creature card from your graveyard. - // Put a token onto the battlefield that's a copy of that card except it's 1/1, it's a Spirit in addition to its other types, and it has flying. - // Put a black Zombie creature token onto the battlefield with power equal to that card's power and toughness equal that card's toughness. + // Create a token that's a copy of that card except it's 1/1, it's a Spirit in addition to its other types, and it has flying. + // Create a black Zombie creature token with power equal to that card's power and toughness equal that card's toughness. PutTokenOntoBattlefieldCopyTargetEffect copyEffect = new PutTokenOntoBattlefieldCopyTargetEffect(null, null, false, 1, false, false, null, 1, 1, true); copyEffect.setAdditionalSubType("Spirit"); - copyEffect.setText("Put a token onto the battlefield that's a copy of that card except it's 1/1, it's a Spirit in addition to its other types, and it has flying."); + copyEffect.setText("Create a token that's a copy of that card except it's 1/1, it's a Spirit in addition to its other types, and it has flying."); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, copyEffect, new ManaCostsImpl("{5}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); @@ -84,7 +84,7 @@ class SoulSeparatorEffect extends OneShotEffect { public SoulSeparatorEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Put a black Zombie creature token onto the battlefield with power equal to that card's power and toughness equal that card's toughness"; + this.staticText = "Create a black Zombie creature token with power equal to that card's power and toughness equal that card's toughness"; } public SoulSeparatorEffect(final SoulSeparatorEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/Sparkspitter.java b/Mage.Sets/src/mage/cards/s/Sparkspitter.java index a2403240ae6..13abfed3eed 100644 --- a/Mage.Sets/src/mage/cards/s/Sparkspitter.java +++ b/Mage.Sets/src/mage/cards/s/Sparkspitter.java @@ -59,7 +59,7 @@ public class Sparkspitter extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(3); - // {R}, {tap}, Discard a card: Put a 3/1 red Elemental creature token named Spark Elemental onto the battlefield. It has trample, haste, and "At the beginning of the end step, sacrifice Spark Elemental." + // {R}, {tap}, Discard a card: Create a 3/1 red Elemental creature token named Spark Elemental. It has trample, haste, and "At the beginning of the end step, sacrifice Spark Elemental." Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SparkElementalToken()), new ManaCostsImpl("{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); diff --git a/Mage.Sets/src/mage/cards/s/SpawningBed.java b/Mage.Sets/src/mage/cards/s/SpawningBed.java index eb22229a03b..72782079d04 100644 --- a/Mage.Sets/src/mage/cards/s/SpawningBed.java +++ b/Mage.Sets/src/mage/cards/s/SpawningBed.java @@ -53,7 +53,7 @@ public class SpawningBed extends CardImpl { // {T}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); - // {6}, {T}, Sacrifice Spawning Bed: Put three 1/1 colorless Eldrazi Scion creature tokens onto the battlefield. They have "Sacrifice this creature: Add {C} to your mana pool." + // {6}, {T}, Sacrifice Spawning Bed: Create three 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool." Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new EldraziScionToken(), 3), new ManaCostsImpl("{6}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/s/SpawningGrounds.java b/Mage.Sets/src/mage/cards/s/SpawningGrounds.java index 0d41947db74..7376a9cc14f 100644 --- a/Mage.Sets/src/mage/cards/s/SpawningGrounds.java +++ b/Mage.Sets/src/mage/cards/s/SpawningGrounds.java @@ -67,10 +67,10 @@ public class SpawningGrounds extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // Enchanted land has "{tap}: Put a 5/5 green Beast creature token with trample onto the battlefield." + // Enchanted land has "{tap}: Create a 5/5 green Beast creature token with trample." Ability abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SpawningGroundsBeastToken(), 1), new TapSourceCost()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(abilityToGain, AttachmentType.AURA, Duration.WhileOnBattlefield, - "Enchanted land has \"{t}: Put a 5/5 green Beast creature token with trample onto the battlefield.\""))); + "Enchanted land has \"{t}: Create a 5/5 green Beast creature token with trample.\""))); } public SpawningGrounds(final SpawningGrounds card) { diff --git a/Mage.Sets/src/mage/cards/s/SpawnsireOfUlamog.java b/Mage.Sets/src/mage/cards/s/SpawnsireOfUlamog.java index b5cf7ab15d3..f13314ef6f1 100644 --- a/Mage.Sets/src/mage/cards/s/SpawnsireOfUlamog.java +++ b/Mage.Sets/src/mage/cards/s/SpawnsireOfUlamog.java @@ -66,7 +66,7 @@ public class SpawnsireOfUlamog extends CardImpl { // Annihilator 1 this.addAbility(new AnnihilatorAbility(1)); - // {4}: Put two 0/1 colorless Eldrazi Spawn creature tokens onto the battlefield. They have "Sacrifice this creature: Add {C} to your mana pool." + // {4}: Create two 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C} to your mana pool." this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new EldraziSpawnToken(), 2), new GenericManaCost(4))); // {20}: Cast any number of Eldrazi cards you own from outside the game without paying their mana costs. diff --git a/Mage.Sets/src/mage/cards/s/Spawnwrithe.java b/Mage.Sets/src/mage/cards/s/Spawnwrithe.java index 8e4e8e6e9be..e4fa9482c2f 100644 --- a/Mage.Sets/src/mage/cards/s/Spawnwrithe.java +++ b/Mage.Sets/src/mage/cards/s/Spawnwrithe.java @@ -43,7 +43,7 @@ import mage.constants.CardType; public class Spawnwrithe extends CardImpl { public Spawnwrithe(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}"); this.subtype.add("Elemental"); this.power = new MageInt(2); @@ -51,7 +51,7 @@ public class Spawnwrithe extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); - // Whenever Spawnwrithe deals combat damage to a player, put a token that's a copy of Spawnwrithe onto the battlefield. + // Whenever Spawnwrithe deals combat damage to a player, create a token that's a copy of Spawnwrithe. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new PutTokenOntoBattlefieldCopySourceEffect(), false)); } diff --git a/Mage.Sets/src/mage/cards/s/SpectralProcession.java b/Mage.Sets/src/mage/cards/s/SpectralProcession.java index 2c3563ad79a..9116043ac00 100644 --- a/Mage.Sets/src/mage/cards/s/SpectralProcession.java +++ b/Mage.Sets/src/mage/cards/s/SpectralProcession.java @@ -44,7 +44,7 @@ public class SpectralProcession extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2/W}{2/W}{2/W}"); - // Put three 1/1 white Spirit creature tokens with flying onto the battlefield. + // Create three 1/1 white Spirit creature tokens with flying. this.getSpellAbility().addEffect(new CreateTokenEffect(new SpiritWhiteToken(), 3)); } diff --git a/Mage.Sets/src/mage/cards/s/SpectralReserves.java b/Mage.Sets/src/mage/cards/s/SpectralReserves.java index 8cb39be9ce4..d1f09611171 100644 --- a/Mage.Sets/src/mage/cards/s/SpectralReserves.java +++ b/Mage.Sets/src/mage/cards/s/SpectralReserves.java @@ -45,9 +45,9 @@ public class SpectralReserves extends CardImpl { public SpectralReserves(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{W}"); - // Put two 1/1 white Spirit creature tokens with flying onto the battlefield. You gain 2 life. + // Create two 1/1 white Spirit creature tokens with flying. You gain 2 life. Effect effect = new CreateTokenEffect(new SpiritWhiteToken("EMN"), 2); - effect.setText("Put two 1/1 white Spirit creature tokens with flying onto the battlefield"); + effect.setText("Create two 1/1 white Spirit creature tokens with flying"); this.getSpellAbility().addEffect(effect); this.getSpellAbility().addEffect(new GainLifeEffect(2)); } diff --git a/Mage.Sets/src/mage/cards/s/SpiderSpawning.java b/Mage.Sets/src/mage/cards/s/SpiderSpawning.java index b42718af10a..865ed119eba 100644 --- a/Mage.Sets/src/mage/cards/s/SpiderSpawning.java +++ b/Mage.Sets/src/mage/cards/s/SpiderSpawning.java @@ -46,10 +46,9 @@ import mage.game.permanent.token.SpiderToken; public class SpiderSpawning extends CardImpl { public SpiderSpawning(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{4}{G}"); - - // Put a 1/2 green Spider creature token with reach onto the battlefield for each creature card in your graveyard. + // Create a 1/2 green Spider creature token with reach for each creature card in your graveyard. this.getSpellAbility().addEffect(new CreateTokenEffect(new SpiderToken(), new CardsInControllerGraveyardCount(new FilterCreatureCard()))); // Flashback {6}{B} this.addAbility(new FlashbackAbility(new ManaCostsImpl("{6}{B}"), TimingRule.SORCERY)); @@ -64,4 +63,3 @@ public class SpiderSpawning extends CardImpl { return new SpiderSpawning(this); } } - diff --git a/Mage.Sets/src/mage/cards/s/SpikeBreeder.java b/Mage.Sets/src/mage/cards/s/SpikeBreeder.java index a6b2bf82ad7..e9f7940e8ef 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeBreeder.java +++ b/Mage.Sets/src/mage/cards/s/SpikeBreeder.java @@ -66,7 +66,7 @@ public class SpikeBreeder extends CardImpl { ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); - // {2}, Remove a +1/+1 counter from Spike Breeder: Put a 1/1 green Spike creature token onto the battlefield. + // {2}, Remove a +1/+1 counter from Spike Breeder: Create a 1/1 green Spike creature token. Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SpikeToken()), new GenericManaCost(2)); ability2.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/s/SpiritCairn.java b/Mage.Sets/src/mage/cards/s/SpiritCairn.java index 82e84c57227..0153958df44 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritCairn.java +++ b/Mage.Sets/src/mage/cards/s/SpiritCairn.java @@ -48,7 +48,7 @@ public class SpiritCairn extends CardImpl { public SpiritCairn(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}"); - // Whenever a player discards a card, you may pay {W}. If you do, put a 1/1 white Spirit creature token with flying onto the battlefield. + // Whenever a player discards a card, you may pay {W}. If you do, create a 1/1 white Spirit creature token with flying. this.addAbility(new SimpleTriggeredAbility(Zone.BATTLEFIELD, GameEvent.EventType.DISCARDED_CARD, new DoIfCostPaid(new CreateTokenEffect(new SpiritWhiteToken()), new ManaCostsImpl("{W}")), "Whenever a player discards a card, you ", diff --git a/Mage.Sets/src/mage/cards/s/SpiritMirror.java b/Mage.Sets/src/mage/cards/s/SpiritMirror.java index 4f38c7a898a..e362b304851 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritMirror.java +++ b/Mage.Sets/src/mage/cards/s/SpiritMirror.java @@ -65,11 +65,11 @@ public class SpiritMirror extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}{W}"); - // At the beginning of your upkeep, if there are no Reflection tokens on the battlefield, put a 2/2 white Reflection creature token onto the battlefield. + // At the beginning of your upkeep, if there are no Reflection tokens on the battlefield, create a 2/2 white Reflection creature token. this.addAbility(new ConditionalTriggeredAbility( new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new ReflectionToken()), TargetController.YOU, false), new PermanentsOnTheBattlefieldCondition(filter, PermanentsOnTheBattlefieldCondition.CountType.EQUAL_TO, 0, false), - "At the beginning of your upkeep, if there are no Reflection tokens on the battlefield, put a 2/2 white Reflection creature token onto the battlefield")); + "At the beginning of your upkeep, if there are no Reflection tokens on the battlefield, create a 2/2 white Reflection creature token")); // {0}: Destroy target Reflection. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new GenericManaCost(0)); diff --git a/Mage.Sets/src/mage/cards/s/SpiritualVisit.java b/Mage.Sets/src/mage/cards/s/SpiritualVisit.java index 7e8bc829deb..85c234ba36a 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritualVisit.java +++ b/Mage.Sets/src/mage/cards/s/SpiritualVisit.java @@ -45,7 +45,7 @@ public class SpiritualVisit extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{W}"); this.subtype.add("Arcane"); - // Put a 1/1 colorless Spirit creature token onto the battlefield. + // Create a 1/1 colorless Spirit creature token. this.getSpellAbility().addEffect(new CreateTokenEffect(new SpiritToken())); // Splice onto Arcane {W} diff --git a/Mage.Sets/src/mage/cards/s/SpittingImage.java b/Mage.Sets/src/mage/cards/s/SpittingImage.java index 7cda2d3a991..735419229c9 100644 --- a/Mage.Sets/src/mage/cards/s/SpittingImage.java +++ b/Mage.Sets/src/mage/cards/s/SpittingImage.java @@ -53,7 +53,7 @@ public class SpittingImage extends CardImpl { public SpittingImage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{G/U}{G/U}"); - // Put a token that's a copy of target creature onto the battlefield. + // Create a token that's a copy of target creature. this.getSpellAbility().addEffect(new PutTokenOntoBattlefieldCopyTargetEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); @@ -76,7 +76,7 @@ class SpittingImageEffect extends OneShotEffect { public SpittingImageEffect() { super(Outcome.PutCreatureInPlay); - staticText = "Put a token that's a copy of target creature onto the battlefield"; + staticText = "Create a token that's a copy of target creature"; } public SpittingImageEffect(final SpittingImageEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SplinterTwin.java b/Mage.Sets/src/mage/cards/s/SplinterTwin.java index d21561d79a3..36a0e5fe35b 100644 --- a/Mage.Sets/src/mage/cards/s/SplinterTwin.java +++ b/Mage.Sets/src/mage/cards/s/SplinterTwin.java @@ -68,7 +68,7 @@ public class SplinterTwin extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // Enchanted creature has "{tap}: Put a token that's a copy of this creature onto the battlefield. That token has haste. Exile it at the beginning of the next end step." + // Enchanted creature has "{tap}: Create a token that's a copy of this creature. That token has haste. Exile it at the beginning of the next end step." SimpleActivatedAbility gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SplinterTwinEffect(), new TapSourceCost()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); } @@ -87,7 +87,7 @@ class SplinterTwinEffect extends OneShotEffect { public SplinterTwinEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Put a token that's a copy of this creature onto the battlefield. That token has haste. Exile it at the beginning of the next end step"; + this.staticText = "Create a token that's a copy of this creature. That token has haste. Exile it at the beginning of the next end step"; } public SplinterTwinEffect(final SplinterTwinEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SplittingSlime.java b/Mage.Sets/src/mage/cards/s/SplittingSlime.java index fa5daf4acc0..6322473028c 100644 --- a/Mage.Sets/src/mage/cards/s/SplittingSlime.java +++ b/Mage.Sets/src/mage/cards/s/SplittingSlime.java @@ -51,7 +51,7 @@ public class SplittingSlime extends CardImpl { // {4}{G}{G}: Monstrosity 3. this.addAbility(new MonstrosityAbility("{4}{G}{G}", 3)); - // When Splitting Slime becomes monstrous, put a token onto the battlefield that's a copy of Splitting Slime. + // When Splitting Slime becomes monstrous, create a token that's a copy of Splitting Slime. this.addAbility(new BecomesMonstrousSourceTriggeredAbility(new PutTokenOntoBattlefieldCopySourceEffect())); } diff --git a/Mage.Sets/src/mage/cards/s/SpoilsOfBlood.java b/Mage.Sets/src/mage/cards/s/SpoilsOfBlood.java index c48793122fb..ea5dc20d00a 100644 --- a/Mage.Sets/src/mage/cards/s/SpoilsOfBlood.java +++ b/Mage.Sets/src/mage/cards/s/SpoilsOfBlood.java @@ -57,7 +57,7 @@ public class SpoilsOfBlood extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{B}"); - // Put an X/X black Horror creature token onto the battlefield, where X is the number of creatures that died this turn. + // Create an X/X black Horror creature token, where X is the number of creatures that died this turn. this.getSpellAbility().addEffect(new SpoilsOfBloodEffect()); this.getSpellAbility().addWatcher(new CreaturesDiedThisTurnWatcher()); } @@ -76,7 +76,7 @@ class SpoilsOfBloodEffect extends OneShotEffect { public SpoilsOfBloodEffect() { super(Outcome.DestroyPermanent); - staticText = "Put an X/X black Horror creature token onto the battlefield, where X is the number of creatures that died this turn"; + staticText = "Create an X/X black Horror creature token, where X is the number of creatures that died this turn"; } public SpoilsOfBloodEffect(SpoilsOfBloodEffect ability) { diff --git a/Mage.Sets/src/mage/cards/s/SpontaneousGeneration.java b/Mage.Sets/src/mage/cards/s/SpontaneousGeneration.java index 3f399b0984b..2be85aff45c 100644 --- a/Mage.Sets/src/mage/cards/s/SpontaneousGeneration.java +++ b/Mage.Sets/src/mage/cards/s/SpontaneousGeneration.java @@ -44,7 +44,7 @@ public class SpontaneousGeneration extends CardImpl { public SpontaneousGeneration(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{G}"); - // Put a 1/1 green Saproling creature token onto the battlefield for each card in your hand. + // Create a 1/1 green Saproling creature token for each card in your hand. this.getSpellAbility().addEffect(new CreateTokenEffect(new SaprolingToken(), new CardsInControllerHandCount())); } diff --git a/Mage.Sets/src/mage/cards/s/SporeBurst.java b/Mage.Sets/src/mage/cards/s/SporeBurst.java index d18e3b88ef9..006ed7acfff 100644 --- a/Mage.Sets/src/mage/cards/s/SporeBurst.java +++ b/Mage.Sets/src/mage/cards/s/SporeBurst.java @@ -45,7 +45,7 @@ public class SporeBurst extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{G}"); - // Domain - Put a 1/1 green Saproling creature token onto the battlefield for each basic land type among lands you control. + // Domain - Create a 1/1 green Saproling creature token for each basic land type among lands you control. this.getSpellAbility().addEffect(new CreateTokenEffect(new SaprolingToken(), new DomainValue())); } diff --git a/Mage.Sets/src/mage/cards/s/Sporemound.java b/Mage.Sets/src/mage/cards/s/Sporemound.java index c7c90f1d19a..b8de362abf2 100644 --- a/Mage.Sets/src/mage/cards/s/Sporemound.java +++ b/Mage.Sets/src/mage/cards/s/Sporemound.java @@ -51,7 +51,7 @@ public class Sporemound extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - // Whenever a land enters the battlefield under your control, put a 1/1 green Saproling creature token onto the battlefield. + // Whenever a land enters the battlefield under your control, create a 1/1 green Saproling creature token. Effect effect = new CreateTokenEffect(new SaprolingToken()); this.addAbility(new EntersBattlefieldControlledTriggeredAbility(effect, new FilterLandPermanent("a land"))); } diff --git a/Mage.Sets/src/mage/cards/s/SporesowerThallid.java b/Mage.Sets/src/mage/cards/s/SporesowerThallid.java index ecd2b6390ca..077cb4e9aa8 100644 --- a/Mage.Sets/src/mage/cards/s/SporesowerThallid.java +++ b/Mage.Sets/src/mage/cards/s/SporesowerThallid.java @@ -66,7 +66,7 @@ public class SporesowerThallid extends CardImpl { // At the beginning of your upkeep, put a spore counter on each Fungus you control. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersAllEffect(CounterType.SPORE.createInstance(), filter), TargetController.YOU, false)); - // Remove three spore counters from Sporesower Thallid: Put a 1/1 green Saproling creature token onto the battlefield. + // Remove three spore counters from Sporesower Thallid: Create a 1/1 green Saproling creature token. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); } diff --git a/Mage.Sets/src/mage/cards/s/SporolothAncient.java b/Mage.Sets/src/mage/cards/s/SporolothAncient.java index 13ef688aa65..d6302c21e29 100644 --- a/Mage.Sets/src/mage/cards/s/SporolothAncient.java +++ b/Mage.Sets/src/mage/cards/s/SporolothAncient.java @@ -62,13 +62,13 @@ public class SporolothAncient extends CardImpl { // At the beginning of your upkeep, put a spore counter on Sporoloth Ancient. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()), TargetController.YOU, false)); - // Creatures you control have "Remove two spore counters from this creature: Put a 1/1 green Saproling creature token onto the battlefield." + // Creatures you control have "Remove two spore counters from this creature: Create a 1/1 green Saproling creature token." Effect effect = new GainAbilityControlledEffect( new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(2))), Duration.WhileOnBattlefield, new FilterCreaturePermanent("Creatures you control") ); - effect.setText("Creatures you control have \"Remove two spore counters from this creature: Put a 1/1 green Saproling creature token onto the battlefield.\""); + effect.setText("Creatures you control have \"Remove two spore counters from this creature: Create a 1/1 green Saproling creature token.\""); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } diff --git a/Mage.Sets/src/mage/cards/s/SpringjackPasture.java b/Mage.Sets/src/mage/cards/s/SpringjackPasture.java index ec3d82fa814..d2e8a7d6da2 100644 --- a/Mage.Sets/src/mage/cards/s/SpringjackPasture.java +++ b/Mage.Sets/src/mage/cards/s/SpringjackPasture.java @@ -66,7 +66,7 @@ public class SpringjackPasture extends CardImpl { // {tap}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); - // {4}, {tap}: Put a 0/1 white Goat creature token onto the battlefield. + // {4}, {tap}: Create a 0/1 white Goat creature token. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GoatToken()), new ManaCostsImpl("{4}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SpringjackShepherd.java b/Mage.Sets/src/mage/cards/s/SpringjackShepherd.java index b69c5dc0778..5909c165f1a 100644 --- a/Mage.Sets/src/mage/cards/s/SpringjackShepherd.java +++ b/Mage.Sets/src/mage/cards/s/SpringjackShepherd.java @@ -57,9 +57,9 @@ public class SpringjackShepherd extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - // Chroma - When Springjack Shepherd enters the battlefield, put a 0/1 white Goat creature token onto the battlefield for each white mana symbol in the mana costs of permanents you control. + // Chroma - When Springjack Shepherd enters the battlefield, create a 0/1 white Goat creature token for each white mana symbol in the mana costs of permanents you control. Effect effect = new CreateTokenEffect(new GoatToken(), new ChromaSpringjackShepherdCount()); - effect.setText("Chroma - When Springjack Shepherd enters the battlefield, put a 0/1 white Goat creature token onto the battlefield for each white mana symbol in the mana costs of permanents you control."); + effect.setText("Chroma - When Springjack Shepherd enters the battlefield, create a 0/1 white Goat creature token for each white mana symbol in the mana costs of permanents you control."); this.addAbility(new EntersBattlefieldTriggeredAbility(effect, false, true)); } diff --git a/Mage.Sets/src/mage/cards/s/Sprout.java b/Mage.Sets/src/mage/cards/s/Sprout.java index 8916d1c0a56..f86134d0078 100644 --- a/Mage.Sets/src/mage/cards/s/Sprout.java +++ b/Mage.Sets/src/mage/cards/s/Sprout.java @@ -43,7 +43,7 @@ public class Sprout extends CardImpl { public Sprout(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{G}"); - // Put a 1/1 green Saproling creature token onto the battlefield. + // Create a 1/1 green Saproling creature token. this.getSpellAbility().addEffect(new CreateTokenEffect(new SaprolingToken())); } diff --git a/Mage.Sets/src/mage/cards/s/SproutSwarm.java b/Mage.Sets/src/mage/cards/s/SproutSwarm.java index 6c437647c7d..b8778c6158d 100644 --- a/Mage.Sets/src/mage/cards/s/SproutSwarm.java +++ b/Mage.Sets/src/mage/cards/s/SproutSwarm.java @@ -49,7 +49,7 @@ public class SproutSwarm extends CardImpl { this.addAbility(new ConvokeAbility()); // Buyback {3} this.addAbility(new BuybackAbility("{3}")); - // Put a 1/1 green Saproling creature token onto the battlefield. + // Create a 1/1 green Saproling creature token. this.getSpellAbility().addEffect(new CreateTokenEffect(new SaprolingToken())); } diff --git a/Mage.Sets/src/mage/cards/s/SproutingPhytohydra.java b/Mage.Sets/src/mage/cards/s/SproutingPhytohydra.java index 2fcfb277b6a..e8e6ac9974a 100644 --- a/Mage.Sets/src/mage/cards/s/SproutingPhytohydra.java +++ b/Mage.Sets/src/mage/cards/s/SproutingPhytohydra.java @@ -45,7 +45,7 @@ import mage.constants.Zone; public class SproutingPhytohydra extends CardImpl { public SproutingPhytohydra(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{G}"); this.subtype.add("Plant"); this.subtype.add("Hydra"); this.power = new MageInt(0); @@ -53,9 +53,9 @@ public class SproutingPhytohydra extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); - // Whenever Sprouting Phytohydra is dealt damage, you may put a token that's a copy of Sprouting Phytohydra onto the battlefield. + // Whenever Sprouting Phytohydra is dealt damage, you may create a token that's a copy of Sprouting Phytohydra. Effect effect = new PutTokenOntoBattlefieldCopySourceEffect(); - effect.setText("you may put a token that's a copy of {this} onto the battlefield"); + effect.setText("you may create a token that's a copy of {this}"); this.addAbility(new DealtDamageToSourceTriggeredAbility(Zone.BATTLEFIELD, effect, true)); } diff --git a/Mage.Sets/src/mage/cards/s/SquirrelNest.java b/Mage.Sets/src/mage/cards/s/SquirrelNest.java index 99632d60f8b..c231b8c743f 100644 --- a/Mage.Sets/src/mage/cards/s/SquirrelNest.java +++ b/Mage.Sets/src/mage/cards/s/SquirrelNest.java @@ -65,10 +65,10 @@ public class SquirrelNest extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // Enchanted land has "{tap}: Put a 1/1 green Squirrel creature token onto the battlefield." + // Enchanted land has "{tap}: Create a 1/1 green Squirrel creature token." Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SquirrelToken()), new TapSourceCost()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{T}: Put a 1/1 green Squirrel creature token onto the battlefield.\""))); + new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{T}: Create a 1/1 green Squirrel creature token.\""))); } public SquirrelNest(final SquirrelNest card) { diff --git a/Mage.Sets/src/mage/cards/s/SquirrelWrangler.java b/Mage.Sets/src/mage/cards/s/SquirrelWrangler.java index c72545aee40..5a2ada7ee74 100644 --- a/Mage.Sets/src/mage/cards/s/SquirrelWrangler.java +++ b/Mage.Sets/src/mage/cards/s/SquirrelWrangler.java @@ -61,7 +61,7 @@ public class SquirrelWrangler extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // {1}{G}, Sacrifice a land: Put two 1/1 green Squirrel creature tokens onto the battlefield. + // {1}{G}, Sacrifice a land: Create two 1/1 green Squirrel creature tokens. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SquirrelToken(), 2), new ManaCostsImpl("{1}{G}")); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(new FilterControlledLandPermanent("a land")))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/StitcherGeralf.java b/Mage.Sets/src/mage/cards/s/StitcherGeralf.java index 2cfc19ed1d3..79ef83439b0 100644 --- a/Mage.Sets/src/mage/cards/s/StitcherGeralf.java +++ b/Mage.Sets/src/mage/cards/s/StitcherGeralf.java @@ -64,7 +64,7 @@ public class StitcherGeralf extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(4); - // {2}{U}, {tap}: Each player puts the top three cards of his or her library into his or her graveyard. Exile up to two creature cards put into graveyards this way. Put an X/X blue Zombie creature token onto the battlefield, where X is the total power of the cards exiled this way. + // {2}{U}, {tap}: Each player puts the top three cards of his or her library into his or her graveyard. Exile up to two creature cards put into graveyards this way. Create an X/X blue Zombie creature token, where X is the total power of the cards exiled this way. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new StitcherGeralfEffect(), new ManaCostsImpl("{2}{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); @@ -84,7 +84,7 @@ class StitcherGeralfEffect extends OneShotEffect { public StitcherGeralfEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Each player puts the top three cards of his or her library into his or her graveyard. Exile up to two creature cards put into graveyards this way. Put an X/X blue Zombie creature token onto the battlefield, where X is the total power of the cards exiled this way"; + this.staticText = "Each player puts the top three cards of his or her library into his or her graveyard. Exile up to two creature cards put into graveyards this way. Create an X/X blue Zombie creature token, where X is the total power of the cards exiled this way"; } public StitcherGeralfEffect(final StitcherGeralfEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/StitchersApprentice.java b/Mage.Sets/src/mage/cards/s/StitchersApprentice.java index e712fc0d525..1ea67910ab5 100644 --- a/Mage.Sets/src/mage/cards/s/StitchersApprentice.java +++ b/Mage.Sets/src/mage/cards/s/StitchersApprentice.java @@ -61,7 +61,7 @@ public class StitchersApprentice extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - // {1}{U}, {tap}: Put a 2/2 blue Homunculus creature token onto the battlefield, then sacrifice a creature. + // {1}{U}, {tap}: Create a 2/2 blue Homunculus creature token, then sacrifice a creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HomunculusToken()), new ManaCostsImpl("{1}{U}")); ability.addCost(new TapSourceCost()); ability.addEffect(new StitchersApprenticeEffect()); diff --git a/Mage.Sets/src/mage/cards/s/StolenIdentity.java b/Mage.Sets/src/mage/cards/s/StolenIdentity.java index de8c1d7e0d8..fb5856e320f 100644 --- a/Mage.Sets/src/mage/cards/s/StolenIdentity.java +++ b/Mage.Sets/src/mage/cards/s/StolenIdentity.java @@ -53,7 +53,7 @@ public class StolenIdentity extends CardImpl { public StolenIdentity(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{U}{U}"); - // Put a token onto the battlefield that's a copy of target artifact or creature. + // Create a token that's a copy of target artifact or creature. this.getSpellAbility().addEffect(new PutTokenOntoBattlefieldCopyTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent(filter)); // Cipher diff --git a/Mage.Sets/src/mage/cards/s/StoneIdolTrap.java b/Mage.Sets/src/mage/cards/s/StoneIdolTrap.java index 9e7e56d8d1d..aafa296687d 100644 --- a/Mage.Sets/src/mage/cards/s/StoneIdolTrap.java +++ b/Mage.Sets/src/mage/cards/s/StoneIdolTrap.java @@ -68,7 +68,7 @@ public class StoneIdolTrap extends CardImpl { ability.setRuleAtTheTop(true); this.addAbility(ability); - // Put a 6/12 colorless Construct artifact creature token with trample onto the battlefield. Exile it at the beginning of your next end step. + // Create a 6/12 colorless Construct artifact creature token with trample. Exile it at the beginning of your next end step. this.getSpellAbility().addEffect(new StoneIdolTrapEffect()); } @@ -124,7 +124,7 @@ class StoneIdolTrapEffect extends OneShotEffect { public StoneIdolTrapEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Put a 6/12 colorless Construct artifact creature token with trample onto the battlefield. Exile it at the beginning of your next end step"; + this.staticText = "Create a 6/12 colorless Construct artifact creature token with trample. Exile it at the beginning of your next end step"; } public StoneIdolTrapEffect(final StoneIdolTrapEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/StonybrookSchoolmaster.java b/Mage.Sets/src/mage/cards/s/StonybrookSchoolmaster.java index 4d35d021411..d9277eb19e3 100644 --- a/Mage.Sets/src/mage/cards/s/StonybrookSchoolmaster.java +++ b/Mage.Sets/src/mage/cards/s/StonybrookSchoolmaster.java @@ -49,7 +49,7 @@ public class StonybrookSchoolmaster extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - // Whenever Stonybrook Schoolmaster becomes tapped, you may put a 1/1 blue Merfolk Wizard creature token onto the battlefield. + // Whenever Stonybrook Schoolmaster becomes tapped, you may create a 1/1 blue Merfolk Wizard creature token. this.addAbility(new BecomesTappedSourceTriggeredAbility(new CreateTokenEffect(new MerfolkWizardToken()), true)); } diff --git a/Mage.Sets/src/mage/cards/s/StormHerd.java b/Mage.Sets/src/mage/cards/s/StormHerd.java index 4679d4257bd..a8ca917bd1d 100644 --- a/Mage.Sets/src/mage/cards/s/StormHerd.java +++ b/Mage.Sets/src/mage/cards/s/StormHerd.java @@ -44,7 +44,7 @@ public class StormHerd extends CardImpl { public StormHerd(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{8}{W}{W}"); - // Put X 1/1 white Pegasus creature tokens with flying onto the battlefield, where X is your life total. + // create X 1/1 white Pegasus creature tokens with flying, where X is your life total. this.getSpellAbility().addEffect(new CreateTokenEffect(new PegasusToken(), new ControllerLifeCount())); } diff --git a/Mage.Sets/src/mage/cards/s/StormfrontRiders.java b/Mage.Sets/src/mage/cards/s/StormfrontRiders.java index 3c601d4a826..ba5d10971cf 100644 --- a/Mage.Sets/src/mage/cards/s/StormfrontRiders.java +++ b/Mage.Sets/src/mage/cards/s/StormfrontRiders.java @@ -57,7 +57,7 @@ public class StormfrontRiders extends CardImpl { } public StormfrontRiders(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{W}"); this.subtype.add("Human"); this.subtype.add("Soldier"); @@ -68,10 +68,10 @@ public class StormfrontRiders extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Stormfront Riders enters the battlefield, return two creatures you control to their owner's hand. this.addAbility(new EntersBattlefieldTriggeredAbility(new ReturnToHandChosenControlledPermanentEffect(new FilterControlledCreaturePermanent("creatures you control"), 2))); - // Whenever Stormfront Riders or another creature is returned to your hand from the battlefield, put a 1/1 white Soldier creature token onto the battlefield. + // Whenever Stormfront Riders or another creature is returned to your hand from the battlefield, create a 1/1 white Soldier creature token. this.addAbility(new ZoneChangeAllTriggeredAbility(Zone.BATTLEFIELD, Zone.BATTLEFIELD, Zone.HAND, new CreateTokenEffect(new SoldierToken()), - filter,"Whenever {this} or another creature is returned to your hand from the battlefield, ", false)); - + filter, "Whenever {this} or another creature is returned to your hand from the battlefield, ", false)); + } public StormfrontRiders(final StormfrontRiders card) { diff --git a/Mage.Sets/src/mage/cards/s/StrengthOfArms.java b/Mage.Sets/src/mage/cards/s/StrengthOfArms.java index 7a75832c0d0..87d1e5e8b9b 100644 --- a/Mage.Sets/src/mage/cards/s/StrengthOfArms.java +++ b/Mage.Sets/src/mage/cards/s/StrengthOfArms.java @@ -56,12 +56,12 @@ public class StrengthOfArms extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{W}"); // Target creature gets +2/+2 until end of turn. - // If you control an Equipment, put a 1/1 white Human Soldier creature token onto the battlefield. + // If you control an Equipment, create a 1/1 white Human Soldier creature token. this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new CreateTokenEffect(new HumanSoldierToken()), new PermanentsOnTheBattlefieldCondition(filter, PermanentsOnTheBattlefieldCondition.CountType.MORE_THAN, 0), - "If you control an Equipment, put a 1/1 white Human Soldier creature token onto the battlefield.")); + "If you control an Equipment, create a 1/1 white Human Soldier creature token.")); } public StrengthOfArms(final StrengthOfArms card) { diff --git a/Mage.Sets/src/mage/cards/s/SubterraneanTremors.java b/Mage.Sets/src/mage/cards/s/SubterraneanTremors.java index 45578e47baf..682aada72ca 100644 --- a/Mage.Sets/src/mage/cards/s/SubterraneanTremors.java +++ b/Mage.Sets/src/mage/cards/s/SubterraneanTremors.java @@ -56,7 +56,7 @@ public class SubterraneanTremors extends CardImpl { // Subterranean Tremors deals X damage to each creature without flying. // If X is 4 or more, destroy all artifacts. - // If X is 8 or more, put an 8/8 red Lizard creature token onto the battlefield. + // If X is 8 or more, create an 8/8 red Lizard creature token. this.getSpellAbility().addEffect(new SubterraneanTremorsEffect()); } @@ -81,7 +81,7 @@ class SubterraneanTremorsEffect extends OneShotEffect { public SubterraneanTremorsEffect() { super(Outcome.Damage); - staticText = "{this} deals X damage to each creature without flying. If X is 4 or more, destroy all artifacts. If X is 8 or more, put an 8/8 red Lizard creature token onto the battlefield."; + staticText = "{this} deals X damage to each creature without flying. If X is 4 or more, destroy all artifacts. If X is 8 or more, create an 8/8 red Lizard creature token."; } public SubterraneanTremorsEffect(final SubterraneanTremorsEffect effect) { @@ -113,7 +113,7 @@ class SubterraneanTremorsEffect extends OneShotEffect { permanent.destroy(permanent.getId(), game, false); } } - // X 8 or more: put an 8/8 red lizard creature token on the battlefield + // X 8 or more: create an 8/8 red lizard creature token on the battlefield if (damage >= 8) { Token lizardToken = new LizardToken(); lizardToken.putOntoBattlefield(1, game, sourceId, controllerId); diff --git a/Mage.Sets/src/mage/cards/s/SummonTheSchool.java b/Mage.Sets/src/mage/cards/s/SummonTheSchool.java index 4497cb188c1..c456f6e6c16 100644 --- a/Mage.Sets/src/mage/cards/s/SummonTheSchool.java +++ b/Mage.Sets/src/mage/cards/s/SummonTheSchool.java @@ -61,7 +61,7 @@ public class SummonTheSchool extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.SORCERY},"{3}{W}"); this.subtype.add("Merfolk"); - // Put two 1/1 blue Merfolk Wizard creature tokens onto the battlefield. + // Create two 1/1 blue Merfolk Wizard creature tokens. this.getSpellAbility().addEffect(new CreateTokenEffect(new MerfolkWizardToken(), 2)); // Tap four untapped Merfolk you control: Return Summon the School from your graveyard to your hand. this.addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnToHandSourceEffect(), new TapTargetCost(new TargetControlledPermanent(4, 4, filter, false)))); diff --git a/Mage.Sets/src/mage/cards/s/SummoningStation.java b/Mage.Sets/src/mage/cards/s/SummoningStation.java index add96d15155..ba6e27daf76 100644 --- a/Mage.Sets/src/mage/cards/s/SummoningStation.java +++ b/Mage.Sets/src/mage/cards/s/SummoningStation.java @@ -50,7 +50,7 @@ public class SummoningStation extends CardImpl { public SummoningStation(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{7}"); - // {tap}: Put a 2/2 colorless Pincher creature token onto the battlefield. + // {tap}: Create a 2/2 colorless Pincher creature token. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD,new CreateTokenEffect(new PincherToken()), new TapSourceCost())); // Whenever an artifact is put into a graveyard from the battlefield, you may untap Summoning Station. this.addAbility(new PutIntoGraveFromBattlefieldAllTriggeredAbility(new UntapSourceEffect(),true, new FilterArtifactPermanent(), false)); diff --git a/Mage.Sets/src/mage/cards/s/SunderingGrowth.java b/Mage.Sets/src/mage/cards/s/SunderingGrowth.java index b9d8c95ddea..d17cf97bbbf 100644 --- a/Mage.Sets/src/mage/cards/s/SunderingGrowth.java +++ b/Mage.Sets/src/mage/cards/s/SunderingGrowth.java @@ -57,7 +57,7 @@ public class SunderingGrowth extends CardImpl { // Destroy target artifact or enchantment, then populate. - // (Put a token onto the battlefield that's a copy of a creature token you control.) + // (Create a token that's a copy of a creature token you control.) this.getSpellAbility().addTarget(new TargetPermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addEffect(new PopulateEffect("then")); diff --git a/Mage.Sets/src/mage/cards/s/SunhomeGuildmage.java b/Mage.Sets/src/mage/cards/s/SunhomeGuildmage.java index e38f5fbb914..7771406ff19 100644 --- a/Mage.Sets/src/mage/cards/s/SunhomeGuildmage.java +++ b/Mage.Sets/src/mage/cards/s/SunhomeGuildmage.java @@ -58,7 +58,7 @@ public class SunhomeGuildmage extends CardImpl { //{1}{R}{W}: Creatures you control get +1/+0 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}{R}{W}"))); - //{2}{R}{W}: Put a 1/1 red and white Soldier creature token with haste onto the battlefield. + //{2}{R}{W}: Create a 1/1 red and white Soldier creature token with haste. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SoldierTokenWithHaste()), new ManaCostsImpl("{2}{R}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/s/SunspireGatekeepers.java b/Mage.Sets/src/mage/cards/s/SunspireGatekeepers.java index f904873cb8c..ff9bb4cd8da 100644 --- a/Mage.Sets/src/mage/cards/s/SunspireGatekeepers.java +++ b/Mage.Sets/src/mage/cards/s/SunspireGatekeepers.java @@ -62,11 +62,11 @@ public class SunspireGatekeepers extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(4); - // When Sunspire Gatekeepers enter the battlefield, if you control two or more Gates, put a 2/2 white Knight creature token with vigilance onto the battlefield. + // When Sunspire Gatekeepers enter the battlefield, if you control two or more Gates, create a 2/2 white Knight creature token with vigilance. this.addAbility(new ConditionalTriggeredAbility( new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new KnightToken())), new PermanentsOnTheBattlefieldCondition(filter, PermanentsOnTheBattlefieldCondition.CountType.MORE_THAN, 1), - "When {this} enter the battlefield, if you control two or more Gates, put a 2/2 white Knight creature token with vigilance onto the battlefield.")); + "When {this} enter the battlefield, if you control two or more Gates, create a 2/2 white Knight creature token with vigilance.")); } public SunspireGatekeepers (final SunspireGatekeepers card) { diff --git a/Mage.Sets/src/mage/cards/s/SupplantForm.java b/Mage.Sets/src/mage/cards/s/SupplantForm.java index cc49c317c37..bf83582175e 100644 --- a/Mage.Sets/src/mage/cards/s/SupplantForm.java +++ b/Mage.Sets/src/mage/cards/s/SupplantForm.java @@ -45,11 +45,11 @@ public class SupplantForm extends CardImpl { public SupplantForm(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{4}{U}{U}"); - // Return target creature to its owner's hand. You put a token onto the battlefield that's a copy of that creature. + // Return target creature to its owner's hand. You create a token that's a copy of that creature. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); Effect effect = new PutTokenOntoBattlefieldCopyTargetEffect(); - effect.setText("You put a token onto the battlefield that's a copy of that creature"); + effect.setText("You create a token that's a copy of that creature"); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/cards/s/SupplyDemand.java b/Mage.Sets/src/mage/cards/s/SupplyDemand.java index 7bc5985af1f..f1e4faeae37 100644 --- a/Mage.Sets/src/mage/cards/s/SupplyDemand.java +++ b/Mage.Sets/src/mage/cards/s/SupplyDemand.java @@ -55,7 +55,7 @@ public class SupplyDemand extends SplitCard { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{X}{G}{W}","{1}{W}{U}",false); // Supply - // Put X 1/1 green Saproling creature tokens onto the battlefield. + // create X 1/1 green Saproling creature tokens. getLeftHalfCard().getSpellAbility().addEffect(new CreateTokenEffect(new SaprolingToken(), new ManacostVariableValue())); // Demand diff --git a/Mage.Sets/src/mage/cards/s/SurveyTheWreckage.java b/Mage.Sets/src/mage/cards/s/SurveyTheWreckage.java index 42a22265f63..665edc8b3df 100644 --- a/Mage.Sets/src/mage/cards/s/SurveyTheWreckage.java +++ b/Mage.Sets/src/mage/cards/s/SurveyTheWreckage.java @@ -45,7 +45,7 @@ public class SurveyTheWreckage extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{R}"); - // Destroy target land. Put a 1/1 red Goblin creature token onto the battlefield. + // Destroy target land. Create a 1/1 red Goblin creature token. this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetLandPermanent()); this.getSpellAbility().addEffect(new CreateTokenEffect(new GoblinToken())); diff --git a/Mage.Sets/src/mage/cards/s/SwanSong.java b/Mage.Sets/src/mage/cards/s/SwanSong.java index 6ff6dbc90c8..fabeff0f914 100644 --- a/Mage.Sets/src/mage/cards/s/SwanSong.java +++ b/Mage.Sets/src/mage/cards/s/SwanSong.java @@ -61,7 +61,7 @@ public class SwanSong extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{U}"); - // Counter target enchantment, instant or sorcery spell. Its controller puts a 2/2 blue Bird creature token with flying onto the battlefield. + // Counter target enchantment, instant or sorcery spell. Its controller creates a 2/2 blue Bird creature token with flying. this.getSpellAbility().addEffect(new SwanSongEffect()); this.getSpellAbility().addTarget(new TargetSpell(filter)); } @@ -80,7 +80,7 @@ class SwanSongEffect extends OneShotEffect { public SwanSongEffect() { super(Outcome.Benefit); - this.staticText = "Counter target enchantment, instant or sorcery spell. Its controller puts a 2/2 blue Bird creature token with flying onto the battlefield"; + this.staticText = "Counter target enchantment, instant or sorcery spell. Its controller creates a 2/2 blue Bird creature token with flying"; } public SwanSongEffect(final SwanSongEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SwordOfBodyAndMind.java b/Mage.Sets/src/mage/cards/s/SwordOfBodyAndMind.java index 1800cb8aac2..3de48e1bdf3 100644 --- a/Mage.Sets/src/mage/cards/s/SwordOfBodyAndMind.java +++ b/Mage.Sets/src/mage/cards/s/SwordOfBodyAndMind.java @@ -83,7 +83,7 @@ public class SwordOfBodyAndMind extends CardImpl { ability.addEffect(effect); this.addAbility(ability); - // Whenever equipped creature deals combat damage to a player, you put a 2/2 green Wolf creature token onto the battlefield and that player puts the top ten cards of his or her library into his or her graveyard. + // Whenever equipped creature deals combat damage to a player, you create a 2/2 green Wolf creature token and that player puts the top ten cards of his or her library into his or her graveyard. this.addAbility(new SwordOfBodyAndMindAbility()); // Equip {2} @@ -136,6 +136,6 @@ class SwordOfBodyAndMindAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever equipped creature deals combat damage to a player, you put a 2/2 green Wolf creature token onto the battlefield and that player puts the top ten cards of his or her library into his or her graveyard."; + return "Whenever equipped creature deals combat damage to a player, you create a 2/2 green Wolf creature token and that player puts the top ten cards of his or her library into his or her graveyard."; } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/s/SylvanOffering.java b/Mage.Sets/src/mage/cards/s/SylvanOffering.java index 4bb0bc22324..7aa99d0e31f 100644 --- a/Mage.Sets/src/mage/cards/s/SylvanOffering.java +++ b/Mage.Sets/src/mage/cards/s/SylvanOffering.java @@ -54,9 +54,9 @@ public class SylvanOffering extends CardImpl { public SylvanOffering(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{X}{G}"); - // Choose an opponent. You and that player each put an X/X green Treefolk creature token onto the battlefield. + // Choose an opponent. You and that player each create an X/X green Treefolk creature token. this.getSpellAbility().addEffect(new SylvanOfferingEffect1()); - // Choose an opponent. You and that player each put X 1/1 green Elf Warrior creature tokens onto the battlefield. + // Choose an opponent. You and that player each create X 1/1 green Elf Warrior creature tokens. this.getSpellAbility().addEffect(new SylvanOfferingEffect2()); } @@ -74,7 +74,7 @@ class SylvanOfferingEffect1 extends OneShotEffect { SylvanOfferingEffect1() { super(Outcome.Sacrifice); - this.staticText = "Choose an opponent. You and that player each put an X/X green Treefolk creature token onto the battlefield"; + this.staticText = "Choose an opponent. You and that player each create an X/X green Treefolk creature token"; } SylvanOfferingEffect1(final SylvanOfferingEffect1 effect) { @@ -125,7 +125,7 @@ class SylvanOfferingEffect2 extends OneShotEffect { SylvanOfferingEffect2() { super(Outcome.Sacrifice); - this.staticText = "
Choose an opponent. You and that player each put X 1/1 green Elf Warrior creature tokens onto the battlefield"; + this.staticText = "
Choose an opponent. You and that player each create X 1/1 green Elf Warrior creature tokens"; } SylvanOfferingEffect2(final SylvanOfferingEffect2 effect) { diff --git a/Mage.Sets/src/mage/cards/s/SymbioticBeast.java b/Mage.Sets/src/mage/cards/s/SymbioticBeast.java index 2a222de0b8f..3910e1685a9 100644 --- a/Mage.Sets/src/mage/cards/s/SymbioticBeast.java +++ b/Mage.Sets/src/mage/cards/s/SymbioticBeast.java @@ -49,7 +49,7 @@ public class SymbioticBeast extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); - // When Symbiotic Beast dies, put four 1/1 green Insect creature tokens onto the battlefield. + // When Symbiotic Beast dies, create four 1/1 green Insect creature tokens. this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new InsectToken(), 4))); } diff --git a/Mage.Sets/src/mage/cards/s/SymbioticElf.java b/Mage.Sets/src/mage/cards/s/SymbioticElf.java index 413c3cb8c44..5ec426c4fc2 100644 --- a/Mage.Sets/src/mage/cards/s/SymbioticElf.java +++ b/Mage.Sets/src/mage/cards/s/SymbioticElf.java @@ -48,7 +48,7 @@ public class SymbioticElf extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // When Symbiotic Elf dies, put two 1/1 green Insect creature tokens onto the battlefield. + // When Symbiotic Elf dies, create two 1/1 green Insect creature tokens. this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new InsectToken(), 2))); } diff --git a/Mage.Sets/src/mage/cards/s/SymbioticWurm.java b/Mage.Sets/src/mage/cards/s/SymbioticWurm.java index 7a47849fa9d..3e2fdda0a8f 100644 --- a/Mage.Sets/src/mage/cards/s/SymbioticWurm.java +++ b/Mage.Sets/src/mage/cards/s/SymbioticWurm.java @@ -43,13 +43,13 @@ import mage.game.permanent.token.InsectToken; public class SymbioticWurm extends CardImpl { public SymbioticWurm(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{G}{G}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{G}{G}{G}"); this.subtype.add("Wurm"); this.power = new MageInt(7); this.toughness = new MageInt(7); - // When Symbiotic Wurm dies, put seven 1/1 green Insect creature tokens onto the battlefield. + // When Symbiotic Wurm dies, create seven 1/1 green Insect creature tokens. this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new InsectToken(), 7))); } diff --git a/Mage.Sets/src/mage/cards/s/SyphonFlesh.java b/Mage.Sets/src/mage/cards/s/SyphonFlesh.java index 3e4eae90c47..9d4d0f65dbb 100644 --- a/Mage.Sets/src/mage/cards/s/SyphonFlesh.java +++ b/Mage.Sets/src/mage/cards/s/SyphonFlesh.java @@ -51,7 +51,7 @@ public class SyphonFlesh extends CardImpl { public SyphonFlesh(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{B}"); - // Each other player sacrifices a creature. You put a 2/2 black Zombie creature token onto the battlefield for each creature sacrificed this way. + // Each other player sacrifices a creature. You create a 2/2 black Zombie creature token for each creature sacrificed this way. this.getSpellAbility().addEffect(new SyphonFleshEffect()); } @@ -69,7 +69,7 @@ class SyphonFleshEffect extends OneShotEffect { public SyphonFleshEffect() { super(Outcome.Sacrifice); - this.staticText = "each other player sacrifices a creature. You put a 2/2 black Zombie creature token onto the battlefield for each creature sacrificed this way."; + this.staticText = "each other player sacrifices a creature. You create a 2/2 black Zombie creature token for each creature sacrificed this way."; } public SyphonFleshEffect(final SyphonFleshEffect effect) { diff --git a/Mage.Sets/src/mage/cards/t/TakeUpArms.java b/Mage.Sets/src/mage/cards/t/TakeUpArms.java index bea9ed299fc..a61ee826cc4 100644 --- a/Mage.Sets/src/mage/cards/t/TakeUpArms.java +++ b/Mage.Sets/src/mage/cards/t/TakeUpArms.java @@ -44,7 +44,7 @@ public class TakeUpArms extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{4}{W}"); - // Put three 1/1 white Warrior creature tokens onto the battlefield. + // Create three 1/1 white Warrior creature tokens. this.getSpellAbility().addEffect(new CreateTokenEffect(new WarriorToken(), 3)); } diff --git a/Mage.Sets/src/mage/cards/t/TalrandSkySummoner.java b/Mage.Sets/src/mage/cards/t/TalrandSkySummoner.java index 9e77592c5ab..17fdd128ad0 100644 --- a/Mage.Sets/src/mage/cards/t/TalrandSkySummoner.java +++ b/Mage.Sets/src/mage/cards/t/TalrandSkySummoner.java @@ -62,7 +62,7 @@ public class TalrandSkySummoner extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // Whenever you cast an instant or sorcery spell, put a 2/2 blue Drake creature token with flying onto the battlefield. + // Whenever you cast an instant or sorcery spell, create a 2/2 blue Drake creature token with flying. this.addAbility(new SpellCastControllerTriggeredAbility(new CreateTokenEffect(new DrakeToken()), filter, false)); } diff --git a/Mage.Sets/src/mage/cards/t/TalrandsInvocation.java b/Mage.Sets/src/mage/cards/t/TalrandsInvocation.java index 687a7df5204..2d75286b4d2 100644 --- a/Mage.Sets/src/mage/cards/t/TalrandsInvocation.java +++ b/Mage.Sets/src/mage/cards/t/TalrandsInvocation.java @@ -44,7 +44,7 @@ public class TalrandsInvocation extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{U}{U}"); - // Put two 2/2 blue Drake creature tokens with flying onto the battlefield. + // Create two 2/2 blue Drake creature tokens with flying. this.getSpellAbility().addEffect(new CreateTokenEffect(new DrakeToken(), 2)); } diff --git a/Mage.Sets/src/mage/cards/t/TamiyosJournal.java b/Mage.Sets/src/mage/cards/t/TamiyosJournal.java index e56cc2ba74f..74e97374fee 100644 --- a/Mage.Sets/src/mage/cards/t/TamiyosJournal.java +++ b/Mage.Sets/src/mage/cards/t/TamiyosJournal.java @@ -61,7 +61,7 @@ public class TamiyosJournal extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{5}"); this.supertype.add("Legendary"); - // At the beginning of your upkeep, investigate (Put a colorless Clue artifact token onto the battlefield with \"{2}, Sacrifice this artifact: Draw a card.\"). + // At the beginning of your upkeep, investigate (Create a colorless Clue artifact token with \"{2}, Sacrifice this artifact: Draw a card.\"). this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new InvestigateEffect(), TargetController.YOU, false)); // {T}, Sacrifice three Clues: Search your library for a card and put that card into your hand. Then shuffle your library. diff --git a/Mage.Sets/src/mage/cards/t/TatsumasaTheDragonsFang.java b/Mage.Sets/src/mage/cards/t/TatsumasaTheDragonsFang.java index bf673ff52db..90758ebf672 100644 --- a/Mage.Sets/src/mage/cards/t/TatsumasaTheDragonsFang.java +++ b/Mage.Sets/src/mage/cards/t/TatsumasaTheDragonsFang.java @@ -70,7 +70,7 @@ public class TatsumasaTheDragonsFang extends CardImpl { // Equipped creature gets +5/+5. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(5, 5))); - // {6}, Exile Tatsumasa, the Dragon's Fang: Put a 5/5 blue Dragon Spirit creature token with flying onto the battlefield. Return Tatsumasa to the battlefield under its owner's control when that token dies. + // {6}, Exile Tatsumasa, the Dragon's Fang: Create a 5/5 blue Dragon Spirit creature token with flying. Return Tatsumasa to the battlefield under its owner's control when that token dies. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TatsumaTheDragonsFangEffect(), new GenericManaCost(6)); ability.addCost(new ExileSourceCost(true)); this.addAbility(ability); @@ -93,7 +93,7 @@ class TatsumaTheDragonsFangEffect extends OneShotEffect { public TatsumaTheDragonsFangEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Put a 5/5 blue Dragon Spirit creature token with flying onto the battlefield. Return Tatsumasa to the battlefield under its owner's control when that token dies"; + this.staticText = "Create a 5/5 blue Dragon Spirit creature token with flying. Return Tatsumasa to the battlefield under its owner's control when that token dies"; } public TatsumaTheDragonsFangEffect(final TatsumaTheDragonsFangEffect effect) { diff --git a/Mage.Sets/src/mage/cards/t/TemptWithReflections.java b/Mage.Sets/src/mage/cards/t/TemptWithReflections.java index b4e7d5e8f51..5c2ae9ed005 100644 --- a/Mage.Sets/src/mage/cards/t/TemptWithReflections.java +++ b/Mage.Sets/src/mage/cards/t/TemptWithReflections.java @@ -53,7 +53,7 @@ public class TemptWithReflections extends CardImpl { public TemptWithReflections(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{U}"); - // Tempting offer - Choose target creature you control. Put a token onto the battlefield that's a copy of that creature. Each opponent may put a token onto the battlefield that's a copy of that creature. For each opponent who does, put a token onto the battlefield that's a copy of that creature. + // Tempting offer - Choose target creature you control. Create a token that's a copy of that creature. Each opponent may create a token that's a copy of that creature. For each opponent who does, create a token that's a copy of that creature. this.getSpellAbility().addEffect(new TemptWithReflectionsEffect()); this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); } @@ -72,7 +72,7 @@ class TemptWithReflectionsEffect extends OneShotEffect { public TemptWithReflectionsEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Tempting offer - Choose target creature you control. Put a token onto the battlefield that's a copy of that creature. Each opponent may put a token onto the battlefield that's a copy of that creature. For each opponent who does, put a token onto the battlefield that's a copy of that creature"; + this.staticText = "Tempting offer - Choose target creature you control. Create a token that's a copy of that creature. Each opponent may create a token that's a copy of that creature. For each opponent who does, create a token that's a copy of that creature"; } public TemptWithReflectionsEffect(final TemptWithReflectionsEffect effect) { @@ -99,7 +99,7 @@ class TemptWithReflectionsEffect extends OneShotEffect { do { if (game.getOpponents(source.getControllerId()).contains(player.getId())) { String decision; - if (player.chooseUse(outcome, "Put a copy of target creature onto the battlefield for you?", source, game)) { + if (player.chooseUse(outcome, "Create a copy of target creature for you?", source, game)) { playersSaidYes.add(player.getId()); decision = " chooses to copy "; } else { diff --git a/Mage.Sets/src/mage/cards/t/TemptWithVengeance.java b/Mage.Sets/src/mage/cards/t/TemptWithVengeance.java index a929c5fdf72..4932c9ca5bd 100644 --- a/Mage.Sets/src/mage/cards/t/TemptWithVengeance.java +++ b/Mage.Sets/src/mage/cards/t/TemptWithVengeance.java @@ -47,11 +47,10 @@ import mage.players.Player; public class TemptWithVengeance extends CardImpl { public TemptWithVengeance(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{X}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{X}{R}"); - - // Tempting offer - Put X 1/1 red Elemental creature tokens with haste onto the battlefield. Each opponent may put X 1/1 red Elemental creature tokens with haste onto the battlefield. For each player who does, put X 1/1 red Elemental creature tokens with haste onto the battlefield. - this.getSpellAbility().addEffect(new TemptWithVengeanceEffect()); + // Tempting offer - create X 1/1 red Elemental creature tokens with haste. Each opponent may create X 1/1 red Elemental creature tokens with haste. For each player who does, create X 1/1 red Elemental creature tokens with haste. + this.getSpellAbility().addEffect(new TemptWithVengeanceEffect()); } public TemptWithVengeance(final TemptWithVengeance card) { @@ -68,7 +67,7 @@ class TemptWithVengeanceEffect extends OneShotEffect { public TemptWithVengeanceEffect() { super(Outcome.PutLandInPlay); - this.staticText = "Tempting offer - Put X 1/1 red Elemental creature tokens with haste onto the battlefield. Each opponent may put X 1/1 red Elemental creature tokens with haste onto the battlefield. For each player who does, put X 1/1 red Elemental creature tokens with haste onto the battlefield"; + this.staticText = "Tempting offer - create X 1/1 red Elemental creature tokens with haste. Each opponent may create X 1/1 red Elemental creature tokens with haste. For each player who does, create X 1/1 red Elemental creature tokens with haste"; } public TemptWithVengeanceEffect(final TemptWithVengeanceEffect effect) { @@ -93,7 +92,7 @@ class TemptWithVengeanceEffect extends OneShotEffect { for (UUID playerId : game.getOpponents(controller.getId())) { Player opponent = game.getPlayer(playerId); if (opponent != null) { - if (opponent.chooseUse(outcome, "Put " + xValue + " Elemental Tokens onto the battlefield?", source, game)) { + if (opponent.chooseUse(outcome, "Create " + xValue + " Elemental tokens?", source, game)) { opponentsAddedTokens += xValue; tokenCopy.putOntoBattlefield(xValue, game, source.getSourceId(), playerId, false, false); } diff --git a/Mage.Sets/src/mage/cards/t/Terastodon.java b/Mage.Sets/src/mage/cards/t/Terastodon.java index b124d3d1832..c47a49b8445 100644 --- a/Mage.Sets/src/mage/cards/t/Terastodon.java +++ b/Mage.Sets/src/mage/cards/t/Terastodon.java @@ -66,7 +66,7 @@ public class Terastodon extends CardImpl { this.power = new MageInt(9); this.toughness = new MageInt(9); - // When Terastodon enters the battlefield, you may destroy up to three target noncreature permanents. For each permanent put into a graveyard this way, its controller puts a 3/3 green Elephant creature token onto the battlefield. + // When Terastodon enters the battlefield, you may destroy up to three target noncreature permanents. For each permanent put into a graveyard this way, its controller creates a 3/3 green Elephant creature token. Ability ability = new EntersBattlefieldTriggeredAbility(new TerastodonEffect(), true); ability.addTarget(new TargetPermanent(0, 3, filter, false)); this.addAbility(ability); @@ -86,7 +86,7 @@ class TerastodonEffect extends OneShotEffect { public TerastodonEffect() { super(Outcome.DestroyPermanent); - this.staticText = "you may destroy up to three target noncreature permanents. For each permanent put into a graveyard this way, its controller puts a 3/3 green Elephant creature token onto the battlefield"; + this.staticText = "you may destroy up to three target noncreature permanents. For each permanent put into a graveyard this way, its controller creates a 3/3 green Elephant creature token"; } public TerastodonEffect(final TerastodonEffect effect) { diff --git a/Mage.Sets/src/mage/cards/t/Tetravus.java b/Mage.Sets/src/mage/cards/t/Tetravus.java index d4c86218701..279ad65a6a6 100644 --- a/Mage.Sets/src/mage/cards/t/Tetravus.java +++ b/Mage.Sets/src/mage/cards/t/Tetravus.java @@ -59,7 +59,7 @@ import mage.target.common.TargetControlledPermanent; public class Tetravus extends CardImpl { public Tetravus(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{6}"); + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{6}"); this.subtype.add("Construct"); this.power = new MageInt(1); this.toughness = new MageInt(1); @@ -68,14 +68,14 @@ public class Tetravus extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Tetravus enters the battlefield with three +1/+1 counters on it. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(3)), "{this} enters the battlefield with three +1/+1 counters on it")); - // At the beginning of your upkeep, you may remove any number of +1/+1 counters from Tetravus. If you do, put that many 1/1 colorless Tetravite artifact creature tokens onto the battlefield. They each have flying and "This creature can't be enchanted." + // At the beginning of your upkeep, you may remove any number of +1/+1 counters from Tetravus. If you do, create that many 1/1 colorless Tetravite artifact creature tokens. They each have flying and "This creature can't be enchanted." this.addAbility(new ConditionalTriggeredAbility(new BeginningOfUpkeepTriggeredAbility(new DoIfCostPaid(new CreateTokenEffect(new TetraviteToken()), - new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))), TargetController.YOU, true), - new SourceHasCounterCondition(CounterType.P1P1, 1), "At the beginning of your upkeep, you may remove any number of +1/+1 counters from Tetravus. If you do, put that many 1/1 colorless Tetravite artifact creature tokens onto the battlefield. They each have flying and \"This creature can't be enchanted.\"")); - // At the beginning of your upkeep, you may exile any number of tokens put onto the battlefield with Tetravus. If you do, put that many +1/+1 counters on Tetravus. + new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))), TargetController.YOU, true), + new SourceHasCounterCondition(CounterType.P1P1, 1), "At the beginning of your upkeep, you may remove any number of +1/+1 counters from Tetravus. If you do, create that many 1/1 colorless Tetravite artifact creature tokens. They each have flying and \"This creature can't be enchanted.\"")); + // At the beginning of your upkeep, you may exile any number of tokens created with Tetravus. If you do, put that many +1/+1 counters on Tetravus. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DoIfCostPaid(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), - new ExileTargetCost(new TargetControlledPermanent(new FilterControlledPermanent("Tetravite")))), TargetController.YOU, true)); - + new ExileTargetCost(new TargetControlledPermanent(new FilterControlledPermanent("Tetravite")))), TargetController.YOU, true)); + } public Tetravus(final Tetravus card) { @@ -87,42 +87,43 @@ public class Tetravus extends CardImpl { return new Tetravus(this); } } + class TetraviteToken extends Token { public TetraviteToken() { super("Tetravite", "1/1 colorless Tetravite artifact creature token"); cardType.add(CardType.CREATURE); - cardType.add(CardType.ARTIFACT); - subtype.add("Tetravite"); + cardType.add(CardType.ARTIFACT); + subtype.add("Tetravite"); power = new MageInt(1); toughness = new MageInt(1); - + this.addAbility(FlyingAbility.getInstance()); this.addAbility(new CantBeEnchantedAbility()); } } class CantBeEnchantedAbility extends StaticAbility { - - public CantBeEnchantedAbility(){ + + public CantBeEnchantedAbility() { super(Zone.BATTLEFIELD, null); } - + public CantBeEnchantedAbility(final CantBeEnchantedAbility ability) { - super(ability); + super(ability); } - + @Override public CantBeEnchantedAbility copy() { return new CantBeEnchantedAbility(this); } - + public boolean canTarget(MageObject source, Game game) { - if (source.getCardType().contains(CardType.ENCHANTMENT) && - source.hasSubtype("Aura", game)) { + if (source.getCardType().contains(CardType.ENCHANTMENT) + && source.hasSubtype("Aura", game)) { return false; } return true; } - + } diff --git a/Mage.Sets/src/mage/cards/t/TeysaEnvoyOfGhosts.java b/Mage.Sets/src/mage/cards/t/TeysaEnvoyOfGhosts.java index 15ea04d3657..793bb209c62 100644 --- a/Mage.Sets/src/mage/cards/t/TeysaEnvoyOfGhosts.java +++ b/Mage.Sets/src/mage/cards/t/TeysaEnvoyOfGhosts.java @@ -66,7 +66,7 @@ public class TeysaEnvoyOfGhosts extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // protection from creatures this.addAbility(new ProtectionAbility(new FilterCreaturePermanent("creatures"))); - // Whenever a creature deals combat damage to you, destroy that creature. Put a 1/1 white and black Spirit creature token with flying onto the battlefield. + // Whenever a creature deals combat damage to you, destroy that creature. Create a 1/1 white and black Spirit creature token with flying. this.addAbility(new TeysaEnvoyOfGhostsTriggeredAbility()); } @@ -120,7 +120,7 @@ class TeysaEnvoyOfGhostsTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever a creature deals combat damage to you, destroy that creature. Put a 1/1 white and black Spirit creature token with flying onto the battlefield."; + return "Whenever a creature deals combat damage to you, destroy that creature. Create a 1/1 white and black Spirit creature token with flying."; } } diff --git a/Mage.Sets/src/mage/cards/t/TeysaOrzhovScion.java b/Mage.Sets/src/mage/cards/t/TeysaOrzhovScion.java index 5137f61e0ac..5e72e843d2c 100644 --- a/Mage.Sets/src/mage/cards/t/TeysaOrzhovScion.java +++ b/Mage.Sets/src/mage/cards/t/TeysaOrzhovScion.java @@ -79,7 +79,7 @@ public class TeysaOrzhovScion extends CardImpl { ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); - // Whenever another black creature you control dies, put a 1/1 white Spirit creature token with flying onto the battlefield. + // Whenever another black creature you control dies, create a 1/1 white Spirit creature token with flying. this.addAbility(new DiesCreatureTriggeredAbility(new CreateTokenEffect(new SpiritWhiteToken("GPT")), false, filterBlack)); } diff --git a/Mage.Sets/src/mage/cards/t/Thallid.java b/Mage.Sets/src/mage/cards/t/Thallid.java index 66ed4611873..428ebaa7437 100644 --- a/Mage.Sets/src/mage/cards/t/Thallid.java +++ b/Mage.Sets/src/mage/cards/t/Thallid.java @@ -58,7 +58,7 @@ public class Thallid extends CardImpl { // At the beginning of your upkeep, put a spore counter on Thallid. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()), TargetController.YOU, false)); - // Remove three spore counters from Thallid: Put a 1/1 green Saproling creature token onto the battlefield. + // Remove three spore counters from Thallid: Create a 1/1 green Saproling creature token. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); } diff --git a/Mage.Sets/src/mage/cards/t/ThallidDevourer.java b/Mage.Sets/src/mage/cards/t/ThallidDevourer.java index d71adc464ba..345201cc082 100644 --- a/Mage.Sets/src/mage/cards/t/ThallidDevourer.java +++ b/Mage.Sets/src/mage/cards/t/ThallidDevourer.java @@ -67,7 +67,7 @@ public class ThallidDevourer extends CardImpl { // At the beginning of your upkeep, put a spore counter on Thallid Devourer. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()), TargetController.YOU, false)); - // Remove three spore counters from Thallid Devourer: Put a 1/1 green Saproling creature token onto the battlefield. + // Remove three spore counters from Thallid Devourer: Create a 1/1 green Saproling creature token. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); diff --git a/Mage.Sets/src/mage/cards/t/ThallidGerminator.java b/Mage.Sets/src/mage/cards/t/ThallidGerminator.java index 2e8ff90f082..6f1cfb1ce0e 100644 --- a/Mage.Sets/src/mage/cards/t/ThallidGerminator.java +++ b/Mage.Sets/src/mage/cards/t/ThallidGerminator.java @@ -70,7 +70,7 @@ public class ThallidGerminator extends CardImpl { // At the beginning of your upkeep, put a spore counter on Thallid Germinator. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()), TargetController.YOU, false)); - // Remove three spore counters from Thallid Germinator: Put a 1/1 green Saproling creature token onto the battlefield. + // Remove three spore counters from Thallid Germinator: Create a 1/1 green Saproling creature token. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); // Sacrifice a Saproling: Target creature gets +1/+1 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/t/ThallidShellDweller.java b/Mage.Sets/src/mage/cards/t/ThallidShellDweller.java index 2d272e247b3..74de1f4a92d 100644 --- a/Mage.Sets/src/mage/cards/t/ThallidShellDweller.java +++ b/Mage.Sets/src/mage/cards/t/ThallidShellDweller.java @@ -60,7 +60,7 @@ public class ThallidShellDweller extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // At the beginning of your upkeep, put a spore counter on Thallid Shell-Dweller. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()), TargetController.YOU, false)); - // Remove three spore counters from Thallid Shell-Dweller: Put a 1/1 green Saproling creature token onto the battlefield. + // Remove three spore counters from Thallid Shell-Dweller: Create a 1/1 green Saproling creature token. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); } diff --git a/Mage.Sets/src/mage/cards/t/ThatcherRevolt.java b/Mage.Sets/src/mage/cards/t/ThatcherRevolt.java index 87f3373d159..4f101c906a4 100644 --- a/Mage.Sets/src/mage/cards/t/ThatcherRevolt.java +++ b/Mage.Sets/src/mage/cards/t/ThatcherRevolt.java @@ -54,7 +54,7 @@ public class ThatcherRevolt extends CardImpl { public ThatcherRevolt(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{R}"); - // Put three 1/1 red Human creature tokens with haste onto the battlefield. Sacrifice those tokens at the beginning of the next end step. + // Create three 1/1 red Human creature tokens with haste. Sacrifice those tokens at the beginning of the next end step. this.getSpellAbility().addEffect(new ThatcherRevoltEffect()); } @@ -72,7 +72,7 @@ class ThatcherRevoltEffect extends OneShotEffect { public ThatcherRevoltEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Put three 1/1 red Human creature tokens with haste onto the battlefield. Sacrifice those tokens at the beginning of the next end step"; + this.staticText = "Create three 1/1 red Human creature tokens with haste. Sacrifice those tokens at the beginning of the next end step"; } public ThatcherRevoltEffect(final ThatcherRevoltEffect effect) { diff --git a/Mage.Sets/src/mage/cards/t/TheloniteHermit.java b/Mage.Sets/src/mage/cards/t/TheloniteHermit.java index 261c78588ca..134ce29bc3c 100644 --- a/Mage.Sets/src/mage/cards/t/TheloniteHermit.java +++ b/Mage.Sets/src/mage/cards/t/TheloniteHermit.java @@ -70,7 +70,7 @@ public class TheloniteHermit extends CardImpl { // Morph {3}{G}{G} this.addAbility(new MorphAbility(this, new ManaCostsImpl("{3}{G}{G}"))); - // When Thelonite Hermit is turned face up, put four 1/1 green Saproling creature tokens onto the battlefield. + // When Thelonite Hermit is turned face up, create four 1/1 green Saproling creature tokens. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new CreateTokenEffect(new SaprolingToken(), 4))); } diff --git a/Mage.Sets/src/mage/cards/t/ThopterAssembly.java b/Mage.Sets/src/mage/cards/t/ThopterAssembly.java index 1d3c529d4ff..41ac58d9af7 100644 --- a/Mage.Sets/src/mage/cards/t/ThopterAssembly.java +++ b/Mage.Sets/src/mage/cards/t/ThopterAssembly.java @@ -62,8 +62,8 @@ public class ThopterAssembly extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // At the beginning of your upkeep, if you control no Thopters other than Thopter Assembly, - // return Thopter Assembly to its owner's hand and put five 1/1 colorless Thopter artifact - // creature tokens with flying onto the battlefield. + // return Thopter Assembly to its owner's hand and create five 1/1 colorless Thopter artifact + // creature tokens with flying. this.addAbility(new ThopterAssemblyTriggeredAbility()); } @@ -116,6 +116,6 @@ class ThopterAssemblyTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "At the beginning of your upkeep, if you control no Thopters other than {this}, return {this} to its owner's hand and put five 1/1 colorless Thopter artifact creature tokens with flying onto the battlefield"; + return "At the beginning of your upkeep, if you control no Thopters other than {this}, return {this} to its owner's hand and create five 1/1 colorless Thopter artifact creature tokens with flying"; } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/t/ThopterEngineer.java b/Mage.Sets/src/mage/cards/t/ThopterEngineer.java index 3cd410bd04a..8e14a3b6a4f 100644 --- a/Mage.Sets/src/mage/cards/t/ThopterEngineer.java +++ b/Mage.Sets/src/mage/cards/t/ThopterEngineer.java @@ -62,7 +62,7 @@ public class ThopterEngineer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(3); - // When Thopter Engineer enters the battlefield, put a 1/1 colorless Thopter artifact creature token with flying onto the battlefield. + // When Thopter Engineer enters the battlefield, create a 1/1 colorless Thopter artifact creature token with flying. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new ThopterColorlessToken(), 1))); // Artifact creatures you control have haste. diff --git a/Mage.Sets/src/mage/cards/t/ThopterFoundry.java b/Mage.Sets/src/mage/cards/t/ThopterFoundry.java index 170a82dd6c5..c0ad1eb14e4 100644 --- a/Mage.Sets/src/mage/cards/t/ThopterFoundry.java +++ b/Mage.Sets/src/mage/cards/t/ThopterFoundry.java @@ -67,7 +67,7 @@ public class ThopterFoundry extends CardImpl { - // {1}, Sacrifice a nontoken artifact: Put a 1/1 blue Thopter artifact creature token with flying onto the battlefield. You gain 1 life. + // {1}, Sacrifice a nontoken artifact: Create a 1/1 blue Thopter artifact creature token with flying. You gain 1 life. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ThopterToken()), new GenericManaCost(1)); ability.addEffect(new GainLifeEffect(1)); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); diff --git a/Mage.Sets/src/mage/cards/t/ThopterSpyNetwork.java b/Mage.Sets/src/mage/cards/t/ThopterSpyNetwork.java index 1de0c93de13..8747b871637 100644 --- a/Mage.Sets/src/mage/cards/t/ThopterSpyNetwork.java +++ b/Mage.Sets/src/mage/cards/t/ThopterSpyNetwork.java @@ -53,7 +53,7 @@ public class ThopterSpyNetwork extends CardImpl { public ThopterSpyNetwork(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{U}{U}"); - // At the beginning of your upkeep, if you control an artifact, put a 1/1 colorless Thopter artifact creature token with flying onto the battlefield. + // At the beginning of your upkeep, if you control an artifact, create a 1/1 colorless Thopter artifact creature token with flying. this.addAbility(new ThopterSpyNetworkUpkeepTriggeredAbility()); // Whenever one or more artifact creatures you control deals combat damage to a player, draw a card. @@ -102,7 +102,7 @@ class ThopterSpyNetworkUpkeepTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "At the beginning of your upkeep, if you control an artifact, put a 1/1 colorless Thopter artifact creature token with flying onto the battlefield"; + return "At the beginning of your upkeep, if you control an artifact, create a 1/1 colorless Thopter artifact creature token with flying"; } } diff --git a/Mage.Sets/src/mage/cards/t/ThopterSquadron.java b/Mage.Sets/src/mage/cards/t/ThopterSquadron.java index d6bc504330b..adbd784d87f 100644 --- a/Mage.Sets/src/mage/cards/t/ThopterSquadron.java +++ b/Mage.Sets/src/mage/cards/t/ThopterSquadron.java @@ -74,7 +74,7 @@ public class ThopterSquadron extends CardImpl { // Thopter Squadron 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 Thopter Squadron: Put a 1/1 colorless Thopter artifact creature token with flying onto the battlefield. Activate this secondAbility only any time you could cast a sorcery. + // {1}, Remove a +1/+1 counter from Thopter Squadron: Create a 1/1 colorless Thopter artifact creature token with flying. Activate this secondAbility only any time you could cast a sorcery. Ability firstAbility = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ThopterColorlessToken(), 1), new GenericManaCost(1)); firstAbility.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); this.addAbility(firstAbility); diff --git a/Mage.Sets/src/mage/cards/t/ThrabenDoomsayer.java b/Mage.Sets/src/mage/cards/t/ThrabenDoomsayer.java index 1e3a9f7ddaa..7275e3f6bd4 100644 --- a/Mage.Sets/src/mage/cards/t/ThrabenDoomsayer.java +++ b/Mage.Sets/src/mage/cards/t/ThrabenDoomsayer.java @@ -57,7 +57,7 @@ public class ThrabenDoomsayer extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // {tap}: Put a 1/1 white Human creature token onto the battlefield. + // {tap}: Create a 1/1 white Human creature token. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HumanToken()), new TapSourceCost())); // Fateful hour - As long as you have 5 or less life, other creatures you control get +2/+2. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, true), diff --git a/Mage.Sets/src/mage/cards/t/ThrabenStandardBearer.java b/Mage.Sets/src/mage/cards/t/ThrabenStandardBearer.java index 35ed956d94e..4b03de45d17 100644 --- a/Mage.Sets/src/mage/cards/t/ThrabenStandardBearer.java +++ b/Mage.Sets/src/mage/cards/t/ThrabenStandardBearer.java @@ -54,7 +54,7 @@ public class ThrabenStandardBearer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // {1}{W}, {T}, Discard a card: Put a 1/1 white Human Soldier creature token onto the battlefield. + // {1}{W}, {T}, Discard a card: Create a 1/1 white Human Soldier creature token. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HumanSoldierToken()), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); diff --git a/Mage.Sets/src/mage/cards/t/Thragtusk.java b/Mage.Sets/src/mage/cards/t/Thragtusk.java index a2298495430..f91e66d83fd 100644 --- a/Mage.Sets/src/mage/cards/t/Thragtusk.java +++ b/Mage.Sets/src/mage/cards/t/Thragtusk.java @@ -56,7 +56,7 @@ public class Thragtusk extends CardImpl { // When Thragtusk enters the battlefield, you gain 5 life. this.addAbility(new EntersBattlefieldTriggeredAbility(new GainLifeEffect(5))); - // When Thragtusk leaves the battlefield, put a 3/3 green Beast creature token onto the battlefield. + // When Thragtusk leaves the battlefield, create a 3/3 green Beast creature token. this.addAbility(new LeavesBattlefieldTriggeredAbility(new CreateTokenEffect(new BeastToken()), false)); } diff --git a/Mage.Sets/src/mage/cards/t/ThroneOfEmpires.java b/Mage.Sets/src/mage/cards/t/ThroneOfEmpires.java index 63478f71dfa..8277eb47c97 100644 --- a/Mage.Sets/src/mage/cards/t/ThroneOfEmpires.java +++ b/Mage.Sets/src/mage/cards/t/ThroneOfEmpires.java @@ -52,7 +52,7 @@ public class ThroneOfEmpires extends CardImpl { public ThroneOfEmpires(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); - // {1}, {tap}: Put a 1/1 white Soldier creature token onto the battlefield. Put five of those tokens onto the battlefield instead if you control artifacts named Crown of Empires and Scepter of Empires. + // {1}, {tap}: Create a 1/1 white Soldier creature token. Create five of those tokens instead if you control artifacts named Crown of Empires and Scepter of Empires. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ThroneOfEmpiresEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); @@ -72,7 +72,7 @@ class ThroneOfEmpiresEffect extends OneShotEffect { public ThroneOfEmpiresEffect() { super(Outcome.PutCreatureInPlay); - staticText = "Put a 1/1 white Soldier creature token onto the battlefield. Put five of those tokens onto the battlefield instead if you control artifacts named Crown of Empires and Scepter of Empires"; + staticText = "Create a 1/1 white Soldier creature token. Create five of those tokens instead if you control artifacts named Crown of Empires and Scepter of Empires"; } public ThroneOfEmpiresEffect(ThroneOfEmpiresEffect effect) { diff --git a/Mage.Sets/src/mage/cards/t/Thunderheads.java b/Mage.Sets/src/mage/cards/t/Thunderheads.java index 82292c65a1c..5893fecb606 100644 --- a/Mage.Sets/src/mage/cards/t/Thunderheads.java +++ b/Mage.Sets/src/mage/cards/t/Thunderheads.java @@ -56,7 +56,7 @@ public class Thunderheads extends CardImpl { // Replicate {2}{U} this.addAbility(new ReplicateAbility(this, "{2}{U}")); - // Put a 3/3 blue Weird creature token with defender and flying onto the battlefield. Exile it at the beginning of the next end step. + // Create a 3/3 blue Weird creature token with defender and flying. Exile it at the beginning of the next end step. this.getSpellAbility().addEffect(new ThunderheadsEffect()); } @@ -74,7 +74,7 @@ class ThunderheadsEffect extends OneShotEffect { public ThunderheadsEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Put a 3/3 blue Weird creature token with defender and flying onto the battlefield. Exile it at the beginning of the next end step."; + this.staticText = "Create a 3/3 blue Weird creature token with defender and flying. Exile it at the beginning of the next end step."; } public ThunderheadsEffect(ThunderheadsEffect effect) { diff --git a/Mage.Sets/src/mage/cards/t/TidalWave.java b/Mage.Sets/src/mage/cards/t/TidalWave.java index 93004b9b8ca..e17d496d359 100644 --- a/Mage.Sets/src/mage/cards/t/TidalWave.java +++ b/Mage.Sets/src/mage/cards/t/TidalWave.java @@ -52,7 +52,7 @@ public class TidalWave extends CardImpl { public TidalWave(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{U}"); - // Put a 5/5 blue Wall creature token with defender onto the battlefield. Sacrifice it at the beginning of the next end step. + // Create a 5/5 blue Wall creature token with defender. Sacrifice it at the beginning of the next end step. this.getSpellAbility().addEffect(new TidalWaveEffect()); } @@ -70,7 +70,7 @@ class TidalWaveEffect extends OneShotEffect { public TidalWaveEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Put a 5/5 blue Wall creature token with defender onto the battlefield. Sacrifice it at the beginning of the next end step."; + this.staticText = "Create a 5/5 blue Wall creature token with defender. Sacrifice it at the beginning of the next end step."; } public TidalWaveEffect(TidalWaveEffect effect) { diff --git a/Mage.Sets/src/mage/cards/t/TimelyReinforcements.java b/Mage.Sets/src/mage/cards/t/TimelyReinforcements.java index 6f1582c76a9..e258ba5bb84 100644 --- a/Mage.Sets/src/mage/cards/t/TimelyReinforcements.java +++ b/Mage.Sets/src/mage/cards/t/TimelyReinforcements.java @@ -52,7 +52,7 @@ public class TimelyReinforcements extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{W}"); - // If you have less life than an opponent, you gain 6 life. If you control fewer creatures than an opponent, put three 1/1 white Soldier creature tokens onto the battlefield. + // If you have less life than an opponent, you gain 6 life. If you control fewer creatures than an opponent, create three 1/1 white Soldier creature tokens. this.getSpellAbility().addEffect(new TimelyReinforcementsEffect()); } @@ -70,7 +70,7 @@ class TimelyReinforcementsEffect extends OneShotEffect { public TimelyReinforcementsEffect() { super(Outcome.Benefit); - staticText = "If you have less life than an opponent, you gain 6 life. If you control fewer creatures than an opponent, put three 1/1 white Soldier creature tokens onto the battlefield"; + staticText = "If you have less life than an opponent, you gain 6 life. If you control fewer creatures than an opponent, create three 1/1 white Soldier creature tokens"; } public TimelyReinforcementsEffect(TimelyReinforcementsEffect effect) { diff --git a/Mage.Sets/src/mage/cards/t/TirelessTracker.java b/Mage.Sets/src/mage/cards/t/TirelessTracker.java index cfe42154735..bde2ae80e28 100644 --- a/Mage.Sets/src/mage/cards/t/TirelessTracker.java +++ b/Mage.Sets/src/mage/cards/t/TirelessTracker.java @@ -64,7 +64,7 @@ public class TirelessTracker extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(2); - // Whenever a land enters the battlefield under your control, investigate. (Put a colorless Clue artifact token onto the battlefield with "{2}, Sacrifice this artifact: Draw a card.") + // Whenever a land enters the battlefield under your control, investigate. (Create a colorless Clue artifact token with "{2}, Sacrifice this artifact: Draw a card.") this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new InvestigateEffect(), new FilterControlledLandPermanent("a land"), false, null, true)); // Whenever you sacrifice a Clue, put a +1/+1 counter on Tireless Tracker. diff --git a/Mage.Sets/src/mage/cards/t/TitaniaProtectorOfArgoth.java b/Mage.Sets/src/mage/cards/t/TitaniaProtectorOfArgoth.java index 9f4c6973752..99c08f33da9 100644 --- a/Mage.Sets/src/mage/cards/t/TitaniaProtectorOfArgoth.java +++ b/Mage.Sets/src/mage/cards/t/TitaniaProtectorOfArgoth.java @@ -70,7 +70,7 @@ public class TitaniaProtectorOfArgoth extends CardImpl { ability.addTarget(new TargetCardInYourGraveyard(new FilterLandCard("land card from your graveyard"))); this.addAbility(ability); - // Whenever a land you control is put into a graveyard from the battlefield, put a 5/3 green Elemental creature token onto the battlefield. + // Whenever a land you control is put into a graveyard from the battlefield, create a 5/3 green Elemental creature token. ability = new PutIntoGraveFromBattlefieldAllTriggeredAbility(new CreateTokenEffect(new TitaniaProtectorOfArgothElementalToken()), false, filter, false); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java b/Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java index 42e8c2ded88..1c2032fa86c 100644 --- a/Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java +++ b/Mage.Sets/src/mage/cards/t/TolsimirWolfblood.java @@ -54,14 +54,16 @@ public class TolsimirWolfblood extends CardImpl { private static final FilterCreaturePermanent filterGreen = new FilterCreaturePermanent("green creatures you control"); private static final FilterCreaturePermanent filterWhite = new FilterCreaturePermanent("white creatures you control"); + static { filterGreen.add(new ColorPredicate(ObjectColor.GREEN)); filterGreen.add(new ControllerPredicate(TargetController.YOU)); filterWhite.add(new ColorPredicate(ObjectColor.WHITE)); filterWhite.add(new ControllerPredicate(TargetController.YOU)); } + public TolsimirWolfblood(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{G}{W}"); this.supertype.add("Legendary"); this.subtype.add("Elf"); this.subtype.add("Warrior"); @@ -73,8 +75,8 @@ public class TolsimirWolfblood extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterGreen, true))); // Other white creatures you control get +1/+1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterWhite, true))); - // {tap}: Put a legendary 2/2 green and white Wolf creature token named Voja onto the battlefield. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new VojaToken()),new TapSourceCost())); + // {tap}: Create a legendary 2/2 green and white Wolf creature token named Voja. + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new VojaToken()), new TapSourceCost())); } public TolsimirWolfblood(final TolsimirWolfblood card) { @@ -87,8 +89,9 @@ public class TolsimirWolfblood extends CardImpl { } } -class VojaToken extends Token{ - public VojaToken(){ +class VojaToken extends Token { + + public VojaToken() { super("Voja", "legendary 2/2 green and white Wolf creature token named Voja"); this.cardType.add(CardType.CREATURE); this.supertype.add("Legendary"); @@ -99,4 +102,4 @@ class VojaToken extends Token{ this.power = new MageInt(2); this.toughness = new MageInt(2); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/t/TombOfUrami.java b/Mage.Sets/src/mage/cards/t/TombOfUrami.java index bbac18d300e..f4fb189b9b0 100644 --- a/Mage.Sets/src/mage/cards/t/TombOfUrami.java +++ b/Mage.Sets/src/mage/cards/t/TombOfUrami.java @@ -28,8 +28,6 @@ package mage.cards.t; import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -43,6 +41,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.mana.BlackManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.game.Game; @@ -56,14 +55,14 @@ import mage.game.permanent.token.Token; public class TombOfUrami extends CardImpl { public TombOfUrami(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.LAND},""); + super(ownerId, setInfo, new CardType[]{CardType.LAND}, ""); this.supertype.add("Legendary"); // {tap}: Add {B} to your mana pool. Tomb of Urami deals 1 damage to you if you don't control an Ogre. Ability ability = new BlackManaAbility(); ability.addEffect(new DamageControllerEffect(1)); this.addAbility(ability); - // {2}{B}{B}, {tap}, Sacrifice all lands you control: Put a legendary 5/5 black Demon Spirit creature token with flying named Urami onto the battlefield. + // {2}{B}{B}, {tap}, Sacrifice all lands you control: Create a legendary 5/5 black Demon Spirit creature token with flying named Urami. Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new UramiToken()), new ManaCostsImpl("{2}{B}{B}")); ability2.addCost(new TapSourceCost()); ability2.addCost(new SacrificeAllLandCost()); @@ -80,7 +79,6 @@ public class TombOfUrami extends CardImpl { } } - class SacrificeAllLandCost extends CostImpl { public SacrificeAllLandCost() { @@ -93,7 +91,7 @@ class SacrificeAllLandCost extends CostImpl { @Override public boolean pay(Ability ability, Game game, UUID sourceId, UUID controllerId, boolean noMana, Cost costToPay) { - for(Permanent permanent : game.getBattlefield().getActivePermanents(new FilterControlledLandPermanent(), ability.getControllerId(), game)){ + for (Permanent permanent : game.getBattlefield().getActivePermanents(new FilterControlledLandPermanent(), ability.getControllerId(), game)) { paid |= permanent.sacrifice(sourceId, game); } return paid; @@ -101,7 +99,7 @@ class SacrificeAllLandCost extends CostImpl { @Override public boolean canPay(Ability ability, UUID sourceId, UUID controllerId, Game game) { - for(Permanent permanent : game.getBattlefield().getActivePermanents(new FilterControlledLandPermanent(), ability.getControllerId(), game)){ + for (Permanent permanent : game.getBattlefield().getActivePermanents(new FilterControlledLandPermanent(), ability.getControllerId(), game)) { if (!game.getPlayer(controllerId).canPaySacrificeCost(permanent, sourceId, controllerId, game)) { return false; } @@ -116,7 +114,6 @@ class SacrificeAllLandCost extends CostImpl { } - class UramiToken extends Token { public UramiToken() { @@ -125,12 +122,11 @@ class UramiToken extends Token { subtype.add("Demon"); subtype.add("Spirit"); supertype.add("Legendary"); - color.setBlack(true); power = new MageInt(5); toughness = new MageInt(5); - + this.addAbility(FlyingAbility.getInstance()); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/t/TradingPost.java b/Mage.Sets/src/mage/cards/t/TradingPost.java index 35d27c0fe72..d616326dfdd 100644 --- a/Mage.Sets/src/mage/cards/t/TradingPost.java +++ b/Mage.Sets/src/mage/cards/t/TradingPost.java @@ -66,7 +66,7 @@ public class TradingPost extends CardImpl { ability1.addCost(new DiscardTargetCost(new TargetCardInHand())); this.addAbility(ability1); - // {1}, {tap}, Pay 1 life: Put a 0/1 white Goat creature token onto the battlefield. + // {1}, {tap}, Pay 1 life: Create a 0/1 white Goat creature token. Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GoatToken()), new GenericManaCost(1)); ability2.addCost(new TapSourceCost()); ability2.addCost(new PayLifeCost(1)); diff --git a/Mage.Sets/src/mage/cards/t/Transluminant.java b/Mage.Sets/src/mage/cards/t/Transluminant.java index f9c7283b163..3ecb922f6de 100644 --- a/Mage.Sets/src/mage/cards/t/Transluminant.java +++ b/Mage.Sets/src/mage/cards/t/Transluminant.java @@ -55,7 +55,7 @@ public class Transluminant extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // {W}, Sacrifice Transluminant: Put a 1/1 white Spirit creature token with flying onto the battlefield at the beginning of the next end step. + // {W}, Sacrifice Transluminant: Create a 1/1 white Spirit creature token with flying at the beginning of the next end step. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateDelayedTriggeredAbilityEffect( new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new CreateTokenEffect(new SpiritWhiteToken()))), new ManaCostsImpl("{W}")); diff --git a/Mage.Sets/src/mage/cards/t/TriplicateSpirits.java b/Mage.Sets/src/mage/cards/t/TriplicateSpirits.java index 93b22e8d87b..b4d293a485e 100644 --- a/Mage.Sets/src/mage/cards/t/TriplicateSpirits.java +++ b/Mage.Sets/src/mage/cards/t/TriplicateSpirits.java @@ -47,7 +47,7 @@ public class TriplicateSpirits extends CardImpl { // Convoke this.addAbility(new ConvokeAbility()); - // Put three 1/1 white Spirit creature tokens with flying onto the battlefield. + // Create three 1/1 white Spirit creature tokens with flying. this.getSpellAbility().addEffect(new CreateTokenEffect(new SpiritWhiteToken("M15"), 3)); } diff --git a/Mage.Sets/src/mage/cards/t/Triskelavus.java b/Mage.Sets/src/mage/cards/t/Triskelavus.java index 1da7292ca30..eecfd5f98d9 100644 --- a/Mage.Sets/src/mage/cards/t/Triskelavus.java +++ b/Mage.Sets/src/mage/cards/t/Triskelavus.java @@ -65,7 +65,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: Put a 1/1 colorless Triskelavite artifact creature token with flying onto the battlefield. 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 target creature or player." Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new TriskelaviteToken()), new GenericManaCost(1)); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); this.addAbility(ability); @@ -84,7 +84,7 @@ public class Triskelavus extends CardImpl { class TriskelaviteToken extends Token { public TriskelaviteToken() { - super("Triskelavite", "1/1 colorless Triskelavite artifact creature token with flying onto the battlefield. It has \"Sacrifice this creature: This creature deals 1 damage to target creature or player.\""); + super("Triskelavite", "1/1 colorless Triskelavite artifact creature token with flying. It has \"Sacrifice this creature: This creature deals 1 damage to target creature or player.\""); this.setOriginalExpansionSetCode("TSP"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); diff --git a/Mage.Sets/src/mage/cards/t/TrostaniSelesnyasVoice.java b/Mage.Sets/src/mage/cards/t/TrostaniSelesnyasVoice.java index 7078bbe1dba..1467b36fef5 100644 --- a/Mage.Sets/src/mage/cards/t/TrostaniSelesnyasVoice.java +++ b/Mage.Sets/src/mage/cards/t/TrostaniSelesnyasVoice.java @@ -66,7 +66,7 @@ public class TrostaniSelesnyasVoice extends CardImpl { // Whenever another creature enters the battlefield under your control, you gain life equal to that creature's toughness. this.addAbility(new TrostaniSelesnyasVoiceTriggeredAbility()); - // {1}{G}{W}, {T}: Populate. (Put a token onto the battlefield that's a copy of a creature token you control.) + // {1}{G}{W}, {T}: Populate. (Create a token that's a copy of a creature token you control.) Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PopulateEffect(), new ManaCostsImpl("{1}{G}{W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TrostanisJudgment.java b/Mage.Sets/src/mage/cards/t/TrostanisJudgment.java index a9403fedf0f..c4c9c4335a0 100644 --- a/Mage.Sets/src/mage/cards/t/TrostanisJudgment.java +++ b/Mage.Sets/src/mage/cards/t/TrostanisJudgment.java @@ -46,7 +46,7 @@ public class TrostanisJudgment extends CardImpl { // Exile target creature, then populate. - // (Put a token onto the battlefield that's a copy of a creature token you control.) + // (Create a token that's a copy of a creature token you control.) this.getSpellAbility().addEffect(new ExileTargetEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new PopulateEffect("then")); diff --git a/Mage.Sets/src/mage/cards/t/TrostanisSummoner.java b/Mage.Sets/src/mage/cards/t/TrostanisSummoner.java index a99128c34ec..1a01038f3e3 100644 --- a/Mage.Sets/src/mage/cards/t/TrostanisSummoner.java +++ b/Mage.Sets/src/mage/cards/t/TrostanisSummoner.java @@ -28,7 +28,6 @@ package mage.cards.t; import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -36,6 +35,7 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.permanent.token.CentaurToken; import mage.game.permanent.token.KnightToken; import mage.game.permanent.token.Token; @@ -47,14 +47,14 @@ import mage.game.permanent.token.Token; public class TrostanisSummoner extends CardImpl { public TrostanisSummoner(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{G}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{G}{W}"); this.subtype.add("Elf"); this.subtype.add("Shaman"); this.power = new MageInt(1); this.toughness = new MageInt(1); - // When Trostani's Summoner enters the battlefield, put a 2/2 white Knight creature token with vigilance, a 3/3 green Centaur creature token, and a 4/4 green Rhino creature token with trample onto the battlefield. + // When Trostani's Summoner enters the battlefield, create a 2/2 white Knight creature token with vigilance, a 3/3 green Centaur creature token, and a 4/4 green Rhino creature token with trample. Ability ability = new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new KnightToken())); ability.addEffect(new CreateTokenEffect(new CentaurToken())); ability.addEffect(new CreateTokenEffect(new RhinoToken())); @@ -84,4 +84,4 @@ class RhinoToken extends Token { addAbility(TrampleAbility.getInstance()); setOriginalExpansionSetCode("RTR"); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/t/TurntimberRanger.java b/Mage.Sets/src/mage/cards/t/TurntimberRanger.java index 4ac99ca6fb0..5c6a68f92f6 100644 --- a/Mage.Sets/src/mage/cards/t/TurntimberRanger.java +++ b/Mage.Sets/src/mage/cards/t/TurntimberRanger.java @@ -54,7 +54,7 @@ public class TurntimberRanger extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // Whenever Turntimber Ranger or another Ally enters the battlefield under your control, you may put a 2/2 green Wolf creature token onto the battlefield. If you do, put a +1/+1 counter on Turntimber Ranger. + // Whenever Turntimber Ranger or another Ally enters the battlefield under your control, you may create a 2/2 green Wolf creature token. If you do, put a +1/+1 counter on Turntimber Ranger. Ability ability = new AllyEntersBattlefieldTriggeredAbility(new CreateTokenEffect(new WolfToken()), true); ability.addEffect(new AddCountersSourceEffect(CounterType.P1P1.createInstance())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TwilightDrover.java b/Mage.Sets/src/mage/cards/t/TwilightDrover.java index 1d92a2c37f2..3e6b6dfd173 100644 --- a/Mage.Sets/src/mage/cards/t/TwilightDrover.java +++ b/Mage.Sets/src/mage/cards/t/TwilightDrover.java @@ -67,7 +67,7 @@ public class TwilightDrover extends CardImpl { // Whenever a creature token leaves the battlefield, put a +1/+1 counter on Twilight Drover. this.addAbility(new LeavesBattlefieldAllTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), filter)); - // {2}{W}, Remove a +1/+1 counter from Twilight Drover: Put two 1/1 white Spirit creature tokens with flying onto the battlefield. + // {2}{W}, Remove a +1/+1 counter from Twilight Drover: Create two 1/1 white Spirit creature tokens with flying. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SpiritWhiteToken("RAV"), 2), new ManaCostsImpl<>("{2}{W}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/Twinflame.java b/Mage.Sets/src/mage/cards/t/Twinflame.java index 8cdd3096b69..46cb4855962 100644 --- a/Mage.Sets/src/mage/cards/t/Twinflame.java +++ b/Mage.Sets/src/mage/cards/t/Twinflame.java @@ -59,7 +59,7 @@ public class Twinflame extends CardImpl { // Strive - Twinflame costs 2R more to cast for each target beyond the first. this.addAbility(new StriveAbility("{2}{R}")); - // Choose any number of target creatures you control. For each of them, put a token that's a copy of that creature onto the battlefield. Those tokens have haste. Exile them at the beginning of the next end step. + // Choose any number of target creatures you control. For each of them, create a token that's a copy of that creature. Those tokens have haste. Exile them at the beginning of the next end step. this.getSpellAbility().addEffect(new TwinflameCopyEffect()); this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(0, Integer.MAX_VALUE, new FilterControlledCreaturePermanent(), false)); @@ -79,7 +79,7 @@ class TwinflameCopyEffect extends OneShotEffect { public TwinflameCopyEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Choose any number of target creatures you control. For each of them, put a token that's a copy of that creature onto the battlefield. Those tokens have haste. Exile them at the beginning of the next end step"; + this.staticText = "Choose any number of target creatures you control. For each of them, create a token that's a copy of that creature. Those tokens have haste. Exile them at the beginning of the next end step"; } public TwinflameCopyEffect(final TwinflameCopyEffect effect) { diff --git a/Mage.Sets/src/mage/cards/u/UlashtTheHateSeed.java b/Mage.Sets/src/mage/cards/u/UlashtTheHateSeed.java index 40aa675167d..4aff34b85df 100644 --- a/Mage.Sets/src/mage/cards/u/UlashtTheHateSeed.java +++ b/Mage.Sets/src/mage/cards/u/UlashtTheHateSeed.java @@ -77,10 +77,10 @@ public class UlashtTheHateSeed extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new GenericManaCost(1)); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetCreaturePermanent()); - // or put a 1/1 green Saproling creature token onto the battlefield. + // or create a 1/1 green Saproling creature token. Mode mode = new Mode(); Effect effect = new CreateTokenEffect(new SaprolingToken()); - effect.setText("Put a 1/1 green Saproling creature token onto the battlefield."); + effect.setText("Create a 1/1 green Saproling creature token."); mode.getEffects().add(effect); ability.addMode(mode); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/u/UlvenwaldMysteries.java b/Mage.Sets/src/mage/cards/u/UlvenwaldMysteries.java index 270bd9925e8..f7dc392fb5b 100644 --- a/Mage.Sets/src/mage/cards/u/UlvenwaldMysteries.java +++ b/Mage.Sets/src/mage/cards/u/UlvenwaldMysteries.java @@ -66,10 +66,10 @@ public class UlvenwaldMysteries extends CardImpl { public UlvenwaldMysteries(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{G}"); - // Whenever a nontoken creature you control dies, investigate. (Put a colorless Clue artifact token onto the battlefield with "{2}, Sacrifice this artifact: Draw a card.") + // Whenever a nontoken creature you control dies, investigate. (Create a colorless Clue artifact token with "{2}, Sacrifice this artifact: Draw a card.") this.addAbility(new DiesCreatureTriggeredAbility(new InvestigateEffect(), false, filter)); - // Whenever you sacrifice a Clue, put a 1/1 white Human Soldier creature token onto the battlefield. + // Whenever you sacrifice a Clue, create a 1/1 white Human Soldier creature token. this.addAbility(new UlvenwaldMysteriesTriggeredAbility()); } diff --git a/Mage.Sets/src/mage/cards/u/UndeadAlchemist.java b/Mage.Sets/src/mage/cards/u/UndeadAlchemist.java index 0966bb5c101..c7e548b6afe 100644 --- a/Mage.Sets/src/mage/cards/u/UndeadAlchemist.java +++ b/Mage.Sets/src/mage/cards/u/UndeadAlchemist.java @@ -67,7 +67,7 @@ public class UndeadAlchemist extends CardImpl { // If a Zombie you control would deal combat damage to a player, instead that player puts that many cards from the top of his or her library into his or her graveyard. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new UndeadAlchemistEffect())); - // Whenever a creature card is put into an opponent's graveyard from his or her library, exile that card and put a 2/2 black Zombie creature token onto the battlefield. + // Whenever a creature card is put into an opponent's graveyard from his or her library, exile that card and create a 2/2 black Zombie creature token. this.addAbility(new UndeadAlchemistTriggeredAbility()); } @@ -117,7 +117,7 @@ class UndeadAlchemistTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever a creature card is put into an opponent's graveyard from his or her library, exile that card and put a 2/2 black Zombie creature token onto the battlefield."; + return "Whenever a creature card is put into an opponent's graveyard from his or her library, exile that card and create a 2/2 black Zombie creature token."; } } diff --git a/Mage.Sets/src/mage/cards/u/UndeadServant.java b/Mage.Sets/src/mage/cards/u/UndeadServant.java index 88131116c58..f81ebc483d0 100644 --- a/Mage.Sets/src/mage/cards/u/UndeadServant.java +++ b/Mage.Sets/src/mage/cards/u/UndeadServant.java @@ -57,7 +57,7 @@ public class UndeadServant extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(2); - // When Undead Servant enters the battlefield, put a 2/2 black Zombie creature token onto the battlefield for each card named Undead Servant in your graveyard. + // When Undead Servant enters the battlefield, create a 2/2 black Zombie creature token for each card named Undead Servant in your graveyard. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new ZombieToken(), new CardsInControllerGraveyardCount(filter)))); } diff --git a/Mage.Sets/src/mage/cards/u/UnifiedFront.java b/Mage.Sets/src/mage/cards/u/UnifiedFront.java index 9f22459c775..f49a8d8266a 100644 --- a/Mage.Sets/src/mage/cards/u/UnifiedFront.java +++ b/Mage.Sets/src/mage/cards/u/UnifiedFront.java @@ -46,10 +46,10 @@ public class UnifiedFront extends CardImpl { public UnifiedFront(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{W}"); - // Converge — Put a 1/1 white Kor Ally creature token onto the battlefield for each color of mana spent to cast Unified Front. + // Converge — Create a 1/1 white Kor Ally creature token for each color of mana spent to cast Unified Front. getSpellAbility().setAbilityWord(AbilityWord.CONVERGE); Effect effect = new CreateTokenEffect(new KorAllyToken(), ColorsOfManaSpentToCastCount.getInstance()); - effect.setText("Put a 1/1 white Kor Ally creature token onto the battlefield for each color of mana spent to cast {this}"); + effect.setText("Create a 1/1 white Kor Ally creature token for each color of mana spent to cast {this}"); getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/cards/u/UnscytheKillerOfKings.java b/Mage.Sets/src/mage/cards/u/UnscytheKillerOfKings.java index 824f10974fc..e0a9dd195c6 100644 --- a/Mage.Sets/src/mage/cards/u/UnscytheKillerOfKings.java +++ b/Mage.Sets/src/mage/cards/u/UnscytheKillerOfKings.java @@ -71,7 +71,7 @@ public class UnscytheKillerOfKings extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 3))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); - // Whenever a creature dealt damage by equipped creature this turn dies, you may exile that card. If you do, put a 2/2 black Zombie creature token onto the battlefield. + // Whenever a creature dealt damage by equipped creature this turn dies, you may exile that card. If you do, create a 2/2 black Zombie creature token. this.addAbility(new UnscytheKillerOfKingsTriggeredAbility(new UnscytheEffect())); // Equip {2} @@ -144,7 +144,7 @@ class UnscytheEffect extends OneShotEffect { public UnscytheEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "you may exile that card. If you do, put a 2/2 black Zombie creature token onto the battlefield"; + this.staticText = "you may exile that card. If you do, create a 2/2 black Zombie creature token"; } public UnscytheEffect(final UnscytheEffect effect) { diff --git a/Mage.Sets/src/mage/cards/u/UrbisProtector.java b/Mage.Sets/src/mage/cards/u/UrbisProtector.java index ba6c2723340..eafcbc4c32e 100644 --- a/Mage.Sets/src/mage/cards/u/UrbisProtector.java +++ b/Mage.Sets/src/mage/cards/u/UrbisProtector.java @@ -50,7 +50,7 @@ public class UrbisProtector extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // When Urbis Protector enters the battlefield, put a 4/4 white Angel creature token with flying onto the battlefield. + // When Urbis Protector enters the battlefield, create a 4/4 white Angel creature token with flying. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new AngelToken()))); } diff --git a/Mage.Sets/src/mage/cards/u/UrzasFactory.java b/Mage.Sets/src/mage/cards/u/UrzasFactory.java index 489a4988b8f..c01631722a8 100644 --- a/Mage.Sets/src/mage/cards/u/UrzasFactory.java +++ b/Mage.Sets/src/mage/cards/u/UrzasFactory.java @@ -54,7 +54,7 @@ public class UrzasFactory extends CardImpl { // {tap}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); - // {7}, {tap}: Put a 2/2 colorless Assembly-Worker artifact creature token onto the battlefield. + // {7}, {tap}: Create a 2/2 colorless Assembly-Worker artifact creature token. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new AssemblyWorkerToken()), new GenericManaCost(7)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/u/UtopiaMycon.java b/Mage.Sets/src/mage/cards/u/UtopiaMycon.java index cee81b85cdc..0b44c8aa657 100644 --- a/Mage.Sets/src/mage/cards/u/UtopiaMycon.java +++ b/Mage.Sets/src/mage/cards/u/UtopiaMycon.java @@ -70,7 +70,7 @@ public class UtopiaMycon extends CardImpl { // At the beginning of your upkeep, put a spore counter on Utopia Mycon. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()), TargetController.YOU, false)); - // Remove three spore counters from Utopia Mycon: Put a 1/1 green Saproling creature token onto the battlefield. + // Remove three spore counters from Utopia Mycon: Create a 1/1 green Saproling creature token. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); // Sacrifice a Saproling: Add one mana of any color to your mana pool. diff --git a/Mage.Sets/src/mage/cards/u/UtvaraHellkite.java b/Mage.Sets/src/mage/cards/u/UtvaraHellkite.java index e5d45855bed..86548de8edc 100644 --- a/Mage.Sets/src/mage/cards/u/UtvaraHellkite.java +++ b/Mage.Sets/src/mage/cards/u/UtvaraHellkite.java @@ -60,7 +60,7 @@ public class UtvaraHellkite extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // Whenever a Dragon you control attacks, put a 6/6 red Dragon creature token with flying onto the battlefield. + // Whenever a Dragon you control attacks, create a 6/6 red Dragon creature token with flying. this.addAbility(new AttacksCreatureYouControlTriggeredAbility(new CreateTokenEffect(new UtvaraHellkiteDragonToken()),false, filter)); } diff --git a/Mage.Sets/src/mage/cards/v/VanguardOfBrimaz.java b/Mage.Sets/src/mage/cards/v/VanguardOfBrimaz.java index 38dbd7f50da..d9cd6368c22 100644 --- a/Mage.Sets/src/mage/cards/v/VanguardOfBrimaz.java +++ b/Mage.Sets/src/mage/cards/v/VanguardOfBrimaz.java @@ -53,7 +53,7 @@ public class VanguardOfBrimaz extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); - // Heroic - Whenever you cast a spell that targets Vanguard of Brimaz, put a 1/1 white Cat Soldier creature token with vigilance onto the battlefield. + // Heroic - Whenever you cast a spell that targets Vanguard of Brimaz, create a 1/1 white Cat Soldier creature token with vigilance. this.addAbility(new HeroicAbility(new CreateTokenEffect(new CatSoldierCreatureToken()), false)); } diff --git a/Mage.Sets/src/mage/cards/v/VerdantEmbrace.java b/Mage.Sets/src/mage/cards/v/VerdantEmbrace.java index 16de07ef91d..f0fe17eddb2 100644 --- a/Mage.Sets/src/mage/cards/v/VerdantEmbrace.java +++ b/Mage.Sets/src/mage/cards/v/VerdantEmbrace.java @@ -65,11 +65,11 @@ public class VerdantEmbrace extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // Enchanted creature gets +3/+3 and has "At the beginning of each upkeep, put a 1/1 green Saproling creature token onto the battlefield." + // Enchanted creature gets +3/+3 and has "At the beginning of each upkeep, create a 1/1 green Saproling creature token." ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield)); Ability grantedAbility = new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new SaprolingToken()), TargetController.ANY, false); Effect effect = new GainAbilityAttachedEffect(grantedAbility, AttachmentType.AURA); - effect.setText("and has \"At the beginning of each upkeep, put a 1/1 green Saproling creature token onto the battlefield.\""); + effect.setText("and has \"At the beginning of each upkeep, create a 1/1 green Saproling creature token.\""); ability.addEffect(effect); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VerdantForce.java b/Mage.Sets/src/mage/cards/v/VerdantForce.java index 4eb6c02014c..9e4496c878e 100644 --- a/Mage.Sets/src/mage/cards/v/VerdantForce.java +++ b/Mage.Sets/src/mage/cards/v/VerdantForce.java @@ -50,7 +50,7 @@ public class VerdantForce extends CardImpl { this.power = new MageInt(7); this.toughness = new MageInt(7); - // At the beginning of each upkeep, put a 1/1 green Saproling creature token onto the battlefield. + // At the beginning of each upkeep, create a 1/1 green Saproling creature token. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new SaprolingToken()), TargetController.ANY, false)); } diff --git a/Mage.Sets/src/mage/cards/v/VerdelothTheAncient.java b/Mage.Sets/src/mage/cards/v/VerdelothTheAncient.java index d59edf1131a..2f2bc85cc6b 100644 --- a/Mage.Sets/src/mage/cards/v/VerdelothTheAncient.java +++ b/Mage.Sets/src/mage/cards/v/VerdelothTheAncient.java @@ -80,10 +80,10 @@ public class VerdelothTheAncient extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1,1, Duration.WhileOnBattlefield, filter, false))); - // When Verdeloth the Ancient enters the battlefield, if it was kicked, put X 1/1 green Saproling creature tokens onto the battlefield. + // When Verdeloth the Ancient enters the battlefield, if it was kicked, create X 1/1 green Saproling creature tokens. EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new SaprolingToken(), new GetKickerXValue()), false); this.addAbility(new ConditionalTriggeredAbility(ability, KickedCondition.getInstance(), - "When {this} enters the battlefield, if it was kicked, put X 1/1 green Saproling creature tokens onto the battlefield.")); + "When {this} enters the battlefield, if it was kicked, create X 1/1 green Saproling creature tokens.")); } diff --git a/Mage.Sets/src/mage/cards/v/VesselOfEphemera.java b/Mage.Sets/src/mage/cards/v/VesselOfEphemera.java index 2ba3e5be7aa..3ded3eb6371 100644 --- a/Mage.Sets/src/mage/cards/v/VesselOfEphemera.java +++ b/Mage.Sets/src/mage/cards/v/VesselOfEphemera.java @@ -49,9 +49,9 @@ public class VesselOfEphemera extends CardImpl { public VesselOfEphemera(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{W}"); - // {2}{W}, Sacrifice Vessel of Ephemera: Put two 1/1 white Spirit creature tokens with flying onto the battlefield. + // {2}{W}, Sacrifice Vessel of Ephemera: Create two 1/1 white Spirit creature tokens with flying. Effect effect = new CreateTokenEffect(new SpiritWhiteToken(), 2); - effect.setText("Put two 1/1 white Spirit creature tokens with flying onto the battlefield"); + effect.setText("Create two 1/1 white Spirit creature tokens with flying"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{2}{W}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VileRebirth.java b/Mage.Sets/src/mage/cards/v/VileRebirth.java index 6aec4c428d8..20acfcd65fe 100644 --- a/Mage.Sets/src/mage/cards/v/VileRebirth.java +++ b/Mage.Sets/src/mage/cards/v/VileRebirth.java @@ -50,7 +50,7 @@ public class VileRebirth extends CardImpl { this.getSpellAbility().addEffect(new ExileTargetEffect()); this.getSpellAbility().addTarget(new TargetCardInGraveyard(new FilterCreatureCard("creature card from a graveyard"))); - // Put a 2/2 black Zombie creature token onto the battlefield. + // Create a 2/2 black Zombie creature token. this.getSpellAbility().addEffect(new CreateTokenEffect(new ZombieToken())); } diff --git a/Mage.Sets/src/mage/cards/v/VileRedeemer.java b/Mage.Sets/src/mage/cards/v/VileRedeemer.java index a0db514fa16..3a0e39f3a85 100644 --- a/Mage.Sets/src/mage/cards/v/VileRedeemer.java +++ b/Mage.Sets/src/mage/cards/v/VileRedeemer.java @@ -67,9 +67,9 @@ public class VileRedeemer extends CardImpl { this.addAbility(new DevoidAbility(this.color)); // Flash this.addAbility(FlashAbility.getInstance()); - // When you cast Vile Redeemer, you may pay {C}. If you do put a 1/1 colorless Eldrazi Scion creature token onto the battlefield for each nontoken creature that died under your control this turn. They have "Sacrifice this creature: Add {C} to your mana pool." + // When you cast Vile Redeemer, you may pay {C}. If you do create a 1/1 colorless Eldrazi Scion creature token for each nontoken creature that died under your control this turn. They have "Sacrifice this creature: Add {C} to your mana pool." this.addAbility( - new CastSourceTriggeredAbility(new DoIfCostPaid(new VileRedeemerEffect(), new ManaCostsImpl("{C}"), "Pay {C} to put 1/1 colorless Eldrazi Scion creature tokens onto the battlefield?"), false), + new CastSourceTriggeredAbility(new DoIfCostPaid(new VileRedeemerEffect(), new ManaCostsImpl("{C}"), "Pay {C} to create 1/1 colorless Eldrazi Scion creature tokens?"), false), new VileRedeemerNonTokenCreaturesDiedWatcher()); } @@ -87,7 +87,7 @@ class VileRedeemerEffect extends OneShotEffect { public VileRedeemerEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "put a 1/1 colorless Eldrazi Scion creature token onto the battlefield for each nontoken creature that died under your control this turn. They have \"Sacrifice this creature: Add {C} to your mana pool"; + this.staticText = "create a 1/1 colorless Eldrazi Scion creature token for each nontoken creature that died under your control this turn. They have \"Sacrifice this creature: Add {C} to your mana pool"; } public VileRedeemerEffect(final VileRedeemerEffect effect) { diff --git a/Mage.Sets/src/mage/cards/v/VitalSplicer.java b/Mage.Sets/src/mage/cards/v/VitalSplicer.java index 4ffa55aa2b1..7a8fca10cf4 100644 --- a/Mage.Sets/src/mage/cards/v/VitalSplicer.java +++ b/Mage.Sets/src/mage/cards/v/VitalSplicer.java @@ -69,7 +69,7 @@ public class VitalSplicer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // When Vital Splicer enters the battlefield, put a 3/3 colorless Golem artifact creature token onto the battlefield. + // When Vital Splicer enters the battlefield, create a 3/3 colorless Golem artifact creature token. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new GolemToken(expansionSetCode)))); // {1}: Regenerate target Golem you control. diff --git a/Mage.Sets/src/mage/cards/v/VitalityCharm.java b/Mage.Sets/src/mage/cards/v/VitalityCharm.java index 19d3b03af4e..ae012247dad 100644 --- a/Mage.Sets/src/mage/cards/v/VitalityCharm.java +++ b/Mage.Sets/src/mage/cards/v/VitalityCharm.java @@ -58,9 +58,9 @@ public class VitalityCharm extends CardImpl { } public VitalityCharm(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{G}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{G}"); - // Choose one - Put a 1/1 green Insect creature token onto the battlefield + // Choose one - Create a 1/1 green Insect creature token this.getSpellAbility().addEffect(new CreateTokenEffect(new InsectToken())); // or target creature gets +1/+1 and gains trample until end of turn Mode mode = new Mode(); diff --git a/Mage.Sets/src/mage/cards/v/VitasporeThallid.java b/Mage.Sets/src/mage/cards/v/VitasporeThallid.java index 8b9c0ba73a2..74089f530b4 100644 --- a/Mage.Sets/src/mage/cards/v/VitasporeThallid.java +++ b/Mage.Sets/src/mage/cards/v/VitasporeThallid.java @@ -70,7 +70,7 @@ public class VitasporeThallid extends CardImpl { // At the beginning of your upkeep, put a spore counter on Vitaspore Thallid. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()), TargetController.YOU, false)); - // Remove three spore counters from Vitaspore Thallid: Put a 1/1 green Saproling creature token onto the battlefield. + // Remove three spore counters from Vitaspore Thallid: Create a 1/1 green Saproling creature token. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); diff --git a/Mage.Sets/src/mage/cards/v/VituGhaziGuildmage.java b/Mage.Sets/src/mage/cards/v/VituGhaziGuildmage.java index 64cf84b8674..976615a1d3a 100644 --- a/Mage.Sets/src/mage/cards/v/VituGhaziGuildmage.java +++ b/Mage.Sets/src/mage/cards/v/VituGhaziGuildmage.java @@ -54,10 +54,10 @@ public class VituGhaziGuildmage extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // {4}{G}{W}: Put a 3/3 green Centaur creature token onto the battlefield. + // {4}{G}{W}: Create a 3/3 green Centaur creature token. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new mage.game.permanent.token.CentaurToken()), new ManaCostsImpl("{4}{G}{W}"))); - // {2}{G}{W}: Populate. (Put a token onto the battlefield that's a copy of a creature token you control.) + // {2}{G}{W}: Populate. (Create a token that's a copy of a creature token you control.) this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PopulateEffect(), new ManaCostsImpl("{2}{G}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/v/VituGhaziTheCityTree.java b/Mage.Sets/src/mage/cards/v/VituGhaziTheCityTree.java index 13f42aa6565..f3bb112aad0 100644 --- a/Mage.Sets/src/mage/cards/v/VituGhaziTheCityTree.java +++ b/Mage.Sets/src/mage/cards/v/VituGhaziTheCityTree.java @@ -52,7 +52,7 @@ public class VituGhaziTheCityTree extends CardImpl { // {tap}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); - // {2}{G}{W}, {tap}: Put a 1/1 green Saproling creature token onto the battlefield. + // {2}{G}{W}, {tap}: Create a 1/1 green Saproling creature token. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl("{2}{G}{W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VoiceOfResurgence.java b/Mage.Sets/src/mage/cards/v/VoiceOfResurgence.java index d9dd3f1db0f..3e4d73c5bdf 100644 --- a/Mage.Sets/src/mage/cards/v/VoiceOfResurgence.java +++ b/Mage.Sets/src/mage/cards/v/VoiceOfResurgence.java @@ -60,7 +60,7 @@ public class VoiceOfResurgence extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // Whenever an opponent casts a spell during your turn or when Voice of Resurgence dies, put a green and white Elemental creature token onto the battlefield with "This creature's power and toughness are each equal to the number of creatures you control." + // Whenever an opponent casts a spell during your turn or when Voice of Resurgence dies, create a green and white Elemental creature token with "This creature's power and toughness are each equal to the number of creatures you control." this.addAbility(new VoiceOfResurgenceTriggeredAbility()); } @@ -112,7 +112,7 @@ class VoiceOfResurgenceTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever an opponent casts a spell during your turn or when {this} dies, put a green and white Elemental creature token onto the battlefield with \"This creature's power and toughness are each equal to the number of creatures you control."; + return "Whenever an opponent casts a spell during your turn or when {this} dies, create a green and white Elemental creature token with \"This creature's power and toughness are each equal to the number of creatures you control."; } @Override diff --git a/Mage.Sets/src/mage/cards/v/VoiceOfTheProvinces.java b/Mage.Sets/src/mage/cards/v/VoiceOfTheProvinces.java index 3a7fd3ae511..5755cc34005 100644 --- a/Mage.Sets/src/mage/cards/v/VoiceOfTheProvinces.java +++ b/Mage.Sets/src/mage/cards/v/VoiceOfTheProvinces.java @@ -51,7 +51,7 @@ public class VoiceOfTheProvinces extends CardImpl { this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - // When Voice of the Provinces enters the battlefield, put a 1/1 white Human creature token onto the battlefield. + // When Voice of the Provinces enters the battlefield, create a 1/1 white Human creature token. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new HumanToken()))); } diff --git a/Mage.Sets/src/mage/cards/v/VoiceOfTheWoods.java b/Mage.Sets/src/mage/cards/v/VoiceOfTheWoods.java index 1d9382c34e1..7dacf2433c9 100644 --- a/Mage.Sets/src/mage/cards/v/VoiceOfTheWoods.java +++ b/Mage.Sets/src/mage/cards/v/VoiceOfTheWoods.java @@ -65,7 +65,7 @@ public class VoiceOfTheWoods extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // Tap five untapped Elves you control: Put a 7/7 green Elemental creature token with trample onto the battlefield. + // Tap five untapped Elves you control: Create a 7/7 green Elemental creature token with trample. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new VoiceOfTheWoodsElementalToken()), new TapTargetCost(new TargetControlledPermanent(5,5, filter, false))); diff --git a/Mage.Sets/src/mage/cards/v/VoidAttendant.java b/Mage.Sets/src/mage/cards/v/VoidAttendant.java index fdab013e4a9..e915534a31d 100644 --- a/Mage.Sets/src/mage/cards/v/VoidAttendant.java +++ b/Mage.Sets/src/mage/cards/v/VoidAttendant.java @@ -58,9 +58,9 @@ public class VoidAttendant extends CardImpl { // Devoid this.addAbility(new DevoidAbility(this.color)); - // {1}{G}, Put a card an opponent owns from exile into that player's graveyard: Put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has "Sacrifice this creature: Add {C} to your mana pool." + // {1}{G}, Put a card an opponent owns from exile into that player's graveyard: Create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool." Effect effect = new CreateTokenEffect(new EldraziScionToken()); - effect.setText("put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has \"Sacrifice this creature: Add {C} to your mana pool.\""); + effect.setText("create a 1/1 colorless Eldrazi Scion creature token. It has \"Sacrifice this creature: Add {C} to your mana pool.\""); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{1}{G}")); ability.addCost(new ExileOpponentsCardFromExileToGraveyardCost(true)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VolrathsLaboratory.java b/Mage.Sets/src/mage/cards/v/VolrathsLaboratory.java index 37cd3583862..25405283573 100644 --- a/Mage.Sets/src/mage/cards/v/VolrathsLaboratory.java +++ b/Mage.Sets/src/mage/cards/v/VolrathsLaboratory.java @@ -63,7 +63,7 @@ public class VolrathsLaboratory extends CardImpl { ability.addEffect(effect); this.addAbility(ability); - // {5}, {T}: Put a 2/2 creature token of the chosen color and type onto the battlefield. + // {5}, {T}: Create a 2/2 creature token of the chosen color and type. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VolrathsLaboratoryEffect(), new GenericManaCost(5)); ability.addCost(new TapSourceCost()); this.addAbility(ability); @@ -83,7 +83,7 @@ class VolrathsLaboratoryEffect extends OneShotEffect { VolrathsLaboratoryEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Put a 2/2 creature token of the chosen color and type onto the battlefield"; + this.staticText = "Create a 2/2 creature token of the chosen color and type"; } VolrathsLaboratoryEffect(final VolrathsLaboratoryEffect effect) { diff --git a/Mage.Sets/src/mage/cards/v/VraskaTheUnseen.java b/Mage.Sets/src/mage/cards/v/VraskaTheUnseen.java index 967cb301e9a..b46c395b86a 100644 --- a/Mage.Sets/src/mage/cards/v/VraskaTheUnseen.java +++ b/Mage.Sets/src/mage/cards/v/VraskaTheUnseen.java @@ -83,7 +83,7 @@ public class VraskaTheUnseen extends CardImpl { ability.addTarget(new TargetNonlandPermanent()); this.addAbility(ability); - // -7: Put three 1/1 black Assassin creature tokens onto the battlefield with "Whenever this creature deals combat damage to a player, that player loses the game." + // -7: Create three 1/1 black Assassin creature tokens with "Whenever this creature deals combat damage to a player, that player loses the game." this.addAbility(new LoyaltyAbility(new CreateTokenEffect(new AssassinToken(), 3), -7)); } diff --git a/Mage.Sets/src/mage/cards/w/WaitingInTheWeeds.java b/Mage.Sets/src/mage/cards/w/WaitingInTheWeeds.java index 972d11661f4..f77aadb096f 100644 --- a/Mage.Sets/src/mage/cards/w/WaitingInTheWeeds.java +++ b/Mage.Sets/src/mage/cards/w/WaitingInTheWeeds.java @@ -53,7 +53,7 @@ public class WaitingInTheWeeds extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{G}{G}"); - // Each player puts a 1/1 green Cat creature token onto the battlefield for each untapped Forest he or she controls. + // Each player creates a 1/1 green Cat creature token for each untapped Forest he or she controls. this.getSpellAbility().addEffect(new WaitingInTheWeedsEffect()); } @@ -78,7 +78,7 @@ class WaitingInTheWeedsEffect extends OneShotEffect { public WaitingInTheWeedsEffect() { super(Outcome.PutCreatureInPlay); - staticText = "Each player puts a 1/1 green Cat creature token onto the battlefield for each untapped Forest he or she controls"; + staticText = "Each player creates a 1/1 green Cat creature token for each untapped Forest he or she controls"; } public WaitingInTheWeedsEffect(final WaitingInTheWeedsEffect effect) { diff --git a/Mage.Sets/src/mage/cards/w/Wakedancer.java b/Mage.Sets/src/mage/cards/w/Wakedancer.java index 454d57022e3..84010534072 100644 --- a/Mage.Sets/src/mage/cards/w/Wakedancer.java +++ b/Mage.Sets/src/mage/cards/w/Wakedancer.java @@ -45,7 +45,7 @@ import mage.game.permanent.token.ZombieToken; */ public class Wakedancer extends CardImpl { - private static final String staticText = "Morbid - When {this} enters the battlefield, if a creature died this turn, put a 2/2 black Zombie creature token onto the battlefield."; + private static final String staticText = "Morbid - When {this} enters the battlefield, if a creature died this turn, create a 2/2 black Zombie creature token."; public Wakedancer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}"); @@ -56,7 +56,7 @@ public class Wakedancer extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // Morbid - When Wakedancer enters the battlefield, if a creature died this turn, put a 2/2 black Zombie creature token onto the battlefield. + // Morbid - When Wakedancer enters the battlefield, if a creature died this turn, create a 2/2 black Zombie creature token. TriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new ZombieToken())); this.addAbility(new ConditionalTriggeredAbility(ability, MorbidCondition.getInstance(), staticText)); } diff --git a/Mage.Sets/src/mage/cards/w/WalkerOfTheGrove.java b/Mage.Sets/src/mage/cards/w/WalkerOfTheGrove.java index e2c4bfbbbbd..2d9c514056e 100644 --- a/Mage.Sets/src/mage/cards/w/WalkerOfTheGrove.java +++ b/Mage.Sets/src/mage/cards/w/WalkerOfTheGrove.java @@ -50,7 +50,7 @@ public class WalkerOfTheGrove extends CardImpl { this.power = new MageInt(7); this.toughness = new MageInt(7); - // When Walker of the Grove leaves the battlefield, put a 4/4 green Elemental creature token onto the battlefield. + // When Walker of the Grove leaves the battlefield, create a 4/4 green Elemental creature token. this.addAbility(new LeavesBattlefieldTriggeredAbility(new CreateTokenEffect(new WalkerOfTheGroveToken(),1),false)); // Evoke {4}{G} this.addAbility(new EvokeAbility(this, "{4}{G}")); diff --git a/Mage.Sets/src/mage/cards/w/WallOfKelp.java b/Mage.Sets/src/mage/cards/w/WallOfKelp.java index d9222a1720e..8bfe49ae572 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfKelp.java +++ b/Mage.Sets/src/mage/cards/w/WallOfKelp.java @@ -48,7 +48,7 @@ import mage.game.permanent.token.Token; public class WallOfKelp extends CardImpl { public WallOfKelp(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{U}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{U}{U}"); this.subtype.add("Plant"); this.subtype.add("Wall"); this.power = new MageInt(0); @@ -56,8 +56,8 @@ public class WallOfKelp extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); - - // {U}{U}, {tap}: Put a 0/1 blue Plant Wall creature token with defender named Kelp onto the battlefield. + + // {U}{U}, {tap}: Create a 0/1 blue Plant Wall creature token with defender named Kelp. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new KelpToken()), new ManaCostsImpl("{U}{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); @@ -87,4 +87,4 @@ class KelpToken extends Token { this.addAbility(DefenderAbility.getInstance()); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/w/WarbreakTrumpeter.java b/Mage.Sets/src/mage/cards/w/WarbreakTrumpeter.java index 413d103b47c..239c31af471 100644 --- a/Mage.Sets/src/mage/cards/w/WarbreakTrumpeter.java +++ b/Mage.Sets/src/mage/cards/w/WarbreakTrumpeter.java @@ -55,7 +55,7 @@ public class WarbreakTrumpeter extends CardImpl { // Morph {X}{X}{R} this.addAbility(new MorphAbility(this, new ManaCostsImpl("{X}{X}{R}"))); - // When Warbreak Trumpeter is turned face up, put X 1/1 red Goblin creature tokens onto the battlefield. + // When Warbreak Trumpeter is turned face up, create X 1/1 red Goblin creature tokens. DynamicValue morphX = new MorphManacostVariableValue(); this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new CreateTokenEffect(new GoblinToken(), morphX))); } diff --git a/Mage.Sets/src/mage/cards/w/WarpingWail.java b/Mage.Sets/src/mage/cards/w/WarpingWail.java index 2ae98bf9da9..b4f5f30064b 100644 --- a/Mage.Sets/src/mage/cards/w/WarpingWail.java +++ b/Mage.Sets/src/mage/cards/w/WarpingWail.java @@ -79,10 +79,10 @@ public class WarpingWail extends CardImpl { mode.getTargets().add(new TargetSpell(filterSorcery)); this.getSpellAbility().addMode(mode); - // Put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has "Sacrifice this creature: Add {C} to your mana pool." + // Create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool." mode = new Mode(); effect = new CreateTokenEffect(new EldraziScionToken()); - effect.setText("Put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has \"Sacrifice this creature: Add {C} to your mana pool.\""); + effect.setText("Create a 1/1 colorless Eldrazi Scion creature token. It has \"Sacrifice this creature: Add {C} to your mana pool.\""); mode.getEffects().add(effect); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/w/WarrenWeirding.java b/Mage.Sets/src/mage/cards/w/WarrenWeirding.java index 9a75c47f6b4..87b24a6c332 100644 --- a/Mage.Sets/src/mage/cards/w/WarrenWeirding.java +++ b/Mage.Sets/src/mage/cards/w/WarrenWeirding.java @@ -65,7 +65,7 @@ public class WarrenWeirding extends CardImpl { this.subtype.add("Goblin"); - // Target player sacrifices a creature. If a Goblin is sacrificed this way, that player puts two 1/1 black Goblin Rogue creature tokens onto the battlefield, and those tokens gain haste until end of turn. + // Target player sacrifices a creature. If a Goblin is sacrificed this way, that player creates two 1/1 black Goblin Rogue creature tokens, and those tokens gain haste until end of turn. this.getSpellAbility().addEffect(new WarrenWeirdingEffect()); this.getSpellAbility().addTarget(new TargetPlayer()); } @@ -90,7 +90,7 @@ class WarrenWeirdingEffect extends OneShotEffect { WarrenWeirdingEffect ( ) { super(Outcome.Sacrifice); - staticText = "Target player sacrifices a creature. If a Goblin is sacrificed this way, that player puts two 1/1 black Goblin Rogue creature tokens onto the battlefield, and those tokens gain haste until end of turn"; + staticText = "Target player sacrifices a creature. If a Goblin is sacrificed this way, that player creates two 1/1 black Goblin Rogue creature tokens, and those tokens gain haste until end of turn"; } WarrenWeirdingEffect ( WarrenWeirdingEffect effect ) { diff --git a/Mage.Sets/src/mage/cards/w/WasteNot.java b/Mage.Sets/src/mage/cards/w/WasteNot.java index 51d67e3649e..9b9b1b2e61b 100644 --- a/Mage.Sets/src/mage/cards/w/WasteNot.java +++ b/Mage.Sets/src/mage/cards/w/WasteNot.java @@ -52,7 +52,7 @@ public class WasteNot extends CardImpl { public WasteNot(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{B}"); - // Whenever an opponent discards a creature card, put a 2/2 black Zombie creature token onto the battlefield. + // Whenever an opponent discards a creature card, create a 2/2 black Zombie creature token. this.addAbility(new WasteNotCreatureTriggeredAbility()); // Whenever an opponent discards a land card, add {B}{B} to your mana pool. @@ -105,7 +105,7 @@ class WasteNotCreatureTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever an opponent discards a creature card, put a 2/2 black Zombie creature token onto the battlefield."; + return "Whenever an opponent discards a creature card, create a 2/2 black Zombie creature token."; } } diff --git a/Mage.Sets/src/mage/cards/w/WayfaringTemple.java b/Mage.Sets/src/mage/cards/w/WayfaringTemple.java index 4337a2e0a71..bf88fa801fc 100644 --- a/Mage.Sets/src/mage/cards/w/WayfaringTemple.java +++ b/Mage.Sets/src/mage/cards/w/WayfaringTemple.java @@ -58,7 +58,7 @@ public class WayfaringTemple extends CardImpl { // Wayfaring Temple's power and toughness are each equal to the number of creatures you control. this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent()), Duration.EndOfGame))); - // Whenever Wayfaring Temple deals combat damage to a player, populate. (Put a token onto the battlefield that's a copy of a creature token you control.) + // Whenever Wayfaring Temple deals combat damage to a player, populate. (Create a token that's a copy of a creature token you control.) this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new PopulateEffect(), false)); } diff --git a/Mage.Sets/src/mage/cards/w/WestvaleAbbey.java b/Mage.Sets/src/mage/cards/w/WestvaleAbbey.java index 738837effcd..ff328782b11 100644 --- a/Mage.Sets/src/mage/cards/w/WestvaleAbbey.java +++ b/Mage.Sets/src/mage/cards/w/WestvaleAbbey.java @@ -64,7 +64,7 @@ public class WestvaleAbbey extends CardImpl { // {T}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); - // {5}, {T}, Pay 1 life: Put a 1/1 white and black Human Cleric creature token onto the battlefield. + // {5}, {T}, Pay 1 life: Create a 1/1 white and black Human Cleric creature token. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HumanClericToken()), new GenericManaCost(5)); ability.addCost(new TapSourceCost()); ability.addCost(new PayLifeCost(1)); diff --git a/Mage.Sets/src/mage/cards/w/WestvaleCultLeader.java b/Mage.Sets/src/mage/cards/w/WestvaleCultLeader.java index 188a8110177..9ca85c6f3f7 100644 --- a/Mage.Sets/src/mage/cards/w/WestvaleCultLeader.java +++ b/Mage.Sets/src/mage/cards/w/WestvaleCultLeader.java @@ -64,7 +64,7 @@ public class WestvaleCultLeader extends CardImpl { // Westvale Cult Leader's power and toughness are each equal to the number of creatures you control. this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Duration.EndOfGame))); - // At the beginning of your end step, put a 1/1 white and black Human Cleric creature token onto the battlefield. + // At the beginning of your end step, create a 1/1 white and black Human Cleric creature token. this.addAbility(new BeginningOfEndStepTriggeredAbility(new CreateTokenEffect(new HumanClericToken()), TargetController.YOU, false)); } diff --git a/Mage.Sets/src/mage/cards/w/WharfInfiltrator.java b/Mage.Sets/src/mage/cards/w/WharfInfiltrator.java index 5bf62a06d90..954cb405ad0 100644 --- a/Mage.Sets/src/mage/cards/w/WharfInfiltrator.java +++ b/Mage.Sets/src/mage/cards/w/WharfInfiltrator.java @@ -69,9 +69,9 @@ public class WharfInfiltrator extends CardImpl { effect.setText("you may draw a card. If you do, discard a card"); this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(effect, true)); - // Whenever you discard a creature card, you may pay {2}. If you do, put a 3/2 colorless Eldrazi Horror creature token onto the battlefield. + // Whenever you discard a creature card, you may pay {2}. If you do, create a 3/2 colorless Eldrazi Horror creature token. effect = new CreateTokenEffect(new EldraziHorrorToken()); - effect.setText("put a 3/2 colorless Eldrazi Horror creature token onto the battlefield"); + effect.setText("create a 3/2 colorless Eldrazi Horror creature token"); DoIfCostPaid doIfCostPaid = new DoIfCostPaid(effect, new GenericManaCost(2)); this.addAbility(new WharfInfiltratorDiscardAbility(doIfCostPaid)); } diff --git a/Mage.Sets/src/mage/cards/w/WhirlerRogue.java b/Mage.Sets/src/mage/cards/w/WhirlerRogue.java index 3fa9a8238c8..114f8560b2b 100644 --- a/Mage.Sets/src/mage/cards/w/WhirlerRogue.java +++ b/Mage.Sets/src/mage/cards/w/WhirlerRogue.java @@ -66,9 +66,9 @@ public class WhirlerRogue extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // When Whirler Rogue enters the battlefield, put two 1/1 colorless Thopter artifact creature tokens with flying onto the battlefield. + // When Whirler Rogue enters the battlefield, create two 1/1 colorless Thopter artifact creature tokens with flying. Effect effect = new CreateTokenEffect(new ThopterColorlessToken(), 2); - effect.setText("put two 1/1 colorless Thopter artifact creature tokens with flying onto the battlefield"); + effect.setText("create two 1/1 colorless Thopter artifact creature tokens with flying"); this.addAbility(new EntersBattlefieldTriggeredAbility(effect)); // Tap two untapped artifacts you control: Target creature can't be blocked this turn. diff --git a/Mage.Sets/src/mage/cards/w/WhiteSunsZenith.java b/Mage.Sets/src/mage/cards/w/WhiteSunsZenith.java index 6bb3c1e0e4d..390d226b9e6 100644 --- a/Mage.Sets/src/mage/cards/w/WhiteSunsZenith.java +++ b/Mage.Sets/src/mage/cards/w/WhiteSunsZenith.java @@ -45,7 +45,7 @@ public class WhiteSunsZenith extends CardImpl { public WhiteSunsZenith (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{X}{W}{W}{W}"); - // Put X 2/2 white Cat creature tokens onto the battlefield. Shuffle White Sun's Zenith into its owner's library. + // create X 2/2 white Cat creature tokens. Shuffle White Sun's Zenith into its owner's library. this.getSpellAbility().addEffect(new CreateTokenEffect(new CatToken(), new ManacostVariableValue())); this.getSpellAbility().addEffect(ShuffleSpellEffect.getInstance()); } diff --git a/Mage.Sets/src/mage/cards/w/WingSplicer.java b/Mage.Sets/src/mage/cards/w/WingSplicer.java index d61077796fb..0f88bdb8d10 100644 --- a/Mage.Sets/src/mage/cards/w/WingSplicer.java +++ b/Mage.Sets/src/mage/cards/w/WingSplicer.java @@ -65,7 +65,7 @@ public class WingSplicer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // When Wing Splicer enters the battlefield, put a 3/3 colorless Golem artifact creature token onto the battlefield. + // When Wing Splicer enters the battlefield, create a 3/3 colorless Golem artifact creature token. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new GolemToken(expansionSetCode)))); // Golem creatures you control have flying. diff --git a/Mage.Sets/src/mage/cards/w/WingmateRoc.java b/Mage.Sets/src/mage/cards/w/WingmateRoc.java index 12bf5de6417..cec09f556fa 100644 --- a/Mage.Sets/src/mage/cards/w/WingmateRoc.java +++ b/Mage.Sets/src/mage/cards/w/WingmateRoc.java @@ -60,9 +60,9 @@ public class WingmateRoc extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // Raid - When Wingmate Roc enters the battlefield, if you attacked with a creature this turn, put a 3/4 white Bird creature token with flying onto the battlefield. + // Raid - When Wingmate Roc enters the battlefield, if you attacked with a creature this turn, create a 3/4 white Bird creature token with flying. this.addAbility(new ConditionalTriggeredAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new WingmateRocToken())), RaidCondition.getInstance(), - "Raid - When {this} enters the battlefield, if you attacked with a creature this turn, put a 3/4 white Bird creature token with flying onto the battlefield."), + "Raid - When {this} enters the battlefield, if you attacked with a creature this turn, create a 3/4 white Bird creature token with flying."), new PlayerAttackedWatcher()); // Whenever Wingmate Roc attacks, you gain 1 life for each attacking creature. diff --git a/Mage.Sets/src/mage/cards/w/WireflyHive.java b/Mage.Sets/src/mage/cards/w/WireflyHive.java index dc3f1ad5ca4..46539044fb0 100644 --- a/Mage.Sets/src/mage/cards/w/WireflyHive.java +++ b/Mage.Sets/src/mage/cards/w/WireflyHive.java @@ -51,7 +51,7 @@ public class WireflyHive extends CardImpl { public WireflyHive(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); - // {3}, {tap}: Flip a coin. If you win the flip, put a 2/2 colorless Insect artifact creature token with flying named Wirefly onto the battlefield. + // {3}, {tap}: Flip a coin. If you win the flip, create a 2/2 colorless Insect artifact creature token with flying named Wirefly. // If you lose the flip, destroy all permanents named Wirefly. FilterPermanent filter = new FilterPermanent("permanents named Wirefly"); filter.add(new NamePredicate("Wirefly")); diff --git a/Mage.Sets/src/mage/cards/w/WirewoodHivemaster.java b/Mage.Sets/src/mage/cards/w/WirewoodHivemaster.java index d7bd1ff0394..1b279352080 100644 --- a/Mage.Sets/src/mage/cards/w/WirewoodHivemaster.java +++ b/Mage.Sets/src/mage/cards/w/WirewoodHivemaster.java @@ -61,7 +61,7 @@ public class WirewoodHivemaster extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // Whenever another nontoken Elf enters the battlefield, you may put a 1/1 green Insect creature token onto the battlefield. + // Whenever another nontoken Elf enters the battlefield, you may create a 1/1 green Insect creature token. this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new InsectToken(), 1), filter, true)); } diff --git a/Mage.Sets/src/mage/cards/w/WolfSkullShaman.java b/Mage.Sets/src/mage/cards/w/WolfSkullShaman.java index 5e75292d1b9..4bb0801af52 100644 --- a/Mage.Sets/src/mage/cards/w/WolfSkullShaman.java +++ b/Mage.Sets/src/mage/cards/w/WolfSkullShaman.java @@ -50,7 +50,7 @@ public class WolfSkullShaman extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // Kinship - At the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Wolf-Skull Shaman, you may reveal it. If you do, put a 2/2 green Wolf creature token onto the battlefield. + // Kinship - At the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Wolf-Skull Shaman, you may reveal it. If you do, create a 2/2 green Wolf creature token. this.addAbility(new KinshipAbility(new CreateTokenEffect(new WolfToken("LRW")))); } diff --git a/Mage.Sets/src/mage/cards/w/WolfbriarElemental.java b/Mage.Sets/src/mage/cards/w/WolfbriarElemental.java index 15c5fd21df2..50ae9da8dd4 100644 --- a/Mage.Sets/src/mage/cards/w/WolfbriarElemental.java +++ b/Mage.Sets/src/mage/cards/w/WolfbriarElemental.java @@ -55,7 +55,7 @@ public class WolfbriarElemental extends CardImpl { // Multikicker (You may pay an additional {G} any number of times as you cast this spell.) this.addAbility(new MultikickerAbility("{G}")); - // When Wolfbriar Elemental enters the battlefield, put a 2/2 green Wolf creature token onto the battlefield for each time it was kicked. + // When Wolfbriar Elemental enters the battlefield, create a 2/2 green Wolf creature token for each time it was kicked. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new WolfToken(), new MultikickerCount()))); } diff --git a/Mage.Sets/src/mage/cards/w/WolfcallersHowl.java b/Mage.Sets/src/mage/cards/w/WolfcallersHowl.java index 89eb09f0369..84acdf3a4d7 100644 --- a/Mage.Sets/src/mage/cards/w/WolfcallersHowl.java +++ b/Mage.Sets/src/mage/cards/w/WolfcallersHowl.java @@ -52,7 +52,7 @@ public class WolfcallersHowl extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{G}"); - // At the beginning of your upkeep, put X 2/2 green Wolf creature tokens onto the battlefield, where X is the number of your opponents with four or more cards in hand. + // At the beginning of your upkeep, create X 2/2 green Wolf creature tokens, where X is the number of your opponents with four or more cards in hand. this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new WolfcallersHowlEffect(), TargetController.YOU, false)); } @@ -70,7 +70,7 @@ class WolfcallersHowlEffect extends OneShotEffect { public WolfcallersHowlEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "put X 2/2 green Wolf creature tokens onto the battlefield, where X is the number of your opponents with four or more cards in hand"; + this.staticText = "create X 2/2 green Wolf creature tokens, where X is the number of your opponents with four or more cards in hand"; } public WolfcallersHowlEffect(final WolfcallersHowlEffect effect) { diff --git a/Mage.Sets/src/mage/cards/w/WolfkinBond.java b/Mage.Sets/src/mage/cards/w/WolfkinBond.java index 03d9d4f8f68..29202496a21 100644 --- a/Mage.Sets/src/mage/cards/w/WolfkinBond.java +++ b/Mage.Sets/src/mage/cards/w/WolfkinBond.java @@ -62,7 +62,7 @@ public class WolfkinBond extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - // When Wolfkin Bond enters the battlefield, put a 2/2 green Wolf creature token onto the battlefield. + // When Wolfkin Bond enters the battlefield, create a 2/2 green Wolf creature token. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new WolfToken()))); // Enchanted creature gets +2/+2. diff --git a/Mage.Sets/src/mage/cards/w/WorldspineWurm.java b/Mage.Sets/src/mage/cards/w/WorldspineWurm.java index deb33202c50..bb7ed369467 100644 --- a/Mage.Sets/src/mage/cards/w/WorldspineWurm.java +++ b/Mage.Sets/src/mage/cards/w/WorldspineWurm.java @@ -55,7 +55,7 @@ public class WorldspineWurm extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); - // When Worldspine Wurm dies, put three 5/5 green Wurm creature tokens with trample onto the battlefield. + // When Worldspine Wurm dies, create three 5/5 green Wurm creature tokens with trample. this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new WurmToken2(), 3))); // When Worldspine Wurm is put into a graveyard from anywhere, shuffle it into its owner's library. diff --git a/Mage.Sets/src/mage/cards/w/WormHarvest.java b/Mage.Sets/src/mage/cards/w/WormHarvest.java index 1ae136ff03b..611c2972a6e 100644 --- a/Mage.Sets/src/mage/cards/w/WormHarvest.java +++ b/Mage.Sets/src/mage/cards/w/WormHarvest.java @@ -47,7 +47,7 @@ public class WormHarvest extends CardImpl { public WormHarvest(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{B/G}{B/G}{B/G}"); - // Put a 1/1 black and green Worm creature token onto the battlefield for each land card in your graveyard. + // Create a 1/1 black and green Worm creature token for each land card in your graveyard. CardsInControllerGraveyardCount value = new CardsInControllerGraveyardCount(new FilterLandCard()); this.getSpellAbility().addEffect(new CreateTokenEffect(new WormHarvestToken(), value)); diff --git a/Mage.Sets/src/mage/cards/w/WortTheRaidmother.java b/Mage.Sets/src/mage/cards/w/WortTheRaidmother.java index 72e78fd1c9a..64ffa7ef8b4 100644 --- a/Mage.Sets/src/mage/cards/w/WortTheRaidmother.java +++ b/Mage.Sets/src/mage/cards/w/WortTheRaidmother.java @@ -66,7 +66,7 @@ public class WortTheRaidmother extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - // When Wort, the Raidmother enters the battlefield, put two 1/1 red and green Goblin Warrior creature tokens onto the battlefield. + // When Wort, the Raidmother enters the battlefield, create two 1/1 red and green Goblin Warrior creature tokens. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new WortTheRaidmotherToken(), 2), false)); // Each red or green instant or sorcery spell you cast has conspire. diff --git a/Mage.Sets/src/mage/cards/w/WrensRunPackmaster.java b/Mage.Sets/src/mage/cards/w/WrensRunPackmaster.java index 4f5d1eb74c3..3d75f732fe4 100644 --- a/Mage.Sets/src/mage/cards/w/WrensRunPackmaster.java +++ b/Mage.Sets/src/mage/cards/w/WrensRunPackmaster.java @@ -71,7 +71,7 @@ public class WrensRunPackmaster extends CardImpl { // Champion an Elf this.addAbility(new ChampionAbility(this, "Elf", false)); - // {2}{G}: Put a 2/2 green Wolf creature token onto the battlefield. + // {2}{G}: Create a 2/2 green Wolf creature token. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new WolfToken("LRW")), new ManaCostsImpl<>("{2}{G}"))); // Each Wolf you control has deathtouch. diff --git a/Mage.Sets/src/mage/cards/w/Wurmcalling.java b/Mage.Sets/src/mage/cards/w/Wurmcalling.java index 9fc8ae43665..4f0aefd8ab4 100644 --- a/Mage.Sets/src/mage/cards/w/Wurmcalling.java +++ b/Mage.Sets/src/mage/cards/w/Wurmcalling.java @@ -50,7 +50,7 @@ public class Wurmcalling extends CardImpl { // Buyback {2}{G} this.addAbility(new BuybackAbility("{2}{G}")); - // Put an X/X green Wurm creature token onto the battlefield. + // Create an X/X green Wurm creature token. this.getSpellAbility().addEffect(new WurmcallingEffect()); } @@ -68,7 +68,7 @@ class WurmcallingEffect extends OneShotEffect { public WurmcallingEffect() { super(Outcome.PutCreatureInPlay); - staticText = "Put an X/X green Wurm creature token onto the battlefield"; + staticText = "Create an X/X green Wurm creature token"; } public WurmcallingEffect(WurmcallingEffect ability) { diff --git a/Mage.Sets/src/mage/cards/w/WurmcoilEngine.java b/Mage.Sets/src/mage/cards/w/WurmcoilEngine.java index 6b11c389307..f0741275f0a 100644 --- a/Mage.Sets/src/mage/cards/w/WurmcoilEngine.java +++ b/Mage.Sets/src/mage/cards/w/WurmcoilEngine.java @@ -25,10 +25,9 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ - package mage.cards.w; -import mage.constants.CardType; +import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -37,18 +36,17 @@ import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.game.permanent.token.Token; -import java.util.UUID; - /** * * @author Loki */ public class WurmcoilEngine extends CardImpl { - public WurmcoilEngine (UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{6}"); + public WurmcoilEngine(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{6}"); this.subtype.add("Wurm"); this.power = new MageInt(6); this.toughness = new MageInt(6); @@ -56,14 +54,14 @@ public class WurmcoilEngine extends CardImpl { // Deathtouch, lifelink this.addAbility(DeathtouchAbility.getInstance()); this.addAbility(LifelinkAbility.getInstance()); - - // When Wurmcoil Engine dies, put a 3/3 colorless Wurm artifact creature token with deathtouch and a 3/3 colorless Wurm artifact creature token with lifelink onto the battlefield. + + // When Wurmcoil Engine dies, create a 3/3 colorless Wurm artifact creature token with deathtouch and a 3/3 colorless Wurm artifact creature token with lifelink. Ability ability = new DiesTriggeredAbility(new CreateTokenEffect(new Wurm1Token(expansionSetCode)), false); ability.addEffect(new CreateTokenEffect(new Wurm2Token(expansionSetCode))); this.addAbility(ability); } - public WurmcoilEngine (final WurmcoilEngine card) { + public WurmcoilEngine(final WurmcoilEngine card) { super(card); } @@ -75,6 +73,7 @@ public class WurmcoilEngine extends CardImpl { } class Wurm1Token extends Token { + public Wurm1Token(String setCode) { super("Wurm", "a 3/3 colorless Wurm artifact creature token with deathtouch"); setOriginalExpansionSetCode(setCode); @@ -88,6 +87,7 @@ class Wurm1Token extends Token { } class Wurm2Token extends Token { + public Wurm2Token(String setCode) { super("Wurm", "a 3/3 colorless Wurm artifact creature token with lifelink"); setOriginalExpansionSetCode(setCode); @@ -100,4 +100,4 @@ class Wurm2Token extends Token { setTokenType(2); // for image } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/x/XathridNecromancer.java b/Mage.Sets/src/mage/cards/x/XathridNecromancer.java index b721e0a913c..dcc3bc50e98 100644 --- a/Mage.Sets/src/mage/cards/x/XathridNecromancer.java +++ b/Mage.Sets/src/mage/cards/x/XathridNecromancer.java @@ -63,7 +63,7 @@ public class XathridNecromancer extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // Whenever Xathrid Necromancer or another Human creature you control dies, put a 2/2 black Zombie creature token onto the battlefield tapped. + // Whenever Xathrid Necromancer or another Human creature you control dies, create a 2/2 black Zombie creature token tapped. Effect effect = new CreateTokenEffect(new ZombieToken(), 1, true, false); Ability ability = new DiesThisOrAnotherCreatureTriggeredAbility(effect, false, filter); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/x/XenagosTheReveler.java b/Mage.Sets/src/mage/cards/x/XenagosTheReveler.java index ee0f03eebad..bf5f0f5422e 100644 --- a/Mage.Sets/src/mage/cards/x/XenagosTheReveler.java +++ b/Mage.Sets/src/mage/cards/x/XenagosTheReveler.java @@ -71,7 +71,7 @@ public class XenagosTheReveler extends CardImpl { // +1: Add X mana in any combination of {R} and/or {G} to your mana pool, where X is the number of creatures you control. this.addAbility(new LoyaltyAbility(new XenagosManaEffect(), +1)); - // 0: Put a 2/2 red and green Satyr creature token with haste onto the battlefield. + // 0: Create a 2/2 red and green Satyr creature token with haste. this.addAbility(new LoyaltyAbility(new CreateTokenEffect(new XenagosSatyrToken()), 0)); // -6: Exile the top seven cards of your library. You may put any number of creature and/or land cards from among them onto the battlefield. diff --git a/Mage.Sets/src/mage/cards/y/YoungPyromancer.java b/Mage.Sets/src/mage/cards/y/YoungPyromancer.java index ca6548ba0be..4deb4fbdd61 100644 --- a/Mage.Sets/src/mage/cards/y/YoungPyromancer.java +++ b/Mage.Sets/src/mage/cards/y/YoungPyromancer.java @@ -62,7 +62,7 @@ public class YoungPyromancer extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - // Whenever you cast an instant or sorcery spell, put a 1/1 red Elemental creature token onto the battlefield. + // Whenever you cast an instant or sorcery spell, create a 1/1 red Elemental creature token. this.addAbility(new SpellCastControllerTriggeredAbility(new CreateTokenEffect(new ElementalToken()), filter, false)); } diff --git a/Mage.Sets/src/mage/cards/z/ZektarShrineExpedition.java b/Mage.Sets/src/mage/cards/z/ZektarShrineExpedition.java index e6f2f6e92ff..acfeaa1a7b1 100644 --- a/Mage.Sets/src/mage/cards/z/ZektarShrineExpedition.java +++ b/Mage.Sets/src/mage/cards/z/ZektarShrineExpedition.java @@ -62,7 +62,7 @@ public class ZektarShrineExpedition extends CardImpl { // Landfall - Whenever a land enters the battlefield under your control, you may put a quest counter on Zektar Shrine Expedition. this.addAbility(new LandfallAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.QUEST.createInstance()), true)); - // Remove three quest counters from Zektar Shrine Expedition and sacrifice it: Put a 7/1 red Elemental creature token with trample and haste onto the battlefield. Exile it at the beginning of the next end step. + // Remove three quest counters from Zektar Shrine Expedition and sacrifice it: Create a 7/1 red Elemental creature token with trample and haste. Exile it at the beginning of the next end step. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ZektarShrineExpeditionEffect(), new RemoveCountersSourceCost(CounterType.QUEST.createInstance(3))); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); @@ -82,7 +82,7 @@ class ZektarShrineExpeditionEffect extends OneShotEffect { public ZektarShrineExpeditionEffect() { super(Outcome.PutCreatureInPlay); - this.staticText = "Put a 7/1 red Elemental creature token with trample and haste onto the battlefield. Exile it at the beginning of the next end step"; + this.staticText = "Create a 7/1 red Elemental creature token with trample and haste. Exile it at the beginning of the next end step"; } public ZektarShrineExpeditionEffect(final ZektarShrineExpeditionEffect effect) { diff --git a/Mage.Sets/src/mage/cards/z/ZendikarsRoil.java b/Mage.Sets/src/mage/cards/z/ZendikarsRoil.java index 32b437113f2..b938ab83449 100644 --- a/Mage.Sets/src/mage/cards/z/ZendikarsRoil.java +++ b/Mage.Sets/src/mage/cards/z/ZendikarsRoil.java @@ -47,7 +47,7 @@ public class ZendikarsRoil extends CardImpl { public ZendikarsRoil(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{G}{G}"); - // Whenever a land enters the battlefield under your control, put a 2/2 green Elemental creature token onto the battlefield. + // Whenever a land enters the battlefield under your control, create a 2/2 green Elemental creature token. Effect effect = new CreateTokenEffect(new ZendikarsRoilElementalToken()); this.addAbility(new EntersBattlefieldControlledTriggeredAbility(effect, new FilterLandPermanent("a land"))); } diff --git a/Mage.Sets/src/mage/cards/z/ZombieInfestation.java b/Mage.Sets/src/mage/cards/z/ZombieInfestation.java index 56b5327f8f1..e848b38a1fe 100644 --- a/Mage.Sets/src/mage/cards/z/ZombieInfestation.java +++ b/Mage.Sets/src/mage/cards/z/ZombieInfestation.java @@ -48,7 +48,7 @@ public class ZombieInfestation extends CardImpl { public ZombieInfestation(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{B}"); - // Discard two cards: Put a 2/2 black Zombie creature token onto the battlefield. + // Discard two cards: Create a 2/2 black Zombie creature token. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ZombieToken()), new DiscardTargetCost(new TargetCardInHand(2, new FilterCard("two cards")))); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/DearlyDepartedTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/DearlyDepartedTest.java index d08b33d7909..58d90b4d1ac 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/DearlyDepartedTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/DearlyDepartedTest.java @@ -2,8 +2,6 @@ package org.mage.test.cards.abilities.enters; import mage.constants.PhaseStep; import mage.constants.Zone; -import mage.game.permanent.Permanent; -import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -22,26 +20,27 @@ public class DearlyDepartedTest extends CardTestPlayerBase { // As long as Dearly Departed is in your graveyard, each Human creature you control enters the battlefield with an additional +1/+1 counter on it. addCard(Zone.GRAVEYARD, playerA, "Dearly Departed"); /** - * Thraben Doomsayer - * Creature — Human Cleric 2/2, 1WW (3) - * {T}: Put a 1/1 white Human creature token onto the battlefield. - * Fateful hour — As long as you have 5 or less life, other creatures you control get +2/+2. + * Thraben Doomsayer Creature — Human Cleric 2/2, 1WW (3) + * + * {T}: Put a 1/1 white Human creature token onto the battlefield. + * Fateful hour — As long as you have 5 or less life, other creatures + * you control get +2/+2. */ - addCard(Zone.BATTLEFIELD, playerA, "Thraben Doomsayer"); + addCard(Zone.HAND, playerA, "Thraben Doomsayer"); - activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Put a 1/1 white Human creature token onto the battlefield."); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Thraben Doomsayer"); + activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Create a 1/1 white Human creature token."); - setStopAt(2, PhaseStep.BEGIN_COMBAT); + setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); assertLife(playerA, 20); assertLife(playerB, 20); - assertPermanentCount(playerA, "Human", 1); + assertPowerToughness(playerA, "Thraben Doomsayer", 3, 3); + assertPermanentCount(playerA, "Human", 1); // check that the +1/+1 counter was added to the token - Permanent humanToken = getPermanent("Human", playerA.getId()); - Assert.assertEquals(2, humanToken.getPower().getValue()); - Assert.assertEquals(2, humanToken.getToughness().getValue()); + assertPowerToughness(playerA, "Human", 2, 2); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/flicker/CloudshiftTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/flicker/CloudshiftTest.java index 2b9085e3c02..87473214f4f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/flicker/CloudshiftTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/flicker/CloudshiftTest.java @@ -136,7 +136,7 @@ public class CloudshiftTest extends CardTestPlayerBase { @Test public void testThatCardIsHandledAsNewInstanceAfterCloudshift() { // Whenever another creature enters the battlefield under your control, you gain life equal to that creature's toughness. - // {1}{G}{W}, {T}: Populate. (Put a token onto the battlefield that's a copy of a creature token you control.) + // {1}{G}{W}, {T}: Populate. (Create a tokenonto the battlefield that's a copy of a creature token you control.) addCard(Zone.BATTLEFIELD, playerA, "Trostani, Selesnya's Voice"); addCard(Zone.BATTLEFIELD, playerA, "Forest", 4); addCard(Zone.BATTLEFIELD, playerA, "Plains", 4); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/FlashbackTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/FlashbackTest.java index 12b941e7fac..7f83e5c9a5e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/FlashbackTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/FlashbackTest.java @@ -192,7 +192,7 @@ public class FlashbackTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Forest", 1); addCard(Zone.HAND, playerA, "Snapcaster Mage", 1); - // Converge - Put a 1/1 white Kor Ally creature token onto the battlefield for each color of mana spent to cast Unified Front. + // Converge - Create a 1/1 white Kor Ally creature token for each color of mana spent to cast Unified Front. addCard(Zone.GRAVEYARD, playerA, "Unified Front"); // {3}{W} activateManaAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {W}"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/RetraceTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/RetraceTest.java index b4876e7bf0d..1d8ea8c3e96 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/RetraceTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/RetraceTest.java @@ -134,7 +134,7 @@ public class RetraceTest extends CardTestPlayerBase { addCard(Zone.GRAVEYARD, playerA, "Swamp", 2); addCard(Zone.HAND, playerA, "Mountain", 1); - // Put a 1/1 black and green Worm creature token onto the battlefield for each land card in your graveyard. + // Create a 1/1 black and green Worm creature token for each land card in your graveyard. // Retrace (You may cast this card from your graveyard by discarding a land card in addition to paying its other costs.) castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Worm Harvest"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SurgeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SurgeTest.java index d786edd0642..eaf057eb8ab 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SurgeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SurgeTest.java @@ -71,7 +71,7 @@ public class SurgeTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Lightning Bolt"); addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion"); - // Put a token onto the battlefield that's a copy of target creature you control. + // Create a tokenonto the battlefield that's a copy of target creature you control. // Flashback {5}{U}{U}(You may cast this card from your graveyard for its flashback cost. Then exile it.) addCard(Zone.HAND, playerB, "Cackling Counterpart"); addCard(Zone.BATTLEFIELD, playerB, "Island", 3); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/BaneOfProgessTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/BaneOfProgessTest.java index 221325d4aba..021b77d389d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/BaneOfProgessTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/BaneOfProgessTest.java @@ -43,7 +43,7 @@ public class BaneOfProgessTest extends CardTestPlayerBase { // You may play land cards from your graveyard. addCard(Zone.BATTLEFIELD, playerA, "Crucible of Worlds"); addCard(Zone.BATTLEFIELD, playerA, "Island", 6); - // Put a token onto the battlefield that's a copy of target artifact or creature. + // Create a tokenonto the battlefield that's a copy of target artifact or creature. // Cipher (Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.) addCard(Zone.HAND, playerA, "Stolen Identity"); // {4}{U}{U} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/sacrifice/TradingPostTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/sacrifice/TradingPostTest.java index 44288aa411e..2ca85699eb1 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/sacrifice/TradingPostTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/sacrifice/TradingPostTest.java @@ -47,7 +47,7 @@ public class TradingPostTest extends CardTestPlayerBase { public void testSacrifice() { addCard(Zone.BATTLEFIELD, playerA, "Mountain", 4); // {1}, {T}, Discard a card: You gain 4 life. - // {1}, {T}, Pay 1 life: Put a 0/1 white Goat creature token onto the battlefield. + // {1}, {T}, Pay 1 life: Create a 0/1 white Goat creature token onto the battlefield. // {1}, {T}, Sacrifice a creature: Return target artifact card from your graveyard to your hand. // {1}, {T}, Sacrifice an artifact: Draw a card. addCard(Zone.BATTLEFIELD, playerA, "Trading Post", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/SpellFizzlesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/SpellFizzlesTest.java index 26f3f2e9925..3551f5a23ef 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/SpellFizzlesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/SpellFizzlesTest.java @@ -43,7 +43,7 @@ public class SpellFizzlesTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Island", 4); // Devoid // Tap up to two target creatures. Those creatures don't untap during their controller's next untap step. - // Put a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has "Sacrifice this creature: Add {C} to your mana pool." + // Create a 1/1 colorless Eldrazi Scion creature token onto the battlefield. It has "Sacrifice this creature: Add {C} to your mana pool." addCard(Zone.HAND, playerA, "Adverse Conditions"); // {3}{U} addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/asthough/SpendOtherManaTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/SpendOtherManaTest.java index d649b5b5aec..a71cef7116f 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/asthough/SpendOtherManaTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/SpendOtherManaTest.java @@ -118,7 +118,7 @@ public class SpendOtherManaTest extends CardTestPlayerBase { // Spell mastery - If there are two or more instant and/or sorcery cards in your graveyard, add {B}{B}{B} to your mana pool. addCard(Zone.HAND, playerA, "Dark Petition"); // {3}{B}{B} - // +1: Put a 0/1 green Plant creature token onto the battlefield. + // +1: Create a 0/1 green Plant creature token onto the battlefield. // -2: Put a +1/+1 counter on each creature you control. // -7: You gain X life and draw X cards, where X is the number of lands you control. addCard(Zone.LIBRARY, playerA, "Nissa, Voice of Zendikar"); // {1}{G}{G} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/AngelOfJubilationTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/AngelOfJubilationTest.java index e8093a640eb..b5acc76e54a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/AngelOfJubilationTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/AngelOfJubilationTest.java @@ -6,9 +6,8 @@ import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; /** - * Angel of Jubilation - * Other nonblack creatures you control get +1/+1. - * Players can't pay life or sacrifice creatures to cast spells or activate abilities + * Angel of Jubilation Other nonblack creatures you control get +1/+1. Players + * can't pay life or sacrifice creatures to cast spells or activate abilities * * @author noxx */ @@ -58,22 +57,22 @@ public class AngelOfJubilationTest extends CardTestPlayerBase { assertPowerToughness(playerA, "Devout Chaplain", 2, 2); assertPowerToughness(playerA, "Corpse Traders", 3, 3); } - + @Test public void testOpponentCantSacrificeCreatures() { addCard(Zone.BATTLEFIELD, playerA, "Angel of Jubilation"); addCard(Zone.BATTLEFIELD, playerB, "Nantuko Husk"); addCard(Zone.BATTLEFIELD, playerB, "Corpse Traders"); - + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Sacrifice a creature: {this} gets +2/+2 until end of turn."); playerB.addChoice("Corpse Traders"); setStopAt(1, PhaseStep.END_TURN); execute(); - + assertPowerToughness(playerB, "Nantuko Husk", 2, 2); assertPermanentCount(playerB, "Corpse Traders", 1); } - + @Test public void testOpponentCanSacrificeNonCreaturePermanents() { addCard(Zone.BATTLEFIELD, playerA, "Angel of Jubilation"); @@ -82,36 +81,36 @@ public class AngelOfJubilationTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Nantuko Husk"); addCard(Zone.BATTLEFIELD, playerB, "Island", 4); addCard(Zone.BATTLEFIELD, playerB, "Food Chain"); - + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerB, "{2},Sacrifice a permanent you control: Return target creature to its owner's hand."); playerB.addChoice("Food Chain"); playerA.addTarget("Angel of Jubilation"); - + setStopAt(1, PhaseStep.END_TURN); execute(); - + assertPermanentCount(playerA, "Angel of Jubilation", 0); assertPermanentCount(playerB, "Food Chain", 0); } - + @Test public void testOpponentCantSacrificeCreaturesAsPartOfPermanentsOptions() { addCard(Zone.BATTLEFIELD, playerA, "Angel of Jubilation"); addCard(Zone.BATTLEFIELD, playerB, "Barrin, Master Wizard"); addCard(Zone.BATTLEFIELD, playerB, "Nantuko Husk"); addCard(Zone.BATTLEFIELD, playerB, "Llanowar Elves", 2); - + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerB, "{2},Sacrifice a permanent you control: Return target creature to its owner's hand."); playerB.addChoice("Nantuko Husk"); playerA.addTarget("Angel of Jubilation"); - + setStopAt(1, PhaseStep.END_TURN); execute(); - + assertPermanentCount(playerA, "Angel of Jubilation", 1); assertPermanentCount(playerB, "Nantuko Husk", 1); } - + @Test public void testOpponentCantSacrificeAll() { addCard(Zone.BATTLEFIELD, playerA, "Angel of Jubilation"); @@ -119,59 +118,59 @@ public class AngelOfJubilationTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Corpse Traders"); addCard(Zone.HAND, playerB, "Soulblast"); addCard(Zone.BATTLEFIELD, playerB, "Mountain", 6); - + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Soulblast", playerA); - + setStopAt(1, PhaseStep.END_TURN); execute(); - + assertLife(playerA, 20); assertLife(playerB, 20); - + assertPermanentCount(playerB, "Nantuko Husk", 1); assertPermanentCount(playerB, "Corpse Traders", 1); } - + @Test public void testOpponentCantSacrificeCreatureSource() { addCard(Zone.BATTLEFIELD, playerA, "Angel of Jubilation"); addCard(Zone.BATTLEFIELD, playerB, "Children of Korlis"); - + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Sacrifice {this}: You gain life equal to the life you've lost this turn."); playerB.addChoice("Skirk Prospector"); - + setStopAt(1, PhaseStep.END_TURN); execute(); - + assertPermanentCount(playerB, "Children of Korlis", 1); } - + @Test public void testOpponentCanSacrificeAllLands() { addCard(Zone.BATTLEFIELD, playerA, "Angel of Jubilation"); addCard(Zone.BATTLEFIELD, playerB, "Tomb of Urami"); addCard(Zone.BATTLEFIELD, playerB, "Swamp", 4); - - activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerB, "{2}{B}{B},{T}, Sacrifice all lands you control: Put a legendary 5/5 black Demon Spirit creature token with flying named Urami onto the battlefield."); - + + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerB, "{2}{B}{B},{T}, Sacrifice all lands you control: Create a legendary 5/5 black Demon Spirit creature token with flying named Urami."); + setStopAt(1, PhaseStep.END_TURN); execute(); - + assertPermanentCount(playerB, "Swamp", 0); } - + @Test public void testOpponentCanSacrificeNonCreatureSource() { addCard(Zone.BATTLEFIELD, playerA, "Angel of Jubilation"); addCard(Zone.BATTLEFIELD, playerA, "Tundra"); addCard(Zone.BATTLEFIELD, playerB, "Wasteland"); - + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerB, "{T}, Sacrifice {this}: Destroy target nonbasic land."); playerB.addTarget("Tundra"); - + setStopAt(1, PhaseStep.END_TURN); execute(); - + assertPermanentCount(playerA, "Tundra", 0); assertPermanentCount(playerB, "Wasteland", 0); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/DaxosTheReturnedTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/DaxosTheReturnedTest.java index d7a43e3c47a..39509238211 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/DaxosTheReturnedTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/DaxosTheReturnedTest.java @@ -50,7 +50,7 @@ public class DaxosTheReturnedTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Swamp", 8); addCard(Zone.BATTLEFIELD, playerA, "Plains", 1); // Whenever you cast an enchantment spell, you get an experience counter. - // {1}{W}{B}: Put a white and black Spirit enchantment creature token onto the battlefield. It has + // {1}{W}{B}: Create a white and black Spirit enchantment creature token onto the battlefield. It has // "This creature's power and toughness are each equal to the number of experience counters you have." addCard(Zone.BATTLEFIELD, playerA, "Daxos the Returned"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/DependentEffectsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/DependentEffectsTest.java index b1b4ffa9bae..f4cb9911c18 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/DependentEffectsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/DependentEffectsTest.java @@ -91,7 +91,7 @@ public class DependentEffectsTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Opalescence", 1); addCard(Zone.BATTLEFIELD, playerA, "Island", 9); // Kicker {5} - // Put a token that's a copy of target creature onto the battlefield. If Rite of Replication was kicked, put five of those tokens onto the battlefield instead. + // Create a tokenthat's a copy of target creature onto the battlefield. If Rite of Replication was kicked, put five of those tokens onto the battlefield instead. addCard(Zone.HAND, playerA, "Rite of Replication", 1); // This token can have a cmc // All permanents are enchantments in addition to their other types. addCard(Zone.HAND, playerA, "Enchanted Evening"); // {3}{W/U}{W/U} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/ArtisanOfFormsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/ArtisanOfFormsTest.java index 22077890532..49a5848f624 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/ArtisanOfFormsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/ArtisanOfFormsTest.java @@ -49,7 +49,7 @@ public class ArtisanOfFormsTest extends CardTestPlayerBase { public void testCopyTriggeredByCracklingCounterpart() { // Heroic - Whenever you cast a spell that targets Artisan of Forms, you may have Artisan of Forms become a copy of target creature and gain this ability. addCard(Zone.HAND, playerA, "Artisan of Forms"); // {1}{U} - // {1}{U}{U} Put a token onto the battlefield that's a copy of target creature you control. + // {1}{U}{U} Create a tokenonto the battlefield that's a copy of target creature you control. addCard(Zone.HAND, playerA, "Cackling Counterpart"); addCard(Zone.BATTLEFIELD, playerA, "Island", 5); @@ -88,7 +88,7 @@ public class ArtisanOfFormsTest extends CardTestPlayerBase { // Heroic - Whenever you cast a spell that targets Artisan of Forms, you may have // Artisan of Forms become a copy of target creature and gain this ability. addCard(Zone.BATTLEFIELD, playerA, "Artisan of Forms"); - // {1}{U}{U} Put a token onto the battlefield that's a copy of target creature you control. + // {1}{U}{U} Create a tokenonto the battlefield that's a copy of target creature you control. addCard(Zone.HAND, playerA, "Cackling Counterpart"); addCard(Zone.BATTLEFIELD, playerA, "Island", 3); addCard(Zone.HAND, playerA, "Eyes in the Skies"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/EssenceOfTheWildtest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/EssenceOfTheWildtest.java index 6d332de0822..5fa583231b5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/EssenceOfTheWildtest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/EssenceOfTheWildtest.java @@ -84,7 +84,7 @@ public class EssenceOfTheWildtest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Plains", 2); // Creatures you control enter the battlefield as a copy of Essence of the Wild. addCard(Zone.BATTLEFIELD, playerA, "Essence of the Wild"); // 6/6 - // Exile a creature card from your graveyard and pay its mana cost: Put a token onto the battlefield that's a copy of that card. Activate this ability only any time you could cast a sorcery. + // Exile a creature card from your graveyard and pay its mana cost: Create a tokenonto the battlefield that's a copy of that card. Activate this ability only any time you could cast a sorcery. addCard(Zone.BATTLEFIELD, playerA, "Back from the Brink"); // Enchantment addCard(Zone.GRAVEYARD, playerA, "Silvercoat Lion"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/FeldonOfTheThirdPathTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/FeldonOfTheThirdPathTest.java index 1f10045907c..d157967cb53 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/FeldonOfTheThirdPathTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/FeldonOfTheThirdPathTest.java @@ -35,12 +35,12 @@ import org.mage.test.serverside.base.CardTestPlayerBase; /** * Test the funtions of Feldon of the Third Path - {1}{R}{R} Legendary Creature - * - Human Artificer 2/3 {2}{R}, {T} : Put a token onto the battlefield that's a - * copy of target creature card in your graveyard, except it's an artifact in + * - Human Artificer 2/3 {2}{R}, {T} : Create a tokenonto the battlefield that's + * a copy of target creature card in your graveyard, except it's an artifact in * addition to its other types. It gains haste. Sacrifice it at the beginning of * the next end step. * -* + * * @author LevelX2 */ public class FeldonOfTheThirdPathTest extends CardTestPlayerBase { @@ -58,7 +58,7 @@ public class FeldonOfTheThirdPathTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3); activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerA, - "{2}{R},{T}: Put a token onto the battlefield that's a copy of target creature card in your graveyard, except it's an artifact in addition to its other types. It gains haste. Sacrifice it at the beginning of the next end step.", + "{2}{R},{T}: Create a token that's a copy of target creature card in your graveyard, except it's an artifact in addition to its other types. It gains haste. Sacrifice it at the beginning of the next end step.", "Highway Robber"); setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); execute(); @@ -82,7 +82,7 @@ public class FeldonOfTheThirdPathTest extends CardTestPlayerBase { addCard(Zone.GRAVEYARD, playerB, "Silvercoat Lion", 1); activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerA, - "{2}{R},{T}: Put a token onto the battlefield that's a copy of target creature card in your graveyard, except it's an artifact in addition to its other types. It gains haste. Sacrifice it at the beginning of the next end step.", + "{2}{R},{T}: Create a token that's a copy of target creature card in your graveyard, except it's an artifact in addition to its other types. It gains haste. Sacrifice it at the beginning of the next end step.", "Sepulchral Primordial"); addTarget(playerA, "Silvercoat Lion"); // target for ETB Sepulchral Primordial setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/HiveMindTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/HiveMindTest.java index 27bfca4c070..8ed959619cd 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/HiveMindTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/HiveMindTest.java @@ -27,7 +27,6 @@ */ package org.mage.test.cards.copy; - import mage.constants.PhaseStep; import mage.constants.Zone; import org.junit.Assert; @@ -41,12 +40,12 @@ import org.mage.test.serverside.base.CardTestPlayerBase; public class HiveMindTest extends CardTestPlayerBase { /** - * Check that opponent gets a copy of Lightning Bolt + * Check that opponent gets a copy of Lightning Bolt */ @Test - public void testTransform() { + public void testTransform() { addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1); - // Whenever a player casts an instant or sorcery spell, each other player copies that spell. + // Whenever a player casts an instant or sorcery spell, each other player copies that spell. // Each of those players may choose new targets for his or her copy. addCard(Zone.BATTLEFIELD, playerA, "Hive Mind", 1); addCard(Zone.HAND, playerA, "Lightning Bolt", 1); @@ -60,30 +59,32 @@ public class HiveMindTest extends CardTestPlayerBase { assertLife(playerB, 17); assertLife(playerA, 17); } - + /** - * The Amulet Bloom deck in Modern has a few wincons, one of them being that the Bloom player - * resolves a Hive Mind, then casts a Pact. The Hive Mind copies it so the opponent also casts a Pact. - * If the opposing player has a Chalice set on ZERO, it will counter both copies which it should - * NOT DO because Hive Mind puts a copy onto the stack, not 'cast'. So while the Bloom player's - * copy is countered, the opponent will still cast and have to pay during their upkeep. + * The Amulet Bloom deck in Modern has a few wincons, one of them being that + * the Bloom player resolves a Hive Mind, then casts a Pact. The Hive Mind + * copies it so the opponent also casts a Pact. If the opposing player has a + * Chalice set on ZERO, it will counter both copies which it should NOT DO + * because Hive Mind puts a copy onto the stack, not 'cast'. So while the + * Bloom player's copy is countered, the opponent will still cast and have + * to pay during their upkeep. */ @Test - public void testChaliceOfTtheVoid() { - // Whenever a player casts an instant or sorcery spell, each other player copies that spell. - // Each of those players may choose new targets for his or her copy. + public void testChaliceOfTtheVoid() { + // Whenever a player casts an instant or sorcery spell, each other player copies that spell. + // Each of those players may choose new targets for his or her copy. addCard(Zone.BATTLEFIELD, playerA, "Hive Mind", 1); - // Put a 4/4 red Giant creature token onto the battlefield. + // Create a 4/4 red Giant creature token onto the battlefield. // At the beginning of your next upkeep, pay {4}{R}. If you don't, you lose the game. addCard(Zone.HAND, playerA, "Pact of the Titan", 1); // Chalice of the Void enters the battlefield with X charge counters on it. // Whenever a player casts a spell with converted mana cost equal to the number of charge counters on Chalice of the Void, counter that spell. addCard(Zone.BATTLEFIELD, playerB, "Chalice of the Void", 1); - + setChoice(playerB, "Yes"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Pact of the Titan"); - + setStopAt(2, PhaseStep.PRECOMBAT_MAIN); execute(); @@ -94,5 +95,5 @@ public class HiveMindTest extends CardTestPlayerBase { Assert.assertTrue("Player B must have lost", playerB.hasLost()); assertLife(playerB, 20); assertLife(playerA, 20); - } -} \ No newline at end of file + } +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/KikiJikiMirrorBreakerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/KikiJikiMirrorBreakerTest.java index 3d1b27fca2f..1fd9709bf9d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/KikiJikiMirrorBreakerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/KikiJikiMirrorBreakerTest.java @@ -49,7 +49,7 @@ public class KikiJikiMirrorBreakerTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Kiki-Jiki, Mirror Breaker", 1); addCard(Zone.BATTLEFIELD, playerA, "Voice of Resurgence", 1); - activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Put a token that's a copy of target nonlegendary creature you control onto the battlefield. That token has haste. Sacrifice it at the beginning of the next end step."); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Create a token that's a copy of target nonlegendary creature you control. That token has haste. Sacrifice it at the beginning of the next end step."); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -65,7 +65,7 @@ public class KikiJikiMirrorBreakerTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Kiki-Jiki, Mirror Breaker", 1); addCard(Zone.BATTLEFIELD, playerA, "Voice of Resurgence", 1); - activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Put a token that's a copy of target nonlegendary creature you control onto the battlefield. That token has haste. Sacrifice it at the beginning of the next end step."); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Create a token that's a copy of target nonlegendary creature you control. That token has haste. Sacrifice it at the beginning of the next end step."); setStopAt(1, PhaseStep.END_TURN); execute(); @@ -86,7 +86,7 @@ public class KikiJikiMirrorBreakerTest extends CardTestPlayerBase { // Flamebreak deals 3 damage to each creature without flying and each player. Creatures dealt damage this way can't be regenerated this turn. addCard(Zone.HAND, playerB, "Flamebreak"); - activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Put a token that's a copy of target nonlegendary creature you control onto the battlefield. That token has haste. Sacrifice it at the beginning of the next end step."); + activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Create a token that's a copy of target nonlegendary creature you control. That token has haste. Sacrifice it at the beginning of the next end step."); castSpell(2, PhaseStep.POSTCOMBAT_MAIN, playerB, "Flamebreak"); setStopAt(2, PhaseStep.END_TURN); @@ -121,7 +121,7 @@ public class KikiJikiMirrorBreakerTest extends CardTestPlayerBase { castSpell(2, PhaseStep.UPKEEP, playerA, "Blustersquall", "Humble Defector"); // Tap nontoken Defector so only the Token can be used later - activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerB, "{T}: Put a token that's a copy of target nonlegendary creature you control onto the battlefield. That token has haste. Sacrifice it at the beginning of the next end step."); + activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerB, "{T}: Create a token that's a copy of target nonlegendary creature you control. That token has haste. Sacrifice it at the beginning of the next end step."); activateAbility(2, PhaseStep.POSTCOMBAT_MAIN, playerB, "{T}: Draw two cards. Target opponent gains control"); @@ -163,7 +163,7 @@ public class KikiJikiMirrorBreakerTest extends CardTestPlayerBase { castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Body Double"); setChoice(playerB, "Silvercoat Lion"); - activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerB, "{T}: Put a token that's a copy of target nonlegendary creature you control onto the battlefield. That token has haste. Sacrifice it at the beginning of the next end step."); + activateAbility(2, PhaseStep.PRECOMBAT_MAIN, playerB, "{T}: Create a token that's a copy of target nonlegendary creature you control. That token has haste. Sacrifice it at the beginning of the next end step."); attack(2, playerB, "Silvercoat Lion"); setStopAt(2, PhaseStep.POSTCOMBAT_MAIN); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/MimicVatTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/MimicVatTest.java index 1115121c7e4..01aca004194 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/MimicVatTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/MimicVatTest.java @@ -51,7 +51,7 @@ public class MimicVatTest extends CardTestPlayerBase { public void TestClone() { addCard(Zone.BATTLEFIELD, playerA, "Island", 6); // Imprint - Whenever a nontoken creature dies, you may exile that card. If you do, return each other card exiled with Mimic Vat to its owner's graveyard. - // {3}, {T}: Put a token onto the battlefield that's a copy of the exiled card. It gains haste. Exile it at the beginning of the next end step. + // {3}, {T}: Create a tokenonto the battlefield that's a copy of the exiled card. It gains haste. Exile it at the beginning of the next end step. addCard(Zone.BATTLEFIELD, playerA, "Mimic Vat", 1); // Artifact {3} // {2}, {T}, Sacrifice a creature: Draw a card. addCard(Zone.BATTLEFIELD, playerA, "Phyrexian Vault", 1); @@ -66,7 +66,7 @@ public class MimicVatTest extends CardTestPlayerBase { activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{2},{T}, Sacrifice a creature"); setChoice(playerA, "Yes"); - activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{3},{T}: Put a token onto the battlefield"); + activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{3},{T}: Create a token"); setChoice(playerA, "Silvercoat Lion"); setStopAt(3, PhaseStep.BEGIN_COMBAT); @@ -82,7 +82,7 @@ public class MimicVatTest extends CardTestPlayerBase { public void TestPhyrexianMetamorph() { addCard(Zone.BATTLEFIELD, playerA, "Island", 6); // Imprint - Whenever a nontoken creature dies, you may exile that card. If you do, return each other card exiled with Mimic Vat to its owner's graveyard. - // {3}, {T}: Put a token onto the battlefield that's a copy of the exiled card. It gains haste. Exile it at the beginning of the next end step. + // {3}, {T}: Create a token that's a copy of a card exiled with Mimic Vat. It gains haste. Exile it at the beginning of the next end step. addCard(Zone.BATTLEFIELD, playerA, "Mimic Vat", 1); // Artifact {3} // {2}, {T}, Sacrifice a creature: Draw a card. addCard(Zone.BATTLEFIELD, playerA, "Phyrexian Vault", 1); @@ -98,7 +98,7 @@ public class MimicVatTest extends CardTestPlayerBase { activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{2},{T}, Sacrifice a creature"); setChoice(playerA, "Yes"); - activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{3},{T}: Put a token onto the battlefield"); + activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{3},{T}: Create a token that's a copy of a card exiled with "); setChoice(playerA, "Yes"); setChoice(playerA, "Silvercoat Lion"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/SplinterTwinTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/SplinterTwinTest.java index 88732ce775a..12691b74ef3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/SplinterTwinTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/SplinterTwinTest.java @@ -42,7 +42,7 @@ public class SplinterTwinTest extends CardTestPlayerBase { public void testCopyCreature() { addCard(Zone.BATTLEFIELD, playerA, "Mountain", 4); // Enchant creature - // Enchanted creature has "{T}: Put a token that's a copy of this creature onto the battlefield. That token has haste. Exile it at the beginning of the next end step." + // Enchanted creature has "{T}: Create a tokenthat's a copy of this creature onto the battlefield. That token has haste. Exile it at the beginning of the next end step." addCard(Zone.HAND, playerA, "Splinter Twin"); // {2}{R}{R} addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion"); @@ -50,9 +50,9 @@ public class SplinterTwinTest extends CardTestPlayerBase { addCard(Zone.HAND, playerB, "Lightning Bolt"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Splinter Twin", "Silvercoat Lion"); - activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Put a token"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Create a token"); - castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", "Silvercoat Lion", "{T}: Put a token"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Lightning Bolt", "Silvercoat Lion", "{T}: Create a token"); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/CryptGhastTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/CryptGhastTest.java index 74ffce4d0f1..b178bc64728 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/CryptGhastTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/CryptGhastTest.java @@ -72,7 +72,7 @@ public class CryptGhastTest extends CardTestPlayerBase { // Whenever you tap a Swamp for mana, add {B} to your mana pool (in addition to the mana the land produces). addCard(Zone.BATTLEFIELD, playerA, "Crypt Ghast", 1); // Imprint - Whenever a nontoken creature dies, you may exile that card. If you do, return each other card exiled with Mimic Vat to its owner's graveyard. - // {3},{T}: Put a token onto the battlefield that's a copy of the exiled card. It gains haste. Exile it at the beginning of the next end step. + // {3},{T}: Create a tokenonto the battlefield that's a copy of the exiled card. It gains haste. Exile it at the beginning of the next end step. addCard(Zone.BATTLEFIELD, playerA, "Mimic Vat", 1); addCard(Zone.BATTLEFIELD, playerA, "Swamp", 1); // Swamp Mountain diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/NykthosShrineToNyxTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/NykthosShrineToNyxTest.java index b692a7526b9..ce3903687bb 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/NykthosShrineToNyxTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/NykthosShrineToNyxTest.java @@ -136,7 +136,7 @@ public class NykthosShrineToNyxTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Simic Guildmage"); // Cackling Counterpart {1}{U}{U} // Instant - // Put a token onto the battlefield that's a copy of target creature you control. + // Create a tokenonto the battlefield that's a copy of target creature you control. // Flashback {5}{U}{U} (You may cast this card from your graveyard for its flashback cost. Then exile it.) addCard(Zone.HAND, playerA, "Cackling Counterpart"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/TamiyoTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/TamiyoTest.java index e568576f016..f5606cc2ed5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/TamiyoTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/TamiyoTest.java @@ -53,12 +53,12 @@ public class TamiyoTest extends CardTestPlayerBase { /* Gideon, Ally of Zendikar {2}{W}{W} - 4 loyalty * +1: Until end of turn, Gideon, Ally of Zendikar becomes a 5/5 Human Soldier Ally creature with indestructible * that's still a planeswalker. Prevent all damage that would be dealt to him this turn. - * 0: Put a 2/2 white Knight Ally creature token onto the battlefield. + * 0: Create a 2/2 white Knight Ally creature token. **/ addCard(Zone.BATTLEFIELD, playerA, "Gideon, Ally of Zendikar", 1); // put 2/2 knight ally token on battlefield - activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+0: Put a"); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+0: Create a"); // next, activate Gideon to make him a 5/5 human soldier ally creature activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "+1: Until end of turn"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/UginTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/UginTest.java index d4631910d38..e5a784f3876 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/UginTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/UginTest.java @@ -54,7 +54,7 @@ public class UginTest extends CardTestPlayerBase { // When Nissa, Vastwood Seer enters the battlefield, you may search your library for a basic Forest card, reveal it, put it into your hand, then shuffle your library. // Whenever a land enters the battlefield under your control, if you control seven or more lands, exile Nissa, then return her to the battlefield transformed under her owner's control. // +1: Reveal the top card of your library. If it's a land card, put it onto the battlefield. Otherwise, put it into your hand. - // -2: Put a legendary 4/4 green Elemental creature token named Ashaya, the Awoken World onto the battlefield. + // -2: Create a legendary 4/4 green Elemental creature token named Ashaya, the Awoken World. // -7: Untap up to six target lands. They become 6/6 Elemental creatures. They're still lands. addCard(Zone.HAND, playerB, "Nissa, Vastwood Seer"); @@ -62,7 +62,7 @@ public class UginTest extends CardTestPlayerBase { castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Nissa, Vastwood Seer"); playLand(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Forest"); - activateAbility(2, PhaseStep.POSTCOMBAT_MAIN, playerB, "-2: Put a legendary 4/4 green Elemental creature token named Ashaya, the Awoken World onto the battlefield."); + activateAbility(2, PhaseStep.POSTCOMBAT_MAIN, playerB, "-2: Create a legendary 4/4 green Elemental creature token named Ashaya, the Awoken World."); attack(3, playerA, "Silvercoat Lion"); block(3, playerB, "Ashaya, the Awoken World", "Silvercoat Lion"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DoublingSeasonTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DoublingSeasonTest.java index 41c558e6384..207fa859f13 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DoublingSeasonTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DoublingSeasonTest.java @@ -80,7 +80,7 @@ public class DoublingSeasonTest extends CardTestPlayerBase { castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Pallid Mycoderm"); - activateAbility(5, PhaseStep.PRECOMBAT_MAIN, playerA, "Remove three spore counters from {this}: Put a 1/1 green Saproling creature token onto the battlefield."); + activateAbility(5, PhaseStep.PRECOMBAT_MAIN, playerA, "Remove three spore counters from {this}: Create a 1/1 green Saproling creature token."); setStopAt(5, PhaseStep.END_TURN); execute(); @@ -117,7 +117,7 @@ public class DoublingSeasonTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Doubling Season"); addCard(Zone.BATTLEFIELD, playerA, "Island", 9); - // Put a token that's a copy of target creature onto the battlefield. If Rite of Replication was kicked, put five of those tokens onto the battlefield instead. + // Create a tokenthat's a copy of target creature onto the battlefield. If Rite of Replication was kicked, put five of those tokens onto the battlefield instead. addCard(Zone.HAND, playerA, "Rite of Replication"); // When Venerable Monk enters the battlefield, you gain 2 life. addCard(Zone.BATTLEFIELD, playerB, "Venerable Monk", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/restriction/ArrestTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/restriction/ArrestTest.java index a08b44fe2fc..4d88d1b9bc8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/restriction/ArrestTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/restriction/ArrestTest.java @@ -36,17 +36,15 @@ import org.mage.test.serverside.base.CardTestPlayerBase; * * @author LevelX2 */ - public class ArrestTest extends CardTestPlayerBase { - @Test public void testArrest1() { addCard(Zone.HAND, playerA, "Arrest"); addCard(Zone.BATTLEFIELD, playerA, "Plains", 3); addCard(Zone.BATTLEFIELD, playerB, "Forest", 4); - // {3}{G}: Put a 1/1 green Saproling creature token onto the battlefield. + // {3}{G}: Create a 1/1 green Saproling creature token. // {3}{W}: Creatures you control get +1/+1 until end of turn. addCard(Zone.BATTLEFIELD, playerB, "Selesnya Guildmage"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/SorinLordOfInnistradTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/SorinLordOfInnistradTest.java index 7bfbe86c110..4a105f4eef0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/SorinLordOfInnistradTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/SorinLordOfInnistradTest.java @@ -10,7 +10,7 @@ import org.mage.test.serverside.base.CardTestPlayerBase; /** * * also tests emblems - * + * * @author BetaSteward */ public class SorinLordOfInnistradTest extends CardTestPlayerBase { @@ -19,7 +19,7 @@ public class SorinLordOfInnistradTest extends CardTestPlayerBase { public void testCard() { addCard(Zone.BATTLEFIELD, playerA, "Sorin, Lord of Innistrad"); - activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+1: Put a a 1/1 black Vampire creature token with lifelink onto the battlefield."); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+1: Create a a 1/1 black Vampire creature token with lifelink."); setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); @@ -52,7 +52,7 @@ public class SorinLordOfInnistradTest extends CardTestPlayerBase { public void testCard3() { // Sorin, Lord of Innistrad English // Planeswalker — Sorin (Loyalty: 3), 2WB - // +1: Put a 1/1 black Vampire creature token with lifelink onto the battlefield. + // +1: Create a 1/1 black Vampire creature token with lifelink. // -2: You get an emblem with "Creatures you control get +1/+0." // -6: Destroy up to three target creatures and/or other planeswalkers. Return each card put into a graveyard this way to the battlefield under your control. addCard(Zone.BATTLEFIELD, playerA, "Sorin, Lord of Innistrad"); @@ -73,7 +73,6 @@ public class SorinLordOfInnistradTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Craw Wurm", 1); assertPermanentCount(playerA, "Angel of Mercy", 1); - assertLife(playerB, 20); assertLife(playerA, 23); assertPermanentCount(playerA, "Sorin, Lord of Innistrad", 0); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/SoulFoundryTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/SoulFoundryTest.java index 2783390643a..09a5327a486 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/SoulFoundryTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/SoulFoundryTest.java @@ -36,7 +36,6 @@ import org.mage.test.serverside.base.CardTestPlayerBase; * * @author LevelX2 */ - public class SoulFoundryTest extends CardTestPlayerBase { /** @@ -48,20 +47,20 @@ public class SoulFoundryTest extends CardTestPlayerBase { public void testBloodlineKeeper() { addCard(Zone.BATTLEFIELD, playerA, "Island", 8); // Imprint - When Soul Foundry enters the battlefield, you may exile a creature card from your hand. - // {X}, {T}: Put a token that's a copy of the exiled card onto the battlefield. X is the converted mana cost of that card. + // {X}, {T}: Create a tokenthat's a copy of the exiled card onto the battlefield. X is the converted mana cost of that card. addCard(Zone.HAND, playerA, "Soul Foundry"); // {4} addCard(Zone.HAND, playerA, "Bloodline Keeper"); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Soul Foundry"); setChoice(playerA, "Yes"); - activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "{X},{T}: Put a token"); - + activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "{X},{T}: Create a token"); + setStopAt(1, PhaseStep.END_TURN); execute(); assertPermanentCount(playerA, "Soul Foundry", 1); - + assertExileCount("Bloodline Keeper", 1); assertPermanentCount(playerA, "Bloodline Keeper", 1); } -} \ No newline at end of file +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/SoulSeparatorTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/SoulSeparatorTest.java index 933223c0d40..5ab20b8a430 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/SoulSeparatorTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/SoulSeparatorTest.java @@ -19,66 +19,66 @@ public class SoulSeparatorTest extends CardTestPlayerBase { @Test public void testBasicExileCreature() { // Soul Separator {3} Artifact - // {5}, {T}, Sacrifice Soul Separator: Exile target creature card from your graveyard. - // Put a token onto the battlefield that's a copy of that card except it's 1/1, it's a Spirit in addition to its other types, and it has flying. - // Put a black Zombie creature token onto the battlefield with power equal to that card's power and toughness equal that card's toughness. + // {5}, {T}, Sacrifice Soul Separator: Exile target creature card from your graveyard. + // Create a token that's a copy of that card except it's 1/1, it's a Spirit in addition to its other types, and it has flying. + // Create a black Zombie creature token onto the battlefield with power equal to that card's power and toughness equal that card's toughness. addCard(Zone.BATTLEFIELD, playerA, "Soul Separator"); addCard(Zone.BATTLEFIELD, playerA, "Swamp", 5); addCard(Zone.GRAVEYARD, playerA, "Sylvan Advocate"); // 2/3 vigilance - + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{5}"); addTarget(playerA, "Sylvan Advocate"); - + setStopAt(1, PhaseStep.BEGIN_COMBAT); execute(); - + assertGraveyardCount(playerA, "Soul Separator", 1); assertExileCount("Sylvan Advocate", 1); assertPermanentCount(playerA, "Sylvan Advocate", 1); assertPermanentCount(playerA, "Zombie", 1); assertPowerToughness(playerA, "Zombie", 2, 3); - + Permanent saToken = getPermanent("Sylvan Advocate", playerA); Assert.assertTrue(saToken.getAbilities().contains(FlyingAbility.getInstance())); - Assert.assertTrue(saToken.getSubtype(currentGame).contains("Spirit")); + Assert.assertTrue(saToken.getSubtype(currentGame).contains("Spirit")); Assert.assertTrue(saToken.getAbilities().contains(VigilanceAbility.getInstance())); assertPowerToughness(playerA, "Sylvan Advocate", 1, 1); } - + // Reported bug: Exiled Tree of Perdition with Soul Separator // The token copy when activated reduced the opponent's life total to 13 (tree toughness) instead of 1 (1/1 token) @Test public void testExileTreeOfPerdition() { // Soul Separator {3} Artifact - // {5}, {T}, Sacrifice Soul Separator: Exile target creature card from your graveyard. - // Put a token onto the battlefield that's a copy of that card except it's 1/1, it's a Spirit in addition to its other types, and it has flying. - // Put a black Zombie creature token onto the battlefield with power equal to that card's power and toughness equal that card's toughness. + // {5}, {T}, Sacrifice Soul Separator: Exile target creature card from your graveyard. + // Create a token that's a copy of that card except it's 1/1, it's a Spirit in addition to its other types, and it has flying. + // Create a black Zombie creature token onto the battlefield with power equal to that card's power and toughness equal that card's toughness. addCard(Zone.BATTLEFIELD, playerA, "Soul Separator"); addCard(Zone.BATTLEFIELD, playerA, "Swamp", 5); - + // Tree of Perdition {3}{B} Creature - Defender (0/13) // {tap}: Exchange target opponent's life total with Tree of Perdition's toughness. addCard(Zone.GRAVEYARD, playerA, "Tree of Perdition"); - + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{5}"); addTarget(playerA, "Tree of Perdition"); activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Exchange"); addTarget(playerA, playerB); - + setStopAt(3, PhaseStep.BEGIN_COMBAT); execute(); - + assertGraveyardCount(playerA, "Soul Separator", 1); assertExileCount("Tree of Perdition", 1); assertPermanentCount(playerA, "Tree of Perdition", 1); assertPermanentCount(playerA, "Zombie", 1); assertPowerToughness(playerA, "Zombie", 0, 13); - + Permanent treeToken = getPermanent("Tree of Perdition", playerA); Assert.assertTrue(treeToken.getAbilities().contains(FlyingAbility.getInstance())); - Assert.assertTrue(treeToken.getSubtype(currentGame).contains("Spirit")); + Assert.assertTrue(treeToken.getSubtype(currentGame).contains("Spirit")); Assert.assertTrue(treeToken.getAbilities().contains(DefenderAbility.getInstance())); - + assertLife(playerA, 20); assertLife(playerB, 1); assertPowerToughness(playerA, "Tree of Perdition", 1, 20); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/lrw/BurrentonForgeTenderTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/lrw/BurrentonForgeTenderTest.java index d9a8b34be21..f08a443b5ad 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/lrw/BurrentonForgeTenderTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/lrw/BurrentonForgeTenderTest.java @@ -131,7 +131,7 @@ public class BurrentonForgeTenderTest extends CardTestPlayerBase { addCard(Zone.HAND, playerA, "Orzhov Charm"); // Kicker {5} (You may pay an additional as you cast this spell.) - // Put a token onto the battlefield that's a copy of target creature. If Rite of Replication was kicked, put five of those tokens onto the battlefield instead. + // Create a tokenonto the battlefield that's a copy of target creature. If Rite of Replication was kicked, put five of those tokens onto the battlefield instead. addCard(Zone.HAND, playerB, "Rite of Replication"); addCard(Zone.BATTLEFIELD, playerB, "Island", 4); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/BriarbridgePatrolTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/BriarbridgePatrolTest.java index 35d12ea02c9..9bbcb7cc209 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/BriarbridgePatrolTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/BriarbridgePatrolTest.java @@ -46,7 +46,7 @@ public class BriarbridgePatrolTest extends CardTestPlayerBase { */ @Test public void dealtNonCombatDamageToCreatureInvestigate() { - // Whenever Briarbridge Patrol deals damage to one or more creatures, investigate (Put a colorless Clue artifact token onto the battlefield with "2, Sacrifice this artifact: Draw a card."). + // Whenever Briarbridge Patrol deals damage to one or more creatures, investigate (Create a colorless Clue artifact token onto the battlefield with "2, Sacrifice this artifact: Draw a card."). // At the beginning of each end step, if you sacrificed three or more Clues this turn, you may put a creature card from your hand onto the battlefield. addCard(Zone.BATTLEFIELD, playerA, "Briarbridge Patrol", 1); addCard(Zone.BATTLEFIELD, playerB, "Wall of Roots", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/ThingInTheIceTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/ThingInTheIceTest.java index 045b838f7bd..c6736d348a3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/ThingInTheIceTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/soi/ThingInTheIceTest.java @@ -25,7 +25,7 @@ public class ThingInTheIceTest extends CardTestPlayerBase { */ @Test public void testClueTokens() { - // Whenever a land enters the battlefield under your control, investigate. (Put a colorless Clue artifact token onto the battlefield with "{2}, Sacrifice this artifact: Draw a card.") + // Whenever a land enters the battlefield under your control, investigate. (Create a colorless Clue artifact token onto the battlefield with "{2}, Sacrifice this artifact: Draw a card.") // Whenever you sacrifice a Clue, put a +1/+1 counter on Tireless Tracker. addCard(Zone.BATTLEFIELD, playerA, "Tireless Tracker", 1); // Human, Scout 3/2 addCard(Zone.HAND, playerA, "Forest", 1); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/KarmicJusticeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/KarmicJusticeTest.java index 8b3f88fcfa8..a57fe698577 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/KarmicJusticeTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/KarmicJusticeTest.java @@ -36,15 +36,13 @@ import org.mage.test.serverside.base.CardTestPlayerBase; * * @author LevelX2 */ - public class KarmicJusticeTest extends CardTestPlayerBase { /* Karmic Justice - Whenever a spell or ability an opponent controls destroys a noncreature permanent you control, + Whenever a spell or ability an opponent controls destroys a noncreature permanent you control, you may destroy target permanent that opponent controls. - */ - + */ /** * Karmic Justice should triggers for its own destroyment */ @@ -73,8 +71,8 @@ public class KarmicJusticeTest extends CardTestPlayerBase { */ @Test public void testMultiplePermanentsDestroyedTriggeredAbility() { - // At the beginning of each upkeep, if you lost life last turn, put a 1/1 white Soldier creature token onto the battlefield. - addCard(Zone.BATTLEFIELD, playerA, "First Response",2); + // At the beginning of each upkeep, if you lost life last turn, create a 1/1 white Soldier creature token. + addCard(Zone.BATTLEFIELD, playerA, "First Response", 2); addCard(Zone.BATTLEFIELD, playerA, "Karmic Justice"); // Planar Cleansing {3}{W}{W}{W} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToHandEffectsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToHandEffectsTest.java index 095b2b0a85b..5249eeb889d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToHandEffectsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToHandEffectsTest.java @@ -78,7 +78,7 @@ public class ReturnToHandEffectsTest extends CardTestPlayerBase { // Whenever Stormfront Riders or another creature is returned to your hand from the battlefield, put a 1/1 white Soldier creature token onto the battlefield. addCard(Zone.HAND, playerA, "Stormfront Riders"); // {4}{W} // 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.) - // Put a 1/1 black Rat creature token onto the battlefield. + // Create a 1/1 black Rat creature token. addCard(Zone.HAND, playerA, "Lab Rats"); // {B} addCard(Zone.BATTLEFIELD, playerB, "Island", 2); diff --git a/Mage.Tests/src/test/java/org/mage/test/combat/DamageDistributionTest.java b/Mage.Tests/src/test/java/org/mage/test/combat/DamageDistributionTest.java index 7cc74ef5b0b..cb268a8524e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/combat/DamageDistributionTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/combat/DamageDistributionTest.java @@ -1,6 +1,5 @@ package org.mage.test.combat; - import mage.constants.PhaseStep; import mage.constants.Zone; import mage.counters.CounterType; @@ -74,9 +73,8 @@ public class DamageDistributionTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerB, "Drogskol Reaver"); addCard(Zone.BATTLEFIELD, playerB, "Primal Rage"); - attack(2, playerB, "Drogskol Reaver"); - block(2,playerA,"Darksteel Gargoyle","Drogskol Reaver"); + block(2, playerA, "Darksteel Gargoyle", "Drogskol Reaver"); setStopAt(2, PhaseStep.END_TURN); execute(); @@ -91,22 +89,21 @@ public class DamageDistributionTest extends CardTestPlayerBase { } /** - * + * */ - @Test public void testDoubleStrikeTrampleVersusIndestructibleGod() { /** - * Heliod, God of the Sun - * Legendary Enchantment Creature — God 5/6, 3W - * Indestructible - * As long as your devotion to white is less than five, Heliod isn't a creature. (Each {W} in the mana costs of permanents you control counts toward your devotion to white.) - * Other creatures you control have vigilance. - * {2}{W}{W}: Put a 2/1 white Cleric enchantment creature token onto the battlefield. + * Heliod, God of the Sun Legendary Enchantment Creature — God 5/6, 3W + * Indestructible As long as your devotion to white is less than five, + * Heliod isn't a creature. (Each {W} in the mana costs of permanents + * you control counts toward your devotion to white.) Other creatures + * you control have vigilance. {2}{W}{W}: Create a 2/1 white Cleric + * enchantment creature token. */ addCard(Zone.BATTLEFIELD, playerA, "Heliod, God of the Sun"); addCard(Zone.BATTLEFIELD, playerA, "Terra Eternal"); // only for devotion - addCard(Zone.BATTLEFIELD, playerA, "Terra Eternal"); // only for devotion + addCard(Zone.BATTLEFIELD, playerA, "Terra Eternal"); // only for devotion /* Primeval Titan * Creature — Giant 6/6, 4GG @@ -124,10 +121,9 @@ public class DamageDistributionTest extends CardTestPlayerBase { // Enchanted creature has double strike. addCard(Zone.HAND, playerB, "Battle Mastery"); - - castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Battle Mastery","Primeval Titan"); + castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Battle Mastery", "Primeval Titan"); attack(2, playerB, "Primeval Titan"); - block(2,playerA,"Heliod, God of the Sun","Primeval Titan"); + block(2, playerA, "Heliod, God of the Sun", "Primeval Titan"); setStopAt(2, PhaseStep.END_TURN); execute(); @@ -142,8 +138,8 @@ public class DamageDistributionTest extends CardTestPlayerBase { assertPermanentCount(playerA, "Heliod, God of the Sun", 1); assertPowerToughness(playerA, "Heliod, God of the Sun", 5, 6); assertPermanentCount(playerB, "Primeval Titan", 1); - assertPowerToughness(playerB, "Primeval Titan", 6,6); - + assertPowerToughness(playerB, "Primeval Titan", 6, 6); + } /** @@ -151,24 +147,24 @@ public class DamageDistributionTest extends CardTestPlayerBase { */ @Test public void testCombatDamagePhyrexianUnlife() { - addCard(Zone.HAND, playerA, "Lightning Bolt",6); - addCard(Zone.BATTLEFIELD, playerA, "Mountain",6); + addCard(Zone.HAND, playerA, "Lightning Bolt", 6); + addCard(Zone.BATTLEFIELD, playerA, "Mountain", 6); /** - * Phyrexian Unlife {2}{W} - * Enchantment + * Phyrexian Unlife {2}{W} Enchantment * - * You don't lose the game for having 0 or less life. - * As long as you have 0 or less life, all damage is dealt to you as though its source had infect. + * You don't lose the game for having 0 or less life. As long as you + * have 0 or less life, all damage is dealt to you as though its source + * had infect. */ addCard(Zone.BATTLEFIELD, playerA, "Phyrexian Unlife"); - addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion",2); + addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion", 2); - castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt","targetPlayer=PlayerA"); - castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt","targetPlayer=PlayerA"); - castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt","targetPlayer=PlayerA"); - castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt","targetPlayer=PlayerA"); - castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt","targetPlayer=PlayerA"); - castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt","targetPlayer=PlayerA"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "targetPlayer=PlayerA"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "targetPlayer=PlayerA"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "targetPlayer=PlayerA"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "targetPlayer=PlayerA"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "targetPlayer=PlayerA"); + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "targetPlayer=PlayerA"); attack(2, playerB, "Silvercoat Lion"); attack(2, playerB, "Silvercoat Lion"); diff --git a/Mage.Tests/src/test/java/org/mage/test/lki/LastKnownInformationTest.java b/Mage.Tests/src/test/java/org/mage/test/lki/LastKnownInformationTest.java index 64d79632015..ef914921778 100644 --- a/Mage.Tests/src/test/java/org/mage/test/lki/LastKnownInformationTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/lki/LastKnownInformationTest.java @@ -70,7 +70,7 @@ public class LastKnownInformationTest extends CardTestPlayerBase { @Test public void testTrostaniSelesnyasVoice1() { // Whenever another creature enters the battlefield under your control, you gain life equal to that creature's toughness. - // {1}{G}{W}, {T}: Populate. (Put a token onto the battlefield that's a copy of a creature token you control.) + // {1}{G}{W}, {T}: Populate. (Create a tokenonto the battlefield that's a copy of a creature token you control.) addCard(Zone.BATTLEFIELD, playerA, "Trostani, Selesnya's Voice"); addCard(Zone.BATTLEFIELD, playerA, "Forest", 3); diff --git a/Mage.Tests/src/test/java/org/mage/test/multiplayer/MyriadTest.java b/Mage.Tests/src/test/java/org/mage/test/multiplayer/MyriadTest.java index 461f8ad7c45..8b1e43783e3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/multiplayer/MyriadTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/multiplayer/MyriadTest.java @@ -100,7 +100,7 @@ public class MyriadTest extends CardTestMultiPlayerBase { // +1: You gain 2 life. // -1: Put a +1/+1 counter on each creature you control. Those creatures gain vigilance until end of turn. - // -6: Put a white Avatar creature token onto the battlefield. It has "This creature's power and toughness are each equal to your life total." + // -6: Create a white Avatar creature token. It has "This creature's power and toughness are each equal to your life total." addCard(Zone.BATTLEFIELD, playerA, "Ajani Goldmane"); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+1:"); diff --git a/Mage.Tests/src/test/java/org/mage/test/rollback/NewCreaturesAreRemovedTest.java b/Mage.Tests/src/test/java/org/mage/test/rollback/NewCreaturesAreRemovedTest.java index bab2478981d..a2cff8a254a 100644 --- a/Mage.Tests/src/test/java/org/mage/test/rollback/NewCreaturesAreRemovedTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/rollback/NewCreaturesAreRemovedTest.java @@ -49,7 +49,7 @@ public class NewCreaturesAreRemovedTest extends CardTestPlayerBase { @Test public void testTamiyosJournal() { addCard(Zone.BATTLEFIELD, playerA, "Swamp", 5); - // At the beginning of your upkeep, investigate (Put a colorless Clue artifact token onto the battlefield with \"{2}, Sacrifice this artifact: Draw a card.\"). + // At the beginning of your upkeep, investigate (Create a colorless Clue artifact token onto the battlefield with \"{2}, Sacrifice this artifact: Draw a card.\"). // {T}, Sacrifice three Clues: Search your library for a card and put that card into your hand. Then shuffle your library. addCard(Zone.HAND, playerA, "Tamiyo's Journal"); // Artifact {5} addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion", 3); @@ -89,7 +89,7 @@ public class NewCreaturesAreRemovedTest extends CardTestPlayerBase { @Test public void testTamiyosJournalAndRollback() { addCard(Zone.BATTLEFIELD, playerA, "Swamp", 5); - // At the beginning of your upkeep, investigate (Put a colorless Clue artifact token onto the battlefield with \"{2}, Sacrifice this artifact: Draw a card.\"). + // At the beginning of your upkeep, investigate (Create a colorless Clue artifact token onto the battlefield with \"{2}, Sacrifice this artifact: Draw a card.\"). // {T}, Sacrifice three Clues: Search your library for a card and put that card into your hand. Then shuffle your library. addCard(Zone.HAND, playerA, "Tamiyo's Journal"); // Artifact {5} diff --git a/Mage.Tests/src/test/java/org/mage/test/rollback/StateValuesTest.java b/Mage.Tests/src/test/java/org/mage/test/rollback/StateValuesTest.java index 0eb60c4a695..bffa982f92c 100644 --- a/Mage.Tests/src/test/java/org/mage/test/rollback/StateValuesTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/rollback/StateValuesTest.java @@ -69,7 +69,7 @@ public class StateValuesTest extends CardTestPlayerBase { @Test public void testBriarbridgePatrol() { - // Whenever Briarbridge Patrol deals damage to one or more creatures, investigate (Put a colorless Clue artifact token onto the battlefield with "2, Sacrifice this artifact: Draw a card."). + // Whenever Briarbridge Patrol deals damage to one or more creatures, investigate (Create a colorless Clue artifact token onto the battlefield with "2, Sacrifice this artifact: Draw a card."). // At the beginning of each end step, if you sacrificed three or more Clues this turn, you may put a creature card from your hand onto the battlefield. addCard(Zone.BATTLEFIELD, playerA, "Briarbridge Patrol", 1); // 3/3 diff --git a/Mage.Tests/src/test/java/org/mage/test/token/ActivatedAbilityTest.java b/Mage.Tests/src/test/java/org/mage/test/token/ActivatedAbilityTest.java index 0be664eeb92..8c5e3523e43 100644 --- a/Mage.Tests/src/test/java/org/mage/test/token/ActivatedAbilityTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/token/ActivatedAbilityTest.java @@ -39,6 +39,7 @@ import org.mage.test.serverside.base.CardTestPlayerBase; * @author LevelX2 */ public class ActivatedAbilityTest extends CardTestPlayerBase { + /** * Check that activated ability of created token works */ @@ -49,14 +50,14 @@ public class ActivatedAbilityTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Omnath, Locus of Mana", 1); addCard(Zone.BATTLEFIELD, playerA, "Freyalise, Llanowar's Fury"); - activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+2: Put a 1/1 green Elf Druid creature token with \"{t}: Add {G} to your mana pool.\" onto the battlefield."); - activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "+2: Put a 1/1 green Elf Druid creature token with \"{t}: Add {G} to your mana pool.\" onto the battlefield."); + activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "+2: Create a 1/1 green Elf Druid creature token with \"{T}: Add {G} to your mana pool.\""); + activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "+2: Create a 1/1 green Elf Druid creature token with \"{T}: Add {G} to your mana pool.\""); activateManaAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Add {G} to your mana pool."); setStopAt(3, PhaseStep.PRECOMBAT_MAIN); execute(); assertPermanentCount(playerA, "Elf Druid", 2); assertPermanentCount(playerA, "Freyalise, Llanowar's Fury", 1); - Assert.assertEquals("one green mana has to be in the mana pool",1,playerA.getManaPool().get(ManaType.GREEN)); + Assert.assertEquals("one green mana has to be in the mana pool", 1, playerA.getManaPool().get(ManaType.GREEN)); } } diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/InvestigateEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/InvestigateEffect.java index 96fb6261218..395b4fb37b2 100644 --- a/Mage/src/main/java/mage/abilities/effects/keyword/InvestigateEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/keyword/InvestigateEffect.java @@ -19,7 +19,7 @@ public class InvestigateEffect extends CreateTokenEffect { public InvestigateEffect() { super(new ClueArtifactToken()); - this.staticText = "Investigate. (Put a colorless Clue artifact token onto the battlefield with \"{2}, Sacrifice this artifact: Draw a card.\")"; + this.staticText = "Investigate. (Create a colorless Clue artifact token onto the battlefield with \"{2}, Sacrifice this artifact: Draw a card.\")"; } public InvestigateEffect(final InvestigateEffect effect) { diff --git a/Mage/src/main/java/mage/abilities/keyword/LivingWeaponAbility.java b/Mage/src/main/java/mage/abilities/keyword/LivingWeaponAbility.java index 664908e6672..edd5a92efad 100644 --- a/Mage/src/main/java/mage/abilities/keyword/LivingWeaponAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/LivingWeaponAbility.java @@ -3,7 +3,6 @@ package mage.abilities.keyword; import java.util.ArrayList; import java.util.Arrays; import java.util.List; - import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -15,17 +14,18 @@ import mage.game.permanent.token.Token; import mage.players.Player; public class LivingWeaponAbility extends EntersBattlefieldTriggeredAbility { + public LivingWeaponAbility() { super(new LivingWeaponEffect()); } - public LivingWeaponAbility(final LivingWeaponAbility ability) { + public LivingWeaponAbility(final LivingWeaponAbility ability) { super(ability); } @Override public String getRule() { - return "Living weapon (When this Equipment enters the battlefield, put a 0/0 black Germ creature token onto the battlefield, then attach this to it.)"; + return "Living weapon (When this Equipment enters the battlefield, create a 0/0 black Germ creature token, then attach this to it.)"; } @Override @@ -35,6 +35,7 @@ public class LivingWeaponAbility extends EntersBattlefieldTriggeredAbility { } class LivingWeaponEffect extends CreateTokenEffect { + LivingWeaponEffect() { super(new GermToken()); } @@ -81,4 +82,4 @@ class GermToken extends Token { power = new MageInt(0); toughness = new MageInt(0); } -} \ No newline at end of file +} diff --git a/Mage/src/main/java/mage/game/permanent/token/ClueArtifactToken.java b/Mage/src/main/java/mage/game/permanent/token/ClueArtifactToken.java index 0e2ffa5785c..c7068ad9819 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ClueArtifactToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ClueArtifactToken.java @@ -30,7 +30,6 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Random; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -52,7 +51,7 @@ public class ClueArtifactToken extends Token { } public ClueArtifactToken() { - super("Clue", "colorless Clue artifact token onto the battlefield with \"{2}, Sacrifice this artifact: Draw a card.\""); + super("Clue", "colorless Clue artifact token with \"{2}, Sacrifice this artifact: Draw a card.\""); availableImageSetCodes = tokenImageSets; cardType.add(CardType.ARTIFACT); subtype.add("Clue"); @@ -65,7 +64,6 @@ public class ClueArtifactToken extends Token { this.addAbility(ability); } - @Override public void setExpansionSetCodeForImage(String code) { super.setExpansionSetCodeForImage(code); diff --git a/Mage/src/main/java/mage/game/permanent/token/Token.java b/Mage/src/main/java/mage/game/permanent/token/Token.java index 012f07187f5..d42315cb395 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Token.java @@ -29,7 +29,6 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.List; -import java.util.Random; import java.util.UUID; import mage.MageObject; import mage.MageObjectImpl; @@ -115,23 +114,23 @@ public class Token extends MageObjectImpl { this.copySourceCard = token.copySourceCard; // will never be changed this.availableImageSetCodes = token.availableImageSetCodes; } - + private void setTokenDescriptor() { this.tokenDescriptor = tokenDescriptor(); } - + public String getTokenDescriptor() { this.tokenDescriptor = tokenDescriptor(); return tokenDescriptor; } - + private String tokenDescriptor() { String name = this.name.replaceAll("[^a-zA-Z0-9]", ""); String color = this.color.toString().replaceAll("[^a-zA-Z0-9]", ""); String subtype = this.subtype.toString().replaceAll("[^a-zA-Z0-9]", ""); String cardType = this.cardType.toString().replaceAll("[^a-zA-Z0-9]", ""); String originalset = this.getOriginalExpansionSetCode(); - String descriptor = name + "." + color + "." + subtype + "." + cardType + "." + this.power + "." + this.toughness ; + String descriptor = name + "." + color + "." + subtype + "." + cardType + "." + this.power + "." + this.toughness; descriptor = descriptor.toUpperCase(); return descriptor; } @@ -231,7 +230,7 @@ public class Token extends MageObjectImpl { game.getCombat().addAttackingCreature(permanent.getId(), game, attackedPlayer); } if (!game.isSimulation()) { - game.informPlayers(controller.getLogName() + " puts a " + permanent.getLogName() + " token onto the battlefield"); + game.informPlayers(controller.getLogName() + " puts a " + permanent.getLogName() + " token"); } } @@ -263,8 +262,8 @@ public class Token extends MageObjectImpl { public void setOriginalCardNumber(String originalCardNumber) { this.originalCardNumber = originalCardNumber; } - - public String getOriginalExpansionSetCode() { + + public String getOriginalExpansionSetCode() { return originalExpansionSetCode; } @@ -287,20 +286,16 @@ public class Token extends MageObjectImpl { if (availableImageSetCodes.size() > 0) { if (availableImageSetCodes.contains(code)) { setOriginalExpansionSetCode(code); - } else { - // we should not set random set if appropriate set is already used - if (getOriginalExpansionSetCode() == null || getOriginalExpansionSetCode().isEmpty() - || !availableImageSetCodes.contains(getOriginalExpansionSetCode())) { - setOriginalExpansionSetCode(availableImageSetCodes.get(RandomUtil.nextInt(availableImageSetCodes.size()))); - } - } - } else { - if (getOriginalExpansionSetCode() == null || getOriginalExpansionSetCode().isEmpty()) { - setOriginalExpansionSetCode(code); + } else // we should not set random set if appropriate set is already used + if (getOriginalExpansionSetCode() == null || getOriginalExpansionSetCode().isEmpty() + || !availableImageSetCodes.contains(getOriginalExpansionSetCode())) { + setOriginalExpansionSetCode(availableImageSetCodes.get(RandomUtil.nextInt(availableImageSetCodes.size()))); } + } else if (getOriginalExpansionSetCode() == null || getOriginalExpansionSetCode().isEmpty()) { + setOriginalExpansionSetCode(code); } setTokenDescriptor(); - } + } public boolean updateExpansionSetCode(String setCode) { if (setCode == null || setCode.isEmpty()) {