From 69189e5a59f100fd9674280f818da5a51eeded85 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Sun, 3 Apr 2022 11:18:30 -0400 Subject: [PATCH] removed unnecessary card argument from various abilities --- Mage.Sets/src/mage/cards/a/AbandonReason.java | 2 +- Mage.Sets/src/mage/cards/a/AbominationOfGudul.java | 2 +- Mage.Sets/src/mage/cards/a/AbzanGuide.java | 2 +- Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java | 2 +- Mage.Sets/src/mage/cards/a/AerieBowmasters.java | 2 +- Mage.Sets/src/mage/cards/a/AinokSurvivalist.java | 2 +- Mage.Sets/src/mage/cards/a/AinokTracker.java | 2 +- Mage.Sets/src/mage/cards/a/AkromaAngelOfFury.java | 2 +- Mage.Sets/src/mage/cards/a/AlchemistsGreeting.java | 2 +- Mage.Sets/src/mage/cards/a/AleshasVanguard.java | 2 +- Mage.Sets/src/mage/cards/a/AlmsOfTheVein.java | 2 +- Mage.Sets/src/mage/cards/a/AmbuscadeShaman.java | 2 +- Mage.Sets/src/mage/cards/a/AnjesRavager.java | 2 +- Mage.Sets/src/mage/cards/a/AphettoAlchemist.java | 2 +- .../src/mage/cards/a/AphettoExterminator.java | 2 +- Mage.Sets/src/mage/cards/a/AquamorphEntity.java | 3 +-- Mage.Sets/src/mage/cards/a/ArchfiendOfSpite.java | 2 +- Mage.Sets/src/mage/cards/a/ArrogantWurm.java | 2 +- Mage.Sets/src/mage/cards/a/AscendingAven.java | 2 +- Mage.Sets/src/mage/cards/a/AshcloudPhoenix.java | 2 +- Mage.Sets/src/mage/cards/a/AsylumVisitor.java | 2 +- Mage.Sets/src/mage/cards/a/AtarkaEfreet.java | 2 +- Mage.Sets/src/mage/cards/a/AvacynsJudgment.java | 2 +- Mage.Sets/src/mage/cards/a/AvenLiberator.java | 2 +- Mage.Sets/src/mage/cards/a/AvenSunstriker.java | 2 +- Mage.Sets/src/mage/cards/b/BaneOfTheLiving.java | 2 +- Mage.Sets/src/mage/cards/b/BaskingRootwalla.java | 2 +- Mage.Sets/src/mage/cards/b/BatteringCraghorn.java | 2 +- Mage.Sets/src/mage/cards/b/BelltollDragon.java | 2 +- Mage.Sets/src/mage/cards/b/BigGameHunter.java | 2 +- Mage.Sets/src/mage/cards/b/BirchloreRangers.java | 2 +- Mage.Sets/src/mage/cards/b/BitingRain.java | 2 +- Mage.Sets/src/mage/cards/b/BlastFromThePast.java | 3 +-- Mage.Sets/src/mage/cards/b/BlazingRootwalla.java | 2 +- Mage.Sets/src/mage/cards/b/BlisteringFirecat.java | 2 +- Mage.Sets/src/mage/cards/b/BloodhallPriest.java | 2 +- Mage.Sets/src/mage/cards/b/BloodmadVampire.java | 2 +- Mage.Sets/src/mage/cards/b/BloodstokeHowler.java | 2 +- Mage.Sets/src/mage/cards/b/Boneknitter.java | 2 +- Mage.Sets/src/mage/cards/b/BrainGorgers.java | 2 +- Mage.Sets/src/mage/cards/b/BranchsnapLorian.java | 2 +- Mage.Sets/src/mage/cards/b/BrineElemental.java | 2 +- .../src/mage/cards/b/BrokenConcentration.java | 2 +- Mage.Sets/src/mage/cards/b/BroodhatchNantuko.java | 2 +- Mage.Sets/src/mage/cards/c/CabalExecutioner.java | 3 +-- .../src/mage/cards/c/CallToTheNetherworld.java | 2 +- Mage.Sets/src/mage/cards/c/CanyonLurkers.java | 2 +- Mage.Sets/src/mage/cards/c/ChargingSlateback.java | 2 +- Mage.Sets/src/mage/cards/c/ChillingGrasp.java | 2 +- Mage.Sets/src/mage/cards/c/ChromeshellCrab.java | 2 +- Mage.Sets/src/mage/cards/c/CircularLogic.java | 2 +- Mage.Sets/src/mage/cards/c/CoralTrickster.java | 2 +- Mage.Sets/src/mage/cards/c/CrudeRampart.java | 2 +- Mage.Sets/src/mage/cards/c/CurseOfFoolsWisdom.java | 2 +- Mage.Sets/src/mage/cards/d/DarkWithering.java | 2 +- Mage.Sets/src/mage/cards/d/DaruHealer.java | 2 +- Mage.Sets/src/mage/cards/d/DaruLancer.java | 2 +- Mage.Sets/src/mage/cards/d/DaruMender.java | 2 +- Mage.Sets/src/mage/cards/d/DaruSanctifier.java | 2 +- Mage.Sets/src/mage/cards/d/DawningPurist.java | 2 +- Mage.Sets/src/mage/cards/d/DeathmistRaptor.java | 2 +- Mage.Sets/src/mage/cards/d/DefenderOfTheOrder.java | 2 +- Mage.Sets/src/mage/cards/d/DenProtector.java | 2 +- Mage.Sets/src/mage/cards/d/Dermoplasm.java | 2 +- Mage.Sets/src/mage/cards/d/DirgurNemesis.java | 2 +- Mage.Sets/src/mage/cards/d/DisruptivePitmage.java | 2 +- .../src/mage/cards/d/DistemperOfTheBlood.java | 2 +- Mage.Sets/src/mage/cards/d/DjinnIlluminatus.java | 2 +- Mage.Sets/src/mage/cards/d/DragonsEyeSavants.java | 2 +- Mage.Sets/src/mage/cards/d/DulcetSirens.java | 2 +- Mage.Sets/src/mage/cards/d/DwarvenBlastminer.java | 2 +- Mage.Sets/src/mage/cards/e/EbonbladeReaper.java | 2 +- Mage.Sets/src/mage/cards/e/EchoTracer.java | 2 +- Mage.Sets/src/mage/cards/e/EfreetWeaponmaster.java | 2 +- Mage.Sets/src/mage/cards/e/ExaltedAngel.java | 2 +- Mage.Sets/src/mage/cards/f/FalkenrathGorger.java | 2 +- Mage.Sets/src/mage/cards/f/FallenCleric.java | 2 +- Mage.Sets/src/mage/cards/f/FathomSeer.java | 2 +- Mage.Sets/src/mage/cards/f/FieryTemper.java | 2 +- Mage.Sets/src/mage/cards/f/FlamerushRider.java | 2 +- Mage.Sets/src/mage/cards/f/FledglingMawcor.java | 2 +- Mage.Sets/src/mage/cards/f/FoothillGuide.java | 2 +- Mage.Sets/src/mage/cards/f/FortuneThief.java | 2 +- .../src/mage/cards/f/FranticPurification.java | 2 +- .../src/mage/cards/f/FromUnderTheFloorboards.java | 2 +- .../src/mage/cards/f/FrontlineStrategist.java | 2 +- Mage.Sets/src/mage/cards/g/GathanRaiders.java | 2 +- Mage.Sets/src/mage/cards/g/GibberingDescent.java | 2 +- Mage.Sets/src/mage/cards/g/GiftOfDoom.java | 2 +- Mage.Sets/src/mage/cards/g/Gigadrowse.java | 2 +- Mage.Sets/src/mage/cards/g/GisasBidding.java | 2 +- Mage.Sets/src/mage/cards/g/GlacialStalker.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinHeelcutter.java | 2 +- Mage.Sets/src/mage/cards/g/GoblinTaskmaster.java | 2 +- Mage.Sets/src/mage/cards/g/GorgonRecluse.java | 2 +- Mage.Sets/src/mage/cards/g/GraveScrabbler.java | 2 +- Mage.Sets/src/mage/cards/g/GravelSlinger.java | 2 +- Mage.Sets/src/mage/cards/g/GrimHaruspex.java | 2 +- Mage.Sets/src/mage/cards/g/GrinningDemon.java | 2 +- .../src/mage/cards/g/GuardianShieldBearer.java | 2 +- Mage.Sets/src/mage/cards/g/GudulLurker.java | 2 +- Mage.Sets/src/mage/cards/h/HauntedCadaver.java | 2 +- Mage.Sets/src/mage/cards/h/Headhunter.java | 2 +- Mage.Sets/src/mage/cards/h/HellMongrel.java | 2 +- Mage.Sets/src/mage/cards/h/HerdchaserDragon.java | 2 +- Mage.Sets/src/mage/cards/h/HiddenDragonslayer.java | 2 +- Mage.Sets/src/mage/cards/h/HoodedHydra.java | 2 +- Mage.Sets/src/mage/cards/h/HordeAmbusher.java | 2 +- Mage.Sets/src/mage/cards/h/Hystrodon.java | 2 +- Mage.Sets/src/mage/cards/i/IcefeatherAven.java | 2 +- Mage.Sets/src/mage/cards/i/IchorSlick.java | 2 +- Mage.Sets/src/mage/cards/i/ImperialHellkite.java | 2 +- Mage.Sets/src/mage/cards/i/IncorrigibleYouths.java | 2 +- Mage.Sets/src/mage/cards/i/InfernalCaretaker.java | 2 +- Mage.Sets/src/mage/cards/i/InsatiableGorgers.java | 2 +- Mage.Sets/src/mage/cards/i/IreShaman.java | 2 +- Mage.Sets/src/mage/cards/i/IronfistCrusher.java | 2 +- Mage.Sets/src/mage/cards/j/JeeringInstigator.java | 2 +- Mage.Sets/src/mage/cards/j/JustTheWind.java | 2 +- Mage.Sets/src/mage/cards/k/KadenasSilencer.java | 2 +- Mage.Sets/src/mage/cards/k/KaronasZealot.java | 2 +- Mage.Sets/src/mage/cards/k/KheruSpellsnatcher.java | 2 +- Mage.Sets/src/mage/cards/k/KinTreeWarden.java | 2 +- Mage.Sets/src/mage/cards/k/KitchenImp.java | 2 +- .../src/mage/cards/k/KolaghanForerunners.java | 2 +- Mage.Sets/src/mage/cards/k/KolaghanSkirmisher.java | 2 +- .../src/mage/cards/k/KolaghanStormsinger.java | 2 +- .../src/mage/cards/k/KolaghanTheStormsFury.java | 2 +- Mage.Sets/src/mage/cards/k/KrosanCloudscraper.java | 2 +- Mage.Sets/src/mage/cards/k/KrosanColossus.java | 2 +- Mage.Sets/src/mage/cards/k/KrumarBondKin.java | 2 +- Mage.Sets/src/mage/cards/l/LeapOfFlame.java | 2 +- Mage.Sets/src/mage/cards/l/LiegeOfTheAxe.java | 2 +- Mage.Sets/src/mage/cards/l/LiegeOfThePit.java | 2 +- Mage.Sets/src/mage/cards/l/LightningBerserker.java | 2 +- Mage.Sets/src/mage/cards/l/LoseFocus.java | 2 +- Mage.Sets/src/mage/cards/l/LumithreadField.java | 2 +- Mage.Sets/src/mage/cards/m/MaelstromDjinn.java | 2 +- Mage.Sets/src/mage/cards/m/MalevolentWhispers.java | 2 +- .../src/mage/cards/m/MarangRiverSkeleton.java | 2 +- Mage.Sets/src/mage/cards/m/MarduScout.java | 2 +- Mage.Sets/src/mage/cards/m/MarduShadowspear.java | 2 +- Mage.Sets/src/mage/cards/m/MarduStrikeLeader.java | 2 +- Mage.Sets/src/mage/cards/m/MarshHulk.java | 2 +- Mage.Sets/src/mage/cards/m/MasterOfPearls.java | 2 +- Mage.Sets/src/mage/cards/m/MasterOfTheVeil.java | 2 +- Mage.Sets/src/mage/cards/m/Mimeofacture.java | 2 +- Mage.Sets/src/mage/cards/m/MischievousQuanar.java | 2 +- Mage.Sets/src/mage/cards/m/MistfireWeaver.java | 2 +- Mage.Sets/src/mage/cards/m/MistformSeaswift.java | 2 +- Mage.Sets/src/mage/cards/m/MistformShrieker.java | 2 +- Mage.Sets/src/mage/cards/m/MisthoofKirin.java | 2 +- Mage.Sets/src/mage/cards/m/MonasteryFlock.java | 2 +- .../src/mage/cards/m/MonasteryLoremaster.java | 2 +- Mage.Sets/src/mage/cards/m/MuckDrubb.java | 2 +- .../src/mage/cards/m/MurderousCompulsion.java | 2 +- .../src/mage/cards/m/MysticOfTheHiddenWay.java | 2 +- Mage.Sets/src/mage/cards/n/NaggingThoughts.java | 2 +- Mage.Sets/src/mage/cards/n/NamelessOne.java | 2 +- Mage.Sets/src/mage/cards/n/NantukoVigilante.java | 2 +- Mage.Sets/src/mage/cards/n/Necrogoyf.java | 2 +- Mage.Sets/src/mage/cards/n/NightshadeAssassin.java | 2 +- Mage.Sets/src/mage/cards/o/ObsessiveSearch.java | 2 +- Mage.Sets/src/mage/cards/o/OjutaiInterceptor.java | 2 +- Mage.Sets/src/mage/cards/p/PatronOfTheWild.java | 2 +- Mage.Sets/src/mage/cards/p/PineWalker.java | 2 +- Mage.Sets/src/mage/cards/p/PitilessHorde.java | 2 +- Mage.Sets/src/mage/cards/p/PonybackBrigade.java | 3 +-- Mage.Sets/src/mage/cards/p/PrimalWhisperer.java | 2 +- Mage.Sets/src/mage/cards/p/ProteusMachine.java | 2 +- Mage.Sets/src/mage/cards/p/PsychoticEpisode.java | 2 +- Mage.Sets/src/mage/cards/p/PsychoticHaze.java | 2 +- Mage.Sets/src/mage/cards/p/PutridRaptor.java | 2 +- Mage.Sets/src/mage/cards/p/Pyromatics.java | 2 +- Mage.Sets/src/mage/cards/q/QuicksilverDragon.java | 2 +- .../src/mage/cards/r/RagavanNimblePilferer.java | 2 +- Mage.Sets/src/mage/cards/r/RattleclawMystic.java | 2 +- Mage.Sets/src/mage/cards/r/RavenGuildInitiate.java | 2 +- Mage.Sets/src/mage/cards/r/RavenGuildMaster.java | 2 +- Mage.Sets/src/mage/cards/r/RecklessImp.java | 2 +- Mage.Sets/src/mage/cards/r/RecklessWurm.java | 2 +- Mage.Sets/src/mage/cards/r/Revolutionist.java | 2 +- Mage.Sets/src/mage/cards/r/RiptideBiologist.java | 2 +- Mage.Sets/src/mage/cards/r/RiptideEntrancer.java | 2 +- Mage.Sets/src/mage/cards/r/RiptidePilferer.java | 2 +- Mage.Sets/src/mage/cards/r/RiptideSurvivor.java | 2 +- Mage.Sets/src/mage/cards/r/RockshardElemental.java | 2 +- Mage.Sets/src/mage/cards/r/RootElemental.java | 2 +- Mage.Sets/src/mage/cards/r/RuthlessRipper.java | 2 +- Mage.Sets/src/mage/cards/s/SageEyeHarrier.java | 2 +- Mage.Sets/src/mage/cards/s/SaguArcher.java | 2 +- Mage.Sets/src/mage/cards/s/SaguMauler.java | 2 +- Mage.Sets/src/mage/cards/s/SaltRoadAmbushers.java | 2 +- Mage.Sets/src/mage/cards/s/SandstormCharger.java | 2 +- Mage.Sets/src/mage/cards/s/ScornfulEgotist.java | 2 +- Mage.Sets/src/mage/cards/s/ScreamreachBrawler.java | 2 +- Mage.Sets/src/mage/cards/s/SegmentedKrotiq.java | 2 +- Mage.Sets/src/mage/cards/s/SenselessRage.java | 2 +- Mage.Sets/src/mage/cards/s/SerpentineBasilisk.java | 2 +- .../src/mage/cards/s/ShadowgrangeArchfiend.java | 2 +- Mage.Sets/src/mage/cards/s/ShaleskinPlower.java | 2 +- Mage.Sets/src/mage/cards/s/ShaperParasite.java | 2 +- Mage.Sets/src/mage/cards/s/ShatteringSpree.java | 2 +- Mage.Sets/src/mage/cards/s/ShieldhideDragon.java | 2 +- .../src/mage/cards/s/ShorecrasherElemental.java | 2 +- Mage.Sets/src/mage/cards/s/SidisisPet.java | 2 +- Mage.Sets/src/mage/cards/s/SiegeOfTowers.java | 2 +- Mage.Sets/src/mage/cards/s/SilentSpecter.java | 2 +- Mage.Sets/src/mage/cards/s/SilumgarAssassin.java | 2 +- Mage.Sets/src/mage/cards/s/SilumgarSpellEater.java | 2 +- Mage.Sets/src/mage/cards/s/Skinthinner.java | 2 +- Mage.Sets/src/mage/cards/s/SkirkCommando.java | 2 +- Mage.Sets/src/mage/cards/s/SkirkMarauder.java | 2 +- Mage.Sets/src/mage/cards/s/SkirkVolcanist.java | 2 +- Mage.Sets/src/mage/cards/s/SkittishValesk.java | 2 +- Mage.Sets/src/mage/cards/s/SkophosReaver.java | 2 +- Mage.Sets/src/mage/cards/s/SlipstreamSerpent.java | 2 +- Mage.Sets/src/mage/cards/s/SnappingThragg.java | 2 +- Mage.Sets/src/mage/cards/s/SnarlingUndorak.java | 2 +- Mage.Sets/src/mage/cards/s/SnowhornRider.java | 2 +- Mage.Sets/src/mage/cards/s/SootfeatherFlock.java | 2 +- Mage.Sets/src/mage/cards/s/SoulCollector.java | 2 +- Mage.Sets/src/mage/cards/s/SpinedBasher.java | 2 +- Mage.Sets/src/mage/cards/s/SpittingGourna.java | 2 +- Mage.Sets/src/mage/cards/s/SprintingWarbrute.java | 2 +- Mage.Sets/src/mage/cards/s/StensiaMasquerade.java | 3 +-- Mage.Sets/src/mage/cards/s/StormcragElemental.java | 2 +- Mage.Sets/src/mage/cards/s/StormwingDragon.java | 2 +- Mage.Sets/src/mage/cards/s/StratusDancer.java | 2 +- Mage.Sets/src/mage/cards/s/StreamOfThought.java | 2 +- .../src/mage/cards/s/StrengthOfIsolation.java | 2 +- Mage.Sets/src/mage/cards/s/StrengthOfLunacy.java | 2 +- Mage.Sets/src/mage/cards/s/StromkirkOccultist.java | 2 +- Mage.Sets/src/mage/cards/t/TemurCharger.java | 2 +- Mage.Sets/src/mage/cards/t/TerminalAgony.java | 2 +- Mage.Sets/src/mage/cards/t/TheloniteHermit.java | 2 +- Mage.Sets/src/mage/cards/t/ThousandWinds.java | 2 +- Mage.Sets/src/mage/cards/t/ThrashingMudspawn.java | 2 +- Mage.Sets/src/mage/cards/t/Thunderheads.java | 2 +- Mage.Sets/src/mage/cards/t/Timebender.java | 2 +- Mage.Sets/src/mage/cards/t/TitanicBulvox.java | 2 +- Mage.Sets/src/mage/cards/t/ToweringBaloth.java | 2 +- Mage.Sets/src/mage/cards/t/TrainOfThought.java | 2 +- Mage.Sets/src/mage/cards/t/TreespringLorian.java | 2 +- Mage.Sets/src/mage/cards/t/TreetopAmbusher.java | 2 +- Mage.Sets/src/mage/cards/t/TribalForcemage.java | 2 +- .../src/mage/cards/t/TwinsOfMaurerEstate.java | 2 +- Mage.Sets/src/mage/cards/u/UnblinkingBleb.java | 2 +- Mage.Sets/src/mage/cards/u/UnstableHulk.java | 2 +- Mage.Sets/src/mage/cards/v/Vacuumelt.java | 2 +- Mage.Sets/src/mage/cards/v/Vaultbreaker.java | 2 +- Mage.Sets/src/mage/cards/v/VenomspoutBrackus.java | 2 +- .../src/mage/cards/v/VesuvanShapeshifter.java | 2 +- Mage.Sets/src/mage/cards/v/ViolentEruption.java | 2 +- Mage.Sets/src/mage/cards/v/VoidmageApprentice.java | 2 +- Mage.Sets/src/mage/cards/v/VoidmageProdigy.java | 2 +- Mage.Sets/src/mage/cards/v/VoldarenPariah.java | 2 +- Mage.Sets/src/mage/cards/w/WallOfDeceit.java | 2 +- Mage.Sets/src/mage/cards/w/WarBehemoth.java | 2 +- Mage.Sets/src/mage/cards/w/WarbreakTrumpeter.java | 2 +- Mage.Sets/src/mage/cards/w/Warbringer.java | 2 +- Mage.Sets/src/mage/cards/w/WatcherOfTheRoost.java | 2 +- .../src/mage/cards/w/WeatheredBodyguards.java | 2 +- Mage.Sets/src/mage/cards/w/WeaverOfLies.java | 2 +- Mage.Sets/src/mage/cards/w/WeirdedVampire.java | 2 +- Mage.Sets/src/mage/cards/w/WelcomeToTheFold.java | 2 +- Mage.Sets/src/mage/cards/w/Whetwheel.java | 2 +- Mage.Sets/src/mage/cards/w/WhipSpineDrake.java | 2 +- Mage.Sets/src/mage/cards/w/Whipcorder.java | 2 +- Mage.Sets/src/mage/cards/w/Willbender.java | 2 +- Mage.Sets/src/mage/cards/w/WingbeatWarrior.java | 2 +- Mage.Sets/src/mage/cards/w/WitnessOfTheAges.java | 2 +- Mage.Sets/src/mage/cards/w/Woodcloaker.java | 2 +- Mage.Sets/src/mage/cards/w/WoollyLoxodon.java | 2 +- Mage.Sets/src/mage/cards/z/ZoeticCavern.java | 2 +- Mage.Sets/src/mage/cards/z/ZombieCutthroat.java | 2 +- Mage.Sets/src/mage/cards/z/ZurgoBellstriker.java | 2 +- .../java/mage/abilities/keyword/DashAbility.java | 4 ++-- .../mage/abilities/keyword/MadnessAbility.java | 6 +++--- .../java/mage/abilities/keyword/MorphAbility.java | 14 +++++++------- .../mage/abilities/keyword/ReplicateAbility.java | 2 +- Utils/keywords.txt | 8 ++++---- 282 files changed, 294 insertions(+), 299 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AbandonReason.java b/Mage.Sets/src/mage/cards/a/AbandonReason.java index 21247f12db..10e297ca4e 100644 --- a/Mage.Sets/src/mage/cards/a/AbandonReason.java +++ b/Mage.Sets/src/mage/cards/a/AbandonReason.java @@ -34,7 +34,7 @@ public final class AbandonReason extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent(0, 2)); // Madness {1}{R} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl<>("{1}{R}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{1}{R}"))); } private AbandonReason(final AbandonReason card) { diff --git a/Mage.Sets/src/mage/cards/a/AbominationOfGudul.java b/Mage.Sets/src/mage/cards/a/AbominationOfGudul.java index 516ee4e872..acab700c50 100644 --- a/Mage.Sets/src/mage/cards/a/AbominationOfGudul.java +++ b/Mage.Sets/src/mage/cards/a/AbominationOfGudul.java @@ -35,7 +35,7 @@ public final class AbominationOfGudul extends CardImpl { this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(effect, true)); // Morph 2BGU - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{B}{G}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{B}{G}{U}"))); } private AbominationOfGudul(final AbominationOfGudul card) { diff --git a/Mage.Sets/src/mage/cards/a/AbzanGuide.java b/Mage.Sets/src/mage/cards/a/AbzanGuide.java index 16b0df19ff..4f64e3f24f 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanGuide.java +++ b/Mage.Sets/src/mage/cards/a/AbzanGuide.java @@ -28,7 +28,7 @@ public final class AbzanGuide extends CardImpl { // Lifelink this.addAbility(LifelinkAbility.getInstance()); // Morph {2}{W}{B}{G} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{W}{B}{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{W}{B}{G}"))); } private AbzanGuide(final AbzanGuide card) { diff --git a/Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java b/Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java index 81047f0d9e..e7c3488df2 100644 --- a/Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java +++ b/Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java @@ -43,7 +43,7 @@ public final class AcidSpewerDragon extends CardImpl { this.addAbility(DeathtouchAbility.getInstance()); // Megamorph {5}{B}{B} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{5}{B}{B}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl("{5}{B}{B}"), true)); // When Acid-Spewer Dragon is turned face up, put a +1/+1 counter on each other Dragon creature you control. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter), false, false)); diff --git a/Mage.Sets/src/mage/cards/a/AerieBowmasters.java b/Mage.Sets/src/mage/cards/a/AerieBowmasters.java index f6bbbf1e10..e84f91122d 100644 --- a/Mage.Sets/src/mage/cards/a/AerieBowmasters.java +++ b/Mage.Sets/src/mage/cards/a/AerieBowmasters.java @@ -28,7 +28,7 @@ public final class AerieBowmasters extends CardImpl { this.addAbility(ReachAbility.getInstance()); // Megamorph {5}{G} (You may cast this card face down as a 2/2 creature for {3}. Turn it face up at any time for its megamorph cost and put a +1/+1 counter on it.)) - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{5}{G}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl("{5}{G}"), true)); } diff --git a/Mage.Sets/src/mage/cards/a/AinokSurvivalist.java b/Mage.Sets/src/mage/cards/a/AinokSurvivalist.java index 6e7db4e32b..58e059e30c 100644 --- a/Mage.Sets/src/mage/cards/a/AinokSurvivalist.java +++ b/Mage.Sets/src/mage/cards/a/AinokSurvivalist.java @@ -37,7 +37,7 @@ public final class AinokSurvivalist extends CardImpl { this.toughness = new MageInt(1); // Megamorph {1}{G} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{1}{G}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl("{1}{G}"), true)); // When Ainok Survivalist is turned face up, destroy target artifact or enchantment an opponent controls. Effect effect = new DestroyTargetEffect(); diff --git a/Mage.Sets/src/mage/cards/a/AinokTracker.java b/Mage.Sets/src/mage/cards/a/AinokTracker.java index 96105d9b3e..7c0f9ce5bb 100644 --- a/Mage.Sets/src/mage/cards/a/AinokTracker.java +++ b/Mage.Sets/src/mage/cards/a/AinokTracker.java @@ -28,7 +28,7 @@ public final class AinokTracker extends CardImpl { // First Strike this.addAbility(FirstStrikeAbility.getInstance()); // Morph 4R - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{4}{R}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{R}"))); } private AinokTracker(final AinokTracker card) { diff --git a/Mage.Sets/src/mage/cards/a/AkromaAngelOfFury.java b/Mage.Sets/src/mage/cards/a/AkromaAngelOfFury.java index 84b6c19806..538292d545 100644 --- a/Mage.Sets/src/mage/cards/a/AkromaAngelOfFury.java +++ b/Mage.Sets/src/mage/cards/a/AkromaAngelOfFury.java @@ -41,7 +41,7 @@ public final class AkromaAngelOfFury extends CardImpl { // {R}: Akroma, Angel of Fury gets +1/+0 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl("{R}"))); // Morph {3}{R}{R}{R} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{3}{R}{R}{R}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{R}{R}{R}"))); } private AkromaAngelOfFury(final AkromaAngelOfFury card) { diff --git a/Mage.Sets/src/mage/cards/a/AlchemistsGreeting.java b/Mage.Sets/src/mage/cards/a/AlchemistsGreeting.java index e87883fed1..6f40113936 100644 --- a/Mage.Sets/src/mage/cards/a/AlchemistsGreeting.java +++ b/Mage.Sets/src/mage/cards/a/AlchemistsGreeting.java @@ -24,7 +24,7 @@ public final class AlchemistsGreeting extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Madness {1}{R} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{1}{R}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{1}{R}"))); } private AlchemistsGreeting(final AlchemistsGreeting card) { diff --git a/Mage.Sets/src/mage/cards/a/AleshasVanguard.java b/Mage.Sets/src/mage/cards/a/AleshasVanguard.java index 019b3b3915..8a452e8c09 100644 --- a/Mage.Sets/src/mage/cards/a/AleshasVanguard.java +++ b/Mage.Sets/src/mage/cards/a/AleshasVanguard.java @@ -23,7 +23,7 @@ public final class AleshasVanguard extends CardImpl { this.toughness = new MageInt(3); // Dash {2}{B} - this.addAbility(new DashAbility(this, "{2}{B}")); + this.addAbility(new DashAbility("{2}{B}")); } private AleshasVanguard(final AleshasVanguard card) { diff --git a/Mage.Sets/src/mage/cards/a/AlmsOfTheVein.java b/Mage.Sets/src/mage/cards/a/AlmsOfTheVein.java index 4a8a016a14..54136ba48d 100644 --- a/Mage.Sets/src/mage/cards/a/AlmsOfTheVein.java +++ b/Mage.Sets/src/mage/cards/a/AlmsOfTheVein.java @@ -25,7 +25,7 @@ public final class AlmsOfTheVein extends CardImpl { this.getSpellAbility().addTarget(new TargetOpponent()); // Madness {B} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{B}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{B}"))); } private AlmsOfTheVein(final AlmsOfTheVein card) { diff --git a/Mage.Sets/src/mage/cards/a/AmbuscadeShaman.java b/Mage.Sets/src/mage/cards/a/AmbuscadeShaman.java index 65390caee2..5fe3acac16 100644 --- a/Mage.Sets/src/mage/cards/a/AmbuscadeShaman.java +++ b/Mage.Sets/src/mage/cards/a/AmbuscadeShaman.java @@ -35,7 +35,7 @@ public final class AmbuscadeShaman extends CardImpl { )); // Dash {3}{B} (You may cast this spell for its dash cost. If you do, it gains haste, and it's returned from the battlefield to its owner's hand at the beginning of the next end step.)); - this.addAbility(new DashAbility(this, "{3}{B}")); + this.addAbility(new DashAbility("{3}{B}")); } private AmbuscadeShaman(final AmbuscadeShaman card) { diff --git a/Mage.Sets/src/mage/cards/a/AnjesRavager.java b/Mage.Sets/src/mage/cards/a/AnjesRavager.java index 72ef6d7bbb..c9c7d416c4 100644 --- a/Mage.Sets/src/mage/cards/a/AnjesRavager.java +++ b/Mage.Sets/src/mage/cards/a/AnjesRavager.java @@ -39,7 +39,7 @@ public final class AnjesRavager extends CardImpl { this.addAbility(ability); // Madness {1}{R} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{1}{R}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{1}{R}"))); } private AnjesRavager(final AnjesRavager card) { diff --git a/Mage.Sets/src/mage/cards/a/AphettoAlchemist.java b/Mage.Sets/src/mage/cards/a/AphettoAlchemist.java index 2ae8d0bdef..aee72367d6 100644 --- a/Mage.Sets/src/mage/cards/a/AphettoAlchemist.java +++ b/Mage.Sets/src/mage/cards/a/AphettoAlchemist.java @@ -45,7 +45,7 @@ public final class AphettoAlchemist extends CardImpl { this.addAbility(ability); // Morph {U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{U}"))); } private AphettoAlchemist(final AphettoAlchemist card) { diff --git a/Mage.Sets/src/mage/cards/a/AphettoExterminator.java b/Mage.Sets/src/mage/cards/a/AphettoExterminator.java index 1ba67e66b2..36b883b428 100644 --- a/Mage.Sets/src/mage/cards/a/AphettoExterminator.java +++ b/Mage.Sets/src/mage/cards/a/AphettoExterminator.java @@ -30,7 +30,7 @@ public final class AphettoExterminator extends CardImpl { this.toughness = new MageInt(1); // Morph {3}{B} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{3}{B}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{B}"))); // When Aphetto Exterminator is turned face up, target creature gets -3/-3 until end of turn. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new BoostTargetEffect(-3,-3,Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/cards/a/AquamorphEntity.java b/Mage.Sets/src/mage/cards/a/AquamorphEntity.java index aa360fad7c..87f34fe9c9 100644 --- a/Mage.Sets/src/mage/cards/a/AquamorphEntity.java +++ b/Mage.Sets/src/mage/cards/a/AquamorphEntity.java @@ -16,7 +16,6 @@ import mage.constants.*; import mage.game.Game; import mage.game.events.EntersTheBattlefieldEvent; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; @@ -39,7 +38,7 @@ public final class AquamorphEntity extends CardImpl { this.addAbility(ability); // Morph {2}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{U}"))); } private AquamorphEntity(final AquamorphEntity card) { diff --git a/Mage.Sets/src/mage/cards/a/ArchfiendOfSpite.java b/Mage.Sets/src/mage/cards/a/ArchfiendOfSpite.java index a25c3ab7d0..6ff9b34ee2 100644 --- a/Mage.Sets/src/mage/cards/a/ArchfiendOfSpite.java +++ b/Mage.Sets/src/mage/cards/a/ArchfiendOfSpite.java @@ -42,7 +42,7 @@ public final class ArchfiendOfSpite extends CardImpl { this.addAbility(new ArchfiendOfSpiteAbility()); // Madness {3}{B}{B} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{3}{B}{B}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{3}{B}{B}"))); } diff --git a/Mage.Sets/src/mage/cards/a/ArrogantWurm.java b/Mage.Sets/src/mage/cards/a/ArrogantWurm.java index 4ca3d3b048..19c1cc99d1 100644 --- a/Mage.Sets/src/mage/cards/a/ArrogantWurm.java +++ b/Mage.Sets/src/mage/cards/a/ArrogantWurm.java @@ -28,7 +28,7 @@ public final class ArrogantWurm extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Madness {2}{G} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl<>("{2}{G}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{2}{G}"))); } private ArrogantWurm(final ArrogantWurm card) { diff --git a/Mage.Sets/src/mage/cards/a/AscendingAven.java b/Mage.Sets/src/mage/cards/a/AscendingAven.java index 2122b9be66..1770a937c2 100644 --- a/Mage.Sets/src/mage/cards/a/AscendingAven.java +++ b/Mage.Sets/src/mage/cards/a/AscendingAven.java @@ -30,7 +30,7 @@ public final class AscendingAven extends CardImpl { // Ascending Aven can block only creatures with flying. this.addAbility(new CanBlockOnlyFlyingAbility()); // Morph {2}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{U}"))); } private AscendingAven(final AscendingAven card) { diff --git a/Mage.Sets/src/mage/cards/a/AshcloudPhoenix.java b/Mage.Sets/src/mage/cards/a/AshcloudPhoenix.java index 6ec21a04e2..988585ad7b 100644 --- a/Mage.Sets/src/mage/cards/a/AshcloudPhoenix.java +++ b/Mage.Sets/src/mage/cards/a/AshcloudPhoenix.java @@ -39,7 +39,7 @@ public final class AshcloudPhoenix extends CardImpl { this.addAbility(new DiesSourceTriggeredAbility(new AshcloudPhoenixEffect())); // Morph {4}{R}{R} - this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{4}{R}{R}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{R}{R}"))); // When Ashcloud Phoenix is turned face up, it deals 2 damage to each player. Effect effect = new DamagePlayersEffect(2, TargetController.ANY); diff --git a/Mage.Sets/src/mage/cards/a/AsylumVisitor.java b/Mage.Sets/src/mage/cards/a/AsylumVisitor.java index f2b1087ce3..b201183278 100644 --- a/Mage.Sets/src/mage/cards/a/AsylumVisitor.java +++ b/Mage.Sets/src/mage/cards/a/AsylumVisitor.java @@ -41,7 +41,7 @@ public final class AsylumVisitor extends CardImpl { this.addAbility(ability); // Madness {1}{B} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{1}{B}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{1}{B}"))); } private AsylumVisitor(final AsylumVisitor card) { diff --git a/Mage.Sets/src/mage/cards/a/AtarkaEfreet.java b/Mage.Sets/src/mage/cards/a/AtarkaEfreet.java index d639798fdf..94b2ee5a42 100644 --- a/Mage.Sets/src/mage/cards/a/AtarkaEfreet.java +++ b/Mage.Sets/src/mage/cards/a/AtarkaEfreet.java @@ -29,7 +29,7 @@ public final class AtarkaEfreet extends CardImpl { this.toughness = new MageInt(1); // Megamorph {2}{R} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{R}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{R}"), true)); // When Atarka Efreet is turned face up, it deals 1 damage to any target. Effect effect = new DamageTargetEffect(1, "it"); diff --git a/Mage.Sets/src/mage/cards/a/AvacynsJudgment.java b/Mage.Sets/src/mage/cards/a/AvacynsJudgment.java index 3fe86e5fb3..c13154d5ae 100644 --- a/Mage.Sets/src/mage/cards/a/AvacynsJudgment.java +++ b/Mage.Sets/src/mage/cards/a/AvacynsJudgment.java @@ -25,7 +25,7 @@ public final class AvacynsJudgment extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{R}"); // Madness {X}{R} - Ability ability = new MadnessAbility(this, new ManaCostsImpl("{X}{R}")); + Ability ability = new MadnessAbility(new ManaCostsImpl("{X}{R}")); ability.setRuleAtTheTop(true); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AvenLiberator.java b/Mage.Sets/src/mage/cards/a/AvenLiberator.java index ec0647ce4c..18deae5c05 100644 --- a/Mage.Sets/src/mage/cards/a/AvenLiberator.java +++ b/Mage.Sets/src/mage/cards/a/AvenLiberator.java @@ -32,7 +32,7 @@ public final class AvenLiberator extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Morph {3}{W} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{3}{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{W}"))); // When Aven Liberator is turned face up, target creature you control gains protection from the color of your choice until end of turn. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new GainProtectionFromColorTargetEffect(Duration.EndOfTurn)); ability.addTarget(new TargetControlledCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/a/AvenSunstriker.java b/Mage.Sets/src/mage/cards/a/AvenSunstriker.java index c75cb4a63a..aa2765914e 100644 --- a/Mage.Sets/src/mage/cards/a/AvenSunstriker.java +++ b/Mage.Sets/src/mage/cards/a/AvenSunstriker.java @@ -30,7 +30,7 @@ public final class AvenSunstriker extends CardImpl { // Double strike this.addAbility(DoubleStrikeAbility.getInstance()); // Megamorph {4}{W} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{4}{W}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{W}"), true)); } private AvenSunstriker(final AvenSunstriker card) { diff --git a/Mage.Sets/src/mage/cards/b/BaneOfTheLiving.java b/Mage.Sets/src/mage/cards/b/BaneOfTheLiving.java index e0765a87d3..7d951ad6fc 100644 --- a/Mage.Sets/src/mage/cards/b/BaneOfTheLiving.java +++ b/Mage.Sets/src/mage/cards/b/BaneOfTheLiving.java @@ -31,7 +31,7 @@ public final class BaneOfTheLiving extends CardImpl { this.toughness = new MageInt(3); // Morph {X}{B}{B} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{X}{B}{B}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{X}{B}{B}"))); // When Bane of the Living is turned face up, all creatures get -X/-X until end of turn. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new BoostAllEffect(morphX, morphX, Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_ALL_CREATURES, false, null, true))); diff --git a/Mage.Sets/src/mage/cards/b/BaskingRootwalla.java b/Mage.Sets/src/mage/cards/b/BaskingRootwalla.java index f0573659be..b8c4bdbbe9 100644 --- a/Mage.Sets/src/mage/cards/b/BaskingRootwalla.java +++ b/Mage.Sets/src/mage/cards/b/BaskingRootwalla.java @@ -32,7 +32,7 @@ public final class BaskingRootwalla extends CardImpl { new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("{1}{G}"))); // Madness {0} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{0}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{0}"))); } private BaskingRootwalla(final BaskingRootwalla card) { diff --git a/Mage.Sets/src/mage/cards/b/BatteringCraghorn.java b/Mage.Sets/src/mage/cards/b/BatteringCraghorn.java index b28e0a4712..ea4ccd5fd6 100644 --- a/Mage.Sets/src/mage/cards/b/BatteringCraghorn.java +++ b/Mage.Sets/src/mage/cards/b/BatteringCraghorn.java @@ -27,7 +27,7 @@ public final class BatteringCraghorn extends CardImpl { // First strike this.addAbility(FirstStrikeAbility.getInstance()); // Morph {1}{R}{R} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{1}{R}{R}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{1}{R}{R}"))); } private BatteringCraghorn(final BatteringCraghorn card) { diff --git a/Mage.Sets/src/mage/cards/b/BelltollDragon.java b/Mage.Sets/src/mage/cards/b/BelltollDragon.java index d8385290b1..bb6ed0e1bc 100644 --- a/Mage.Sets/src/mage/cards/b/BelltollDragon.java +++ b/Mage.Sets/src/mage/cards/b/BelltollDragon.java @@ -41,7 +41,7 @@ public final class BelltollDragon extends CardImpl { // Hexproof this.addAbility(HexproofAbility.getInstance()); // Megamorph {5}{U}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{5}{U}{U}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl("{5}{U}{U}"), true)); // When Belltoll Dragon is turned face up, put a +1/+1 counter on each other Dragon creature you control. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter), false, false)); diff --git a/Mage.Sets/src/mage/cards/b/BigGameHunter.java b/Mage.Sets/src/mage/cards/b/BigGameHunter.java index cefa0d6c15..ca3cd824ca 100644 --- a/Mage.Sets/src/mage/cards/b/BigGameHunter.java +++ b/Mage.Sets/src/mage/cards/b/BigGameHunter.java @@ -41,7 +41,7 @@ public final class BigGameHunter extends CardImpl { ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); // Madness {B} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{B}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{B}"))); } private BigGameHunter(final BigGameHunter card) { diff --git a/Mage.Sets/src/mage/cards/b/BirchloreRangers.java b/Mage.Sets/src/mage/cards/b/BirchloreRangers.java index 329056818d..ebcbbf2eef 100644 --- a/Mage.Sets/src/mage/cards/b/BirchloreRangers.java +++ b/Mage.Sets/src/mage/cards/b/BirchloreRangers.java @@ -45,7 +45,7 @@ public final class BirchloreRangers extends CardImpl { new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, false)))); // Morph {G} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{G}"))); } private BirchloreRangers(final BirchloreRangers card) { diff --git a/Mage.Sets/src/mage/cards/b/BitingRain.java b/Mage.Sets/src/mage/cards/b/BitingRain.java index 005b8b1aab..c9b8312f93 100644 --- a/Mage.Sets/src/mage/cards/b/BitingRain.java +++ b/Mage.Sets/src/mage/cards/b/BitingRain.java @@ -23,7 +23,7 @@ public final class BitingRain extends CardImpl { this.getSpellAbility().addEffect(new BoostAllEffect(-2, -2, Duration.EndOfTurn)); // Madness {2}{B} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{2}{B}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{2}{B}"))); } private BitingRain(final BitingRain card) { diff --git a/Mage.Sets/src/mage/cards/b/BlastFromThePast.java b/Mage.Sets/src/mage/cards/b/BlastFromThePast.java index 97bdd6bc46..9b993cc074 100644 --- a/Mage.Sets/src/mage/cards/b/BlastFromThePast.java +++ b/Mage.Sets/src/mage/cards/b/BlastFromThePast.java @@ -15,7 +15,6 @@ import mage.abilities.keyword.MadnessAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TimingRule; import mage.game.permanent.token.GoblinToken; import mage.target.common.TargetAnyTarget; @@ -29,7 +28,7 @@ public final class BlastFromThePast extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{R}"); // Madness {R} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{R}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{R}"))); // Cycling {1}{R} this.addAbility(new CyclingAbility(new ManaCostsImpl("{1}{R}"))); // Kicker {2}{R} diff --git a/Mage.Sets/src/mage/cards/b/BlazingRootwalla.java b/Mage.Sets/src/mage/cards/b/BlazingRootwalla.java index f3e450b8d7..a8b711d144 100644 --- a/Mage.Sets/src/mage/cards/b/BlazingRootwalla.java +++ b/Mage.Sets/src/mage/cards/b/BlazingRootwalla.java @@ -32,7 +32,7 @@ public final class BlazingRootwalla extends CardImpl { new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}"))); // Madness{0} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{0}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{0}"))); } private BlazingRootwalla(final BlazingRootwalla card) { diff --git a/Mage.Sets/src/mage/cards/b/BlisteringFirecat.java b/Mage.Sets/src/mage/cards/b/BlisteringFirecat.java index ec1c357a85..a13d211118 100644 --- a/Mage.Sets/src/mage/cards/b/BlisteringFirecat.java +++ b/Mage.Sets/src/mage/cards/b/BlisteringFirecat.java @@ -35,7 +35,7 @@ public final class BlisteringFirecat extends CardImpl { // At the beginning of the end step, sacrifice Blistering Firecat. this.addAbility(new OnEventTriggeredAbility(GameEvent.EventType.END_TURN_STEP_PRE, "beginning of the end step", true, new SacrificeSourceEffect())); // Morph {R}{R} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{R}{R}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{R}{R}"))); } private BlisteringFirecat(final BlisteringFirecat card) { diff --git a/Mage.Sets/src/mage/cards/b/BloodhallPriest.java b/Mage.Sets/src/mage/cards/b/BloodhallPriest.java index b25f738570..2bd018e71a 100644 --- a/Mage.Sets/src/mage/cards/b/BloodhallPriest.java +++ b/Mage.Sets/src/mage/cards/b/BloodhallPriest.java @@ -38,7 +38,7 @@ public final class BloodhallPriest extends CardImpl { )); // Madness {1}{B}{R} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{1}{B}{R}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{1}{B}{R}"))); } private BloodhallPriest(final BloodhallPriest card) { diff --git a/Mage.Sets/src/mage/cards/b/BloodmadVampire.java b/Mage.Sets/src/mage/cards/b/BloodmadVampire.java index 1666d8b7b1..39e228db34 100644 --- a/Mage.Sets/src/mage/cards/b/BloodmadVampire.java +++ b/Mage.Sets/src/mage/cards/b/BloodmadVampire.java @@ -29,7 +29,7 @@ public final class BloodmadVampire extends CardImpl { this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), false)); // Madness {1}{R} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{1}{R}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{1}{R}"))); } private BloodmadVampire(final BloodmadVampire card) { diff --git a/Mage.Sets/src/mage/cards/b/BloodstokeHowler.java b/Mage.Sets/src/mage/cards/b/BloodstokeHowler.java index c699f30b94..1ba54e6320 100644 --- a/Mage.Sets/src/mage/cards/b/BloodstokeHowler.java +++ b/Mage.Sets/src/mage/cards/b/BloodstokeHowler.java @@ -34,7 +34,7 @@ public final class BloodstokeHowler extends CardImpl { this.toughness = new MageInt(4); // Morph {6}{R} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{6}{R}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{6}{R}"))); // When Bloodstoke Howler is turned face up, Beast creatures you control get +3/+0 until end of turn. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new BoostControlledEffect(3, 0, Duration.EndOfTurn, filter))); diff --git a/Mage.Sets/src/mage/cards/b/Boneknitter.java b/Mage.Sets/src/mage/cards/b/Boneknitter.java index edea575b88..ec9b2274ad 100644 --- a/Mage.Sets/src/mage/cards/b/Boneknitter.java +++ b/Mage.Sets/src/mage/cards/b/Boneknitter.java @@ -40,7 +40,7 @@ public final class Boneknitter extends CardImpl { ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); // Morph {2}{B} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{B}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{B}"))); } private Boneknitter(final Boneknitter card) { diff --git a/Mage.Sets/src/mage/cards/b/BrainGorgers.java b/Mage.Sets/src/mage/cards/b/BrainGorgers.java index 35ba29de4f..0f9842996a 100644 --- a/Mage.Sets/src/mage/cards/b/BrainGorgers.java +++ b/Mage.Sets/src/mage/cards/b/BrainGorgers.java @@ -37,7 +37,7 @@ public final class BrainGorgers extends CardImpl { this.addAbility(new CastSourceTriggeredAbility(new BrainGorgersCounterSourceEffect())); // Madness {1}{B} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{1}{B}"))); } private BrainGorgers(final BrainGorgers card) { diff --git a/Mage.Sets/src/mage/cards/b/BranchsnapLorian.java b/Mage.Sets/src/mage/cards/b/BranchsnapLorian.java index 08a23e8dc2..35a0ffef14 100644 --- a/Mage.Sets/src/mage/cards/b/BranchsnapLorian.java +++ b/Mage.Sets/src/mage/cards/b/BranchsnapLorian.java @@ -26,7 +26,7 @@ public final class BranchsnapLorian extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // Morph {G} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{G}"))); } private BranchsnapLorian(final BranchsnapLorian card) { diff --git a/Mage.Sets/src/mage/cards/b/BrineElemental.java b/Mage.Sets/src/mage/cards/b/BrineElemental.java index 04bc60512b..9089063a22 100644 --- a/Mage.Sets/src/mage/cards/b/BrineElemental.java +++ b/Mage.Sets/src/mage/cards/b/BrineElemental.java @@ -32,7 +32,7 @@ public final class BrineElemental extends CardImpl { this.toughness = new MageInt(4); // Morph {5}{U}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{5}{U}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{5}{U}{U}"))); // When Brine Elemental is turned face up, each opponent skips their next untap step. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new BrineElementalEffect())); diff --git a/Mage.Sets/src/mage/cards/b/BrokenConcentration.java b/Mage.Sets/src/mage/cards/b/BrokenConcentration.java index d1e134e979..a72805845a 100644 --- a/Mage.Sets/src/mage/cards/b/BrokenConcentration.java +++ b/Mage.Sets/src/mage/cards/b/BrokenConcentration.java @@ -23,7 +23,7 @@ public final class BrokenConcentration extends CardImpl { this.getSpellAbility().addEffect(new CounterTargetEffect()); this.getSpellAbility().addTarget(new TargetSpell()); // Madness {3}{U} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{3}{U}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{3}{U}"))); } private BrokenConcentration(final BrokenConcentration card) { diff --git a/Mage.Sets/src/mage/cards/b/BroodhatchNantuko.java b/Mage.Sets/src/mage/cards/b/BroodhatchNantuko.java index 4bf877e161..44c86ea010 100644 --- a/Mage.Sets/src/mage/cards/b/BroodhatchNantuko.java +++ b/Mage.Sets/src/mage/cards/b/BroodhatchNantuko.java @@ -30,7 +30,7 @@ public final class BroodhatchNantuko extends CardImpl { new CreateTokenEffect(new InsectToken(), SavedDamageValue.MANY), true)); // Morph {2}{G} - this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{G}"))); } private BroodhatchNantuko(final BroodhatchNantuko card) { diff --git a/Mage.Sets/src/mage/cards/c/CabalExecutioner.java b/Mage.Sets/src/mage/cards/c/CabalExecutioner.java index 16ba71fdf8..901009bd16 100644 --- a/Mage.Sets/src/mage/cards/c/CabalExecutioner.java +++ b/Mage.Sets/src/mage/cards/c/CabalExecutioner.java @@ -17,7 +17,6 @@ import mage.filter.StaticFilters; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.target.targetpointer.FixedTarget; /** @@ -37,7 +36,7 @@ public final class CabalExecutioner extends CardImpl { this.addAbility(new CabalExecutionerAbility()); // Morph {3}{B}{B} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{3}{B}{B}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{B}{B}"))); } private CabalExecutioner(final CabalExecutioner card) { diff --git a/Mage.Sets/src/mage/cards/c/CallToTheNetherworld.java b/Mage.Sets/src/mage/cards/c/CallToTheNetherworld.java index bd8e23eace..c958f67ac5 100644 --- a/Mage.Sets/src/mage/cards/c/CallToTheNetherworld.java +++ b/Mage.Sets/src/mage/cards/c/CallToTheNetherworld.java @@ -31,7 +31,7 @@ public final class CallToTheNetherworld extends CardImpl { this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(filter)); this.getSpellAbility().addEffect(new ReturnFromGraveyardToHandTargetEffect()); // Madness {0} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl<>("{0}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{0}"))); } private CallToTheNetherworld(final CallToTheNetherworld card) { diff --git a/Mage.Sets/src/mage/cards/c/CanyonLurkers.java b/Mage.Sets/src/mage/cards/c/CanyonLurkers.java index 167befb3d3..7bfeb186ba 100644 --- a/Mage.Sets/src/mage/cards/c/CanyonLurkers.java +++ b/Mage.Sets/src/mage/cards/c/CanyonLurkers.java @@ -25,7 +25,7 @@ public final class CanyonLurkers extends CardImpl { this.toughness = new MageInt(2); // Morph 3R - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{3}{R}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{R}"))); } private CanyonLurkers(final CanyonLurkers card) { diff --git a/Mage.Sets/src/mage/cards/c/ChargingSlateback.java b/Mage.Sets/src/mage/cards/c/ChargingSlateback.java index 455426b6be..af0cfb5bb5 100644 --- a/Mage.Sets/src/mage/cards/c/ChargingSlateback.java +++ b/Mage.Sets/src/mage/cards/c/ChargingSlateback.java @@ -26,7 +26,7 @@ public final class ChargingSlateback extends CardImpl { // Charging Slateback can't block. this.addAbility(new CantBlockAbility()); // Morph {4}{R} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{4}{R}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{R}"))); } private ChargingSlateback(final ChargingSlateback card) { diff --git a/Mage.Sets/src/mage/cards/c/ChillingGrasp.java b/Mage.Sets/src/mage/cards/c/ChillingGrasp.java index 814e23d5e9..8e8c8fad06 100644 --- a/Mage.Sets/src/mage/cards/c/ChillingGrasp.java +++ b/Mage.Sets/src/mage/cards/c/ChillingGrasp.java @@ -26,7 +26,7 @@ public final class ChillingGrasp extends CardImpl { this.getSpellAbility().addEffect(new DontUntapInControllersNextUntapStepTargetEffect("Those creatures")); // Madness {3}{U} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{3}{U}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{3}{U}"))); } private ChillingGrasp(final ChillingGrasp card) { diff --git a/Mage.Sets/src/mage/cards/c/ChromeshellCrab.java b/Mage.Sets/src/mage/cards/c/ChromeshellCrab.java index 9a59d61658..2f3fc4ab1e 100644 --- a/Mage.Sets/src/mage/cards/c/ChromeshellCrab.java +++ b/Mage.Sets/src/mage/cards/c/ChromeshellCrab.java @@ -34,7 +34,7 @@ public final class ChromeshellCrab extends CardImpl { this.toughness = new MageInt(3); // Morph {4}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{4}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{U}"))); // When Chromeshell Crab is turned face up, you may exchange control of target creature you control and target creature an opponent controls. Effect effect = new ExchangeControlTargetEffect(Duration.EndOfGame, rule, false, true); diff --git a/Mage.Sets/src/mage/cards/c/CircularLogic.java b/Mage.Sets/src/mage/cards/c/CircularLogic.java index 99a28b1246..2ded66eb0c 100644 --- a/Mage.Sets/src/mage/cards/c/CircularLogic.java +++ b/Mage.Sets/src/mage/cards/c/CircularLogic.java @@ -28,7 +28,7 @@ public final class CircularLogic extends CardImpl { this.getSpellAbility().addTarget(new TargetSpell()); // Madness {U} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl<>("{U}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{U}"))); } private CircularLogic(final CircularLogic card) { diff --git a/Mage.Sets/src/mage/cards/c/CoralTrickster.java b/Mage.Sets/src/mage/cards/c/CoralTrickster.java index 7db134ee8b..d329e648b3 100644 --- a/Mage.Sets/src/mage/cards/c/CoralTrickster.java +++ b/Mage.Sets/src/mage/cards/c/CoralTrickster.java @@ -28,7 +28,7 @@ public final class CoralTrickster extends CardImpl { this.toughness = new MageInt(1); // Morph {U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{U}"))); // When Coral Trickster is turned face up, you may tap or untap target permanent. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new MayTapOrUntapTargetEffect()); ability.addTarget(new TargetPermanent()); diff --git a/Mage.Sets/src/mage/cards/c/CrudeRampart.java b/Mage.Sets/src/mage/cards/c/CrudeRampart.java index 155f117614..31fc79d5f8 100644 --- a/Mage.Sets/src/mage/cards/c/CrudeRampart.java +++ b/Mage.Sets/src/mage/cards/c/CrudeRampart.java @@ -26,7 +26,7 @@ public final class CrudeRampart extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // Morph {4}{W} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{4}{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{W}"))); } private CrudeRampart(final CrudeRampart card) { diff --git a/Mage.Sets/src/mage/cards/c/CurseOfFoolsWisdom.java b/Mage.Sets/src/mage/cards/c/CurseOfFoolsWisdom.java index 698752839e..ebc0e55e59 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfFoolsWisdom.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfFoolsWisdom.java @@ -45,7 +45,7 @@ public final class CurseOfFoolsWisdom extends CardImpl { this.addAbility(new CurseOfFoolsWisdomTriggeredAbility()); // Madness {3}{B} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{3}{B}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{3}{B}"))); } private CurseOfFoolsWisdom(final CurseOfFoolsWisdom card) { diff --git a/Mage.Sets/src/mage/cards/d/DarkWithering.java b/Mage.Sets/src/mage/cards/d/DarkWithering.java index 73ccc5e66f..be1052fd64 100644 --- a/Mage.Sets/src/mage/cards/d/DarkWithering.java +++ b/Mage.Sets/src/mage/cards/d/DarkWithering.java @@ -24,7 +24,7 @@ public final class DarkWithering extends CardImpl { this.getSpellAbility().addEffect(new DestroyTargetEffect()); // Madness {B} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{B}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{B}"))); } private DarkWithering(final DarkWithering card) { diff --git a/Mage.Sets/src/mage/cards/d/DaruHealer.java b/Mage.Sets/src/mage/cards/d/DaruHealer.java index 4ed657242b..644e2a33b7 100644 --- a/Mage.Sets/src/mage/cards/d/DaruHealer.java +++ b/Mage.Sets/src/mage/cards/d/DaruHealer.java @@ -37,7 +37,7 @@ public final class DaruHealer extends CardImpl { this.addAbility(ability); // Morph {W} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{W}"))); } diff --git a/Mage.Sets/src/mage/cards/d/DaruLancer.java b/Mage.Sets/src/mage/cards/d/DaruLancer.java index bf91992cd6..05c43badef 100644 --- a/Mage.Sets/src/mage/cards/d/DaruLancer.java +++ b/Mage.Sets/src/mage/cards/d/DaruLancer.java @@ -27,7 +27,7 @@ public final class DaruLancer extends CardImpl { // First strike this.addAbility(FirstStrikeAbility.getInstance()); // Morph {2}{W}{W} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{W}{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{W}{W}"))); } private DaruLancer(final DaruLancer card) { diff --git a/Mage.Sets/src/mage/cards/d/DaruMender.java b/Mage.Sets/src/mage/cards/d/DaruMender.java index 1af1b051ab..fd6c180f3d 100644 --- a/Mage.Sets/src/mage/cards/d/DaruMender.java +++ b/Mage.Sets/src/mage/cards/d/DaruMender.java @@ -28,7 +28,7 @@ public final class DaruMender extends CardImpl { this.toughness = new MageInt(1); // Morph {W} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{W}"))); // When Daru Mender is turned face up, regenerate target creature. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new RegenerateTargetEffect()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/d/DaruSanctifier.java b/Mage.Sets/src/mage/cards/d/DaruSanctifier.java index 8fef06d341..eb8323dbfb 100644 --- a/Mage.Sets/src/mage/cards/d/DaruSanctifier.java +++ b/Mage.Sets/src/mage/cards/d/DaruSanctifier.java @@ -28,7 +28,7 @@ public final class DaruSanctifier extends CardImpl { this.toughness = new MageInt(4); // Morph {1}{W} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{1}{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{1}{W}"))); // When Daru Sanctifier is turned face up, destroy target enchantment. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new DestroyTargetEffect()); ability.addTarget(new TargetEnchantmentPermanent()); diff --git a/Mage.Sets/src/mage/cards/d/DawningPurist.java b/Mage.Sets/src/mage/cards/d/DawningPurist.java index b26b71ec1e..26f96bafd3 100644 --- a/Mage.Sets/src/mage/cards/d/DawningPurist.java +++ b/Mage.Sets/src/mage/cards/d/DawningPurist.java @@ -37,7 +37,7 @@ public final class DawningPurist extends CardImpl { this.addAbility(new DawningPuristTriggeredAbility()); // Morph {1}{W} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{1}{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{1}{W}"))); } private DawningPurist(final DawningPurist card) { diff --git a/Mage.Sets/src/mage/cards/d/DeathmistRaptor.java b/Mage.Sets/src/mage/cards/d/DeathmistRaptor.java index 18716f58ee..30673de865 100644 --- a/Mage.Sets/src/mage/cards/d/DeathmistRaptor.java +++ b/Mage.Sets/src/mage/cards/d/DeathmistRaptor.java @@ -41,7 +41,7 @@ public final class DeathmistRaptor extends CardImpl { this.addAbility(new TurnedFaceUpAllTriggeredAbility(Zone.GRAVEYARD, new DeathmistRaptorEffect(), new FilterControlledPermanent("a permanent you control"), false, true)); // Megamorph {4}{G} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{4}{G}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{G}"), true)); } private DeathmistRaptor(final DeathmistRaptor card) { diff --git a/Mage.Sets/src/mage/cards/d/DefenderOfTheOrder.java b/Mage.Sets/src/mage/cards/d/DefenderOfTheOrder.java index 271fdc0ef8..84da3f6e2d 100644 --- a/Mage.Sets/src/mage/cards/d/DefenderOfTheOrder.java +++ b/Mage.Sets/src/mage/cards/d/DefenderOfTheOrder.java @@ -27,7 +27,7 @@ public final class DefenderOfTheOrder extends CardImpl { this.toughness = new MageInt(4); // Morph {W}{W} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{W}{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{W}{W}"))); // When Defender of the Order is turned face up, creatures you control get +0/+2 until end of turn. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new BoostControlledEffect(0, 2, Duration.EndOfTurn))); } diff --git a/Mage.Sets/src/mage/cards/d/DenProtector.java b/Mage.Sets/src/mage/cards/d/DenProtector.java index b4ed3f67c3..2992d44ee3 100644 --- a/Mage.Sets/src/mage/cards/d/DenProtector.java +++ b/Mage.Sets/src/mage/cards/d/DenProtector.java @@ -34,7 +34,7 @@ public final class DenProtector extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByCreaturesWithLessPowerEffect())); // Megamorph {1}{G} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{1}{G}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl("{1}{G}"), true)); // When Den Protector is turned face up, return target card from your graveyard to your hand. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new ReturnFromGraveyardToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/cards/d/Dermoplasm.java b/Mage.Sets/src/mage/cards/d/Dermoplasm.java index 465970fec0..43a4dc73f5 100644 --- a/Mage.Sets/src/mage/cards/d/Dermoplasm.java +++ b/Mage.Sets/src/mage/cards/d/Dermoplasm.java @@ -39,7 +39,7 @@ public final class Dermoplasm extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Morph {2}{U}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{U}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{U}{U}"))); // When Dermoplasm is turned face up, you may put a creature card with a morph ability from your hand onto the battlefield face up. If you do, return Dermoplasm to its owner's hand. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new DermoplasmEffect())); diff --git a/Mage.Sets/src/mage/cards/d/DirgurNemesis.java b/Mage.Sets/src/mage/cards/d/DirgurNemesis.java index 65e8bbc68d..5d4abc3ec8 100644 --- a/Mage.Sets/src/mage/cards/d/DirgurNemesis.java +++ b/Mage.Sets/src/mage/cards/d/DirgurNemesis.java @@ -26,7 +26,7 @@ public final class DirgurNemesis extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // Megamorph {6}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{6}{U}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl("{6}{U}"), true)); } private DirgurNemesis(final DirgurNemesis card) { diff --git a/Mage.Sets/src/mage/cards/d/DisruptivePitmage.java b/Mage.Sets/src/mage/cards/d/DisruptivePitmage.java index 3933fff5e4..3f08e35f64 100644 --- a/Mage.Sets/src/mage/cards/d/DisruptivePitmage.java +++ b/Mage.Sets/src/mage/cards/d/DisruptivePitmage.java @@ -36,7 +36,7 @@ public final class DisruptivePitmage extends CardImpl { this.addAbility(ability); // Morph {U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{U}"))); } private DisruptivePitmage(final DisruptivePitmage card) { diff --git a/Mage.Sets/src/mage/cards/d/DistemperOfTheBlood.java b/Mage.Sets/src/mage/cards/d/DistemperOfTheBlood.java index d8176c89af..170a724cdd 100644 --- a/Mage.Sets/src/mage/cards/d/DistemperOfTheBlood.java +++ b/Mage.Sets/src/mage/cards/d/DistemperOfTheBlood.java @@ -33,7 +33,7 @@ public final class DistemperOfTheBlood extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Madness {R} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{R}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{R}"))); } private DistemperOfTheBlood(final DistemperOfTheBlood card) { diff --git a/Mage.Sets/src/mage/cards/d/DjinnIlluminatus.java b/Mage.Sets/src/mage/cards/d/DjinnIlluminatus.java index 8ea8ea86d9..703e9ed220 100644 --- a/Mage.Sets/src/mage/cards/d/DjinnIlluminatus.java +++ b/Mage.Sets/src/mage/cards/d/DjinnIlluminatus.java @@ -86,7 +86,7 @@ class DjinnIlluminatusGainReplicateEffect extends ContinuousEffectImpl { && !stackObject.getManaCost().isEmpty()) { //handle cases like Ancestral Vision Spell spell = (Spell) stackObject; if (filter.match(stackObject, game)) { - ReplicateAbility replicateAbility = replicateAbilities.computeIfAbsent(spell.getId(), k -> new ReplicateAbility(spell.getCard(), spell.getSpellAbility().getManaCosts().getText())); + ReplicateAbility replicateAbility = replicateAbilities.computeIfAbsent(spell.getId(), k -> new ReplicateAbility(spell.getSpellAbility().getManaCosts().getText())); game.getState().addOtherAbility(spell.getCard(), replicateAbility, false); // Do not copy because paid and # of activations state is handled in the baility } } diff --git a/Mage.Sets/src/mage/cards/d/DragonsEyeSavants.java b/Mage.Sets/src/mage/cards/d/DragonsEyeSavants.java index c853373c86..dfbb6bcaca 100644 --- a/Mage.Sets/src/mage/cards/d/DragonsEyeSavants.java +++ b/Mage.Sets/src/mage/cards/d/DragonsEyeSavants.java @@ -39,7 +39,7 @@ public final class DragonsEyeSavants extends CardImpl { this.toughness = new MageInt(6); // Morph - Reveal a blue card in your hand. - this.addAbility(new MorphAbility(this, new RevealTargetFromHandCost(new TargetCardInHand(filter)))); + this.addAbility(new MorphAbility(new RevealTargetFromHandCost(new TargetCardInHand(filter)))); // When Dragon's Eye Savants is turned face up, look at target opponent's hand. Effect effect = new LookAtTargetPlayerHandEffect(); diff --git a/Mage.Sets/src/mage/cards/d/DulcetSirens.java b/Mage.Sets/src/mage/cards/d/DulcetSirens.java index c31b7d17b6..5f2d7dbb68 100644 --- a/Mage.Sets/src/mage/cards/d/DulcetSirens.java +++ b/Mage.Sets/src/mage/cards/d/DulcetSirens.java @@ -43,7 +43,7 @@ public final class DulcetSirens extends CardImpl { // Morph {U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{U}"))); } private DulcetSirens(final DulcetSirens card) { diff --git a/Mage.Sets/src/mage/cards/d/DwarvenBlastminer.java b/Mage.Sets/src/mage/cards/d/DwarvenBlastminer.java index 92f695b10b..28905a5616 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenBlastminer.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenBlastminer.java @@ -34,7 +34,7 @@ public final class DwarvenBlastminer extends CardImpl { this.addAbility(ability); // Morph {R} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{R}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{R}"))); } private DwarvenBlastminer(final DwarvenBlastminer card) { diff --git a/Mage.Sets/src/mage/cards/e/EbonbladeReaper.java b/Mage.Sets/src/mage/cards/e/EbonbladeReaper.java index 6abcd54f01..e8c4c17939 100644 --- a/Mage.Sets/src/mage/cards/e/EbonbladeReaper.java +++ b/Mage.Sets/src/mage/cards/e/EbonbladeReaper.java @@ -36,7 +36,7 @@ public final class EbonbladeReaper extends CardImpl { this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new LoseHalfLifeTargetEffect(), false, true)); //Morph {3}{B}{B} - this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{B}{B}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{B}{B}"))); } private EbonbladeReaper(final EbonbladeReaper card) { diff --git a/Mage.Sets/src/mage/cards/e/EchoTracer.java b/Mage.Sets/src/mage/cards/e/EchoTracer.java index 25f291bbb0..a4cf5c241d 100644 --- a/Mage.Sets/src/mage/cards/e/EchoTracer.java +++ b/Mage.Sets/src/mage/cards/e/EchoTracer.java @@ -28,7 +28,7 @@ public final class EchoTracer extends CardImpl { this.toughness = new MageInt(2); // Morph {2}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{U}"))); // When Echo Tracer is turned face up, return target creature to its owner's hand. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new ReturnToHandTargetEffect()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/e/EfreetWeaponmaster.java b/Mage.Sets/src/mage/cards/e/EfreetWeaponmaster.java index 5747ba0848..853d1be254 100644 --- a/Mage.Sets/src/mage/cards/e/EfreetWeaponmaster.java +++ b/Mage.Sets/src/mage/cards/e/EfreetWeaponmaster.java @@ -42,7 +42,7 @@ public final class EfreetWeaponmaster extends CardImpl { this.addAbility(new EfreetWeaponmasterAbility()); // Morph {2}{U}{R}{W} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{U}{R}{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{U}{R}{W}"))); } private EfreetWeaponmaster(final EfreetWeaponmaster card) { diff --git a/Mage.Sets/src/mage/cards/e/ExaltedAngel.java b/Mage.Sets/src/mage/cards/e/ExaltedAngel.java index 8910d10146..8c22fc6483 100644 --- a/Mage.Sets/src/mage/cards/e/ExaltedAngel.java +++ b/Mage.Sets/src/mage/cards/e/ExaltedAngel.java @@ -30,7 +30,7 @@ public final class ExaltedAngel extends CardImpl { // Whenever Exalted Angel deals damage, you gain that much life. this.addAbility(new DealsDamageGainLifeSourceTriggeredAbility()); // Morph {2}{W}{W} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{W}{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{W}{W}"))); } private ExaltedAngel(final ExaltedAngel card) { diff --git a/Mage.Sets/src/mage/cards/f/FalkenrathGorger.java b/Mage.Sets/src/mage/cards/f/FalkenrathGorger.java index 733b4fe170..cf4b693129 100644 --- a/Mage.Sets/src/mage/cards/f/FalkenrathGorger.java +++ b/Mage.Sets/src/mage/cards/f/FalkenrathGorger.java @@ -114,7 +114,7 @@ class FalkenrathGorgerEffect extends ContinuousEffectImpl { private void addMadnessToCard(Game game, Card card, Map usedMadnessAbilities) { MadnessAbility ability = madnessAbilities.get(card.getId()); if (ability == null) { - ability = new MadnessAbility(card, card.getSpellAbility().getManaCosts()); + ability = new MadnessAbility(card.getSpellAbility().getManaCosts()); } game.getState().addOtherAbility(card, ability, false); usedMadnessAbilities.put(card.getId(), ability); diff --git a/Mage.Sets/src/mage/cards/f/FallenCleric.java b/Mage.Sets/src/mage/cards/f/FallenCleric.java index 286970848e..dbd92a28b8 100644 --- a/Mage.Sets/src/mage/cards/f/FallenCleric.java +++ b/Mage.Sets/src/mage/cards/f/FallenCleric.java @@ -34,7 +34,7 @@ public final class FallenCleric extends CardImpl { // Protection from Clerics this.addAbility(new ProtectionAbility(filter)); // Morph {4}{B} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{4}{B}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{B}"))); } private FallenCleric(final FallenCleric card) { diff --git a/Mage.Sets/src/mage/cards/f/FathomSeer.java b/Mage.Sets/src/mage/cards/f/FathomSeer.java index bb4b72d591..6daec04409 100644 --- a/Mage.Sets/src/mage/cards/f/FathomSeer.java +++ b/Mage.Sets/src/mage/cards/f/FathomSeer.java @@ -33,7 +33,7 @@ public final class FathomSeer extends CardImpl { this.toughness = new MageInt(3); // Morph-Return two Islands you control to their owner's hand. - this.addAbility(new MorphAbility(this, new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(2,2, filter, true)))); + this.addAbility(new MorphAbility(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(2,2, filter, true)))); // When Fathom Seer is turned face up, draw two cards. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new DrawCardSourceControllerEffect(2))); } diff --git a/Mage.Sets/src/mage/cards/f/FieryTemper.java b/Mage.Sets/src/mage/cards/f/FieryTemper.java index f74df1d454..69ba396b44 100644 --- a/Mage.Sets/src/mage/cards/f/FieryTemper.java +++ b/Mage.Sets/src/mage/cards/f/FieryTemper.java @@ -25,7 +25,7 @@ public final class FieryTemper extends CardImpl { this.getSpellAbility().addTarget(new TargetAnyTarget()); // Madness {R} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{R}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{R}"))); } private FieryTemper(final FieryTemper card) { diff --git a/Mage.Sets/src/mage/cards/f/FlamerushRider.java b/Mage.Sets/src/mage/cards/f/FlamerushRider.java index a7d0b8c60a..2e9b56b0f4 100644 --- a/Mage.Sets/src/mage/cards/f/FlamerushRider.java +++ b/Mage.Sets/src/mage/cards/f/FlamerushRider.java @@ -52,7 +52,7 @@ public final class FlamerushRider extends CardImpl { this.addAbility(ability); // Dash {2}{R}{R} - this.addAbility(new DashAbility(this, "{2}{R}{R}")); + this.addAbility(new DashAbility("{2}{R}{R}")); } private FlamerushRider(final FlamerushRider card) { diff --git a/Mage.Sets/src/mage/cards/f/FledglingMawcor.java b/Mage.Sets/src/mage/cards/f/FledglingMawcor.java index 602831934d..ab24f73590 100644 --- a/Mage.Sets/src/mage/cards/f/FledglingMawcor.java +++ b/Mage.Sets/src/mage/cards/f/FledglingMawcor.java @@ -38,7 +38,7 @@ public final class FledglingMawcor extends CardImpl { this.addAbility(ability); // Morph {U}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{U}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{U}{U}"))); } private FledglingMawcor(final FledglingMawcor card) { diff --git a/Mage.Sets/src/mage/cards/f/FoothillGuide.java b/Mage.Sets/src/mage/cards/f/FoothillGuide.java index 71816c6883..631bdfd034 100644 --- a/Mage.Sets/src/mage/cards/f/FoothillGuide.java +++ b/Mage.Sets/src/mage/cards/f/FoothillGuide.java @@ -34,7 +34,7 @@ public final class FoothillGuide extends CardImpl { // Protection from Goblins this.addAbility(new ProtectionAbility(filter)); // Morph {W} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{W}"))); } private FoothillGuide(final FoothillGuide card) { diff --git a/Mage.Sets/src/mage/cards/f/FortuneThief.java b/Mage.Sets/src/mage/cards/f/FortuneThief.java index 9d58912cb7..bae21315e0 100644 --- a/Mage.Sets/src/mage/cards/f/FortuneThief.java +++ b/Mage.Sets/src/mage/cards/f/FortuneThief.java @@ -37,7 +37,7 @@ public final class FortuneThief extends CardImpl { // Damage that would reduce your life total to less than 1 reduces it to 1 instead. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FortuneThiefReplacementEffect())); // Morph {R}{R} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{R}{R}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{R}{R}"))); } private FortuneThief(final FortuneThief card) { diff --git a/Mage.Sets/src/mage/cards/f/FranticPurification.java b/Mage.Sets/src/mage/cards/f/FranticPurification.java index 6d785afd5a..e7f53c1e4d 100644 --- a/Mage.Sets/src/mage/cards/f/FranticPurification.java +++ b/Mage.Sets/src/mage/cards/f/FranticPurification.java @@ -25,7 +25,7 @@ public final class FranticPurification extends CardImpl { this.getSpellAbility().addTarget(new TargetEnchantmentPermanent()); // Madness {W} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{W}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{W}"))); } private FranticPurification(final FranticPurification card) { diff --git a/Mage.Sets/src/mage/cards/f/FromUnderTheFloorboards.java b/Mage.Sets/src/mage/cards/f/FromUnderTheFloorboards.java index f6a97691ec..396409c86a 100644 --- a/Mage.Sets/src/mage/cards/f/FromUnderTheFloorboards.java +++ b/Mage.Sets/src/mage/cards/f/FromUnderTheFloorboards.java @@ -26,7 +26,7 @@ public final class FromUnderTheFloorboards extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{B}{B}"); // Madness {X}{B}{B} (If you discard this card discard it into exile. When you do cast it for its madness cost or put it into your graveyard. - Ability ability = (new MadnessAbility(this, new ManaCostsImpl("{X}{B}{B}"))); + Ability ability = (new MadnessAbility(new ManaCostsImpl("{X}{B}{B}"))); ability.setRuleAtTheTop(true); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FrontlineStrategist.java b/Mage.Sets/src/mage/cards/f/FrontlineStrategist.java index d10a1194f8..37f6112f9b 100644 --- a/Mage.Sets/src/mage/cards/f/FrontlineStrategist.java +++ b/Mage.Sets/src/mage/cards/f/FrontlineStrategist.java @@ -35,7 +35,7 @@ public final class FrontlineStrategist extends CardImpl { this.toughness = new MageInt(1); // Morph {W} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{W}"))); // When Frontline Strategist is turned face up, prevent all combat damage non-Soldier creatures would deal this turn. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new PreventAllDamageByAllPermanentsEffect(filter, Duration.EndOfTurn, true).setText("prevent all combat damage non-Soldier creatures would deal this turn"))); } diff --git a/Mage.Sets/src/mage/cards/g/GathanRaiders.java b/Mage.Sets/src/mage/cards/g/GathanRaiders.java index c5e1678b59..7436c39123 100644 --- a/Mage.Sets/src/mage/cards/g/GathanRaiders.java +++ b/Mage.Sets/src/mage/cards/g/GathanRaiders.java @@ -35,7 +35,7 @@ public final class GathanRaiders extends CardImpl { new BoostSourceEffect(2,2,Duration.WhileOnBattlefield), HellbentCondition.instance, "Hellbent — {this} gets +2/+2 as long as you have no cards in hand"))); // Morph-Discard a card. - this.addAbility(new MorphAbility(this, new DiscardCardCost())); + this.addAbility(new MorphAbility(new DiscardCardCost())); } private GathanRaiders(final GathanRaiders card) { diff --git a/Mage.Sets/src/mage/cards/g/GibberingDescent.java b/Mage.Sets/src/mage/cards/g/GibberingDescent.java index 73ce58bff8..5340efc284 100644 --- a/Mage.Sets/src/mage/cards/g/GibberingDescent.java +++ b/Mage.Sets/src/mage/cards/g/GibberingDescent.java @@ -37,7 +37,7 @@ public final class GibberingDescent extends CardImpl { this.addAbility(new SimpleStaticAbility(new GibberingDescentSkipUpkeepEffect()).setAbilityWord(AbilityWord.HELLBENT)); // Madness {2}{B}{B} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl<>("{2}{B}{B}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{2}{B}{B}"))); } private GibberingDescent(final GibberingDescent card) { diff --git a/Mage.Sets/src/mage/cards/g/GiftOfDoom.java b/Mage.Sets/src/mage/cards/g/GiftOfDoom.java index a21e5565c8..6d0f82e7bd 100644 --- a/Mage.Sets/src/mage/cards/g/GiftOfDoom.java +++ b/Mage.Sets/src/mage/cards/g/GiftOfDoom.java @@ -64,7 +64,7 @@ public final class GiftOfDoom extends CardImpl { this.addAbility(ability2); // Morph—Sacrifice another creature. - this.addAbility(new MorphAbility(this, new SacrificeTargetCost( + this.addAbility(new MorphAbility(new SacrificeTargetCost( new TargetControlledPermanent(filter) ))); diff --git a/Mage.Sets/src/mage/cards/g/Gigadrowse.java b/Mage.Sets/src/mage/cards/g/Gigadrowse.java index 73c140561b..6cdd0d17d5 100644 --- a/Mage.Sets/src/mage/cards/g/Gigadrowse.java +++ b/Mage.Sets/src/mage/cards/g/Gigadrowse.java @@ -20,7 +20,7 @@ public final class Gigadrowse extends CardImpl { // Replicate {U} - this.addAbility(new ReplicateAbility(this, "{U}")); + this.addAbility(new ReplicateAbility("{U}")); // Tap target permanent. this.getSpellAbility().addEffect(new TapTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent()); diff --git a/Mage.Sets/src/mage/cards/g/GisasBidding.java b/Mage.Sets/src/mage/cards/g/GisasBidding.java index ef1b33ea2b..a8862d89f2 100644 --- a/Mage.Sets/src/mage/cards/g/GisasBidding.java +++ b/Mage.Sets/src/mage/cards/g/GisasBidding.java @@ -23,7 +23,7 @@ public final class GisasBidding extends CardImpl { this.getSpellAbility().addEffect(new CreateTokenEffect(new ZombieToken(), 2)); // Madness {2}{B} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{2}{B}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{2}{B}"))); } private GisasBidding(final GisasBidding card) { diff --git a/Mage.Sets/src/mage/cards/g/GlacialStalker.java b/Mage.Sets/src/mage/cards/g/GlacialStalker.java index 2abb38d379..1ba3afbe7f 100644 --- a/Mage.Sets/src/mage/cards/g/GlacialStalker.java +++ b/Mage.Sets/src/mage/cards/g/GlacialStalker.java @@ -24,7 +24,7 @@ public final class GlacialStalker extends CardImpl { this.toughness = new MageInt(5); // Morph {4}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{4}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{U}"))); } private GlacialStalker(final GlacialStalker card) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinHeelcutter.java b/Mage.Sets/src/mage/cards/g/GoblinHeelcutter.java index b295216b91..09f0bf4e69 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinHeelcutter.java +++ b/Mage.Sets/src/mage/cards/g/GoblinHeelcutter.java @@ -33,7 +33,7 @@ public final class GoblinHeelcutter extends CardImpl { this.addAbility(ability); // Dash {2}{R} (You may cast this spell for its dash cost. If you do, it gains haste, and it's returned from the battlefield to its owner's hand at the beginning of the next end step.) - this.addAbility(new DashAbility(this, "{2}{R}")); + this.addAbility(new DashAbility("{2}{R}")); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinTaskmaster.java b/Mage.Sets/src/mage/cards/g/GoblinTaskmaster.java index ba2061dd64..e5be2d3f5f 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinTaskmaster.java +++ b/Mage.Sets/src/mage/cards/g/GoblinTaskmaster.java @@ -41,7 +41,7 @@ public final class GoblinTaskmaster extends CardImpl { this.addAbility(ability); // Morph {R} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{R}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{R}"))); } private GoblinTaskmaster(final GoblinTaskmaster card) { diff --git a/Mage.Sets/src/mage/cards/g/GorgonRecluse.java b/Mage.Sets/src/mage/cards/g/GorgonRecluse.java index 4e9e042078..d428a6d639 100644 --- a/Mage.Sets/src/mage/cards/g/GorgonRecluse.java +++ b/Mage.Sets/src/mage/cards/g/GorgonRecluse.java @@ -33,7 +33,7 @@ public final class GorgonRecluse extends CardImpl { this.addAbility(new BlocksOrBecomesBlockedSourceTriggeredAbility(effect, StaticFilters.FILTER_PERMANENT_CREATURE_NON_BLACK, false)); // Madness {B}{B} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{B}{B}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{B}{B}"))); } private GorgonRecluse(final GorgonRecluse card) { diff --git a/Mage.Sets/src/mage/cards/g/GraveScrabbler.java b/Mage.Sets/src/mage/cards/g/GraveScrabbler.java index 8123f0f398..2af5869d94 100644 --- a/Mage.Sets/src/mage/cards/g/GraveScrabbler.java +++ b/Mage.Sets/src/mage/cards/g/GraveScrabbler.java @@ -26,7 +26,7 @@ public final class GraveScrabbler extends CardImpl { this.toughness = new MageInt(2); //Madness {1}{B} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{1}{B}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{1}{B}"))); //When Grave Scrabbler enters the battlefield, if its madness cost was paid, //you may return target creature card from a graveyard to its owner's hand. diff --git a/Mage.Sets/src/mage/cards/g/GravelSlinger.java b/Mage.Sets/src/mage/cards/g/GravelSlinger.java index 211117d558..a35cd707f1 100644 --- a/Mage.Sets/src/mage/cards/g/GravelSlinger.java +++ b/Mage.Sets/src/mage/cards/g/GravelSlinger.java @@ -35,7 +35,7 @@ public final class GravelSlinger extends CardImpl { ability.addTarget(new TargetCreaturePermanent(new FilterAttackingOrBlockingCreature())); this.addAbility(ability); // Morph {1}{W} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{1}{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{1}{W}"))); } private GravelSlinger(final GravelSlinger card) { diff --git a/Mage.Sets/src/mage/cards/g/GrimHaruspex.java b/Mage.Sets/src/mage/cards/g/GrimHaruspex.java index 02d74b1d65..4edec729c6 100644 --- a/Mage.Sets/src/mage/cards/g/GrimHaruspex.java +++ b/Mage.Sets/src/mage/cards/g/GrimHaruspex.java @@ -39,7 +39,7 @@ public final class GrimHaruspex extends CardImpl { this.toughness = new MageInt(2); // Morph {B} - this.addAbility(new MorphAbility(this, new ColoredManaCost(ColoredManaSymbol.B))); + this.addAbility(new MorphAbility(new ColoredManaCost(ColoredManaSymbol.B))); // Whenever another nontoken creature you control dies, draw a card. this.addAbility(new DiesCreatureTriggeredAbility(new DrawCardSourceControllerEffect(1), false, filter)); diff --git a/Mage.Sets/src/mage/cards/g/GrinningDemon.java b/Mage.Sets/src/mage/cards/g/GrinningDemon.java index ecaa24d51e..9a7ef93e65 100644 --- a/Mage.Sets/src/mage/cards/g/GrinningDemon.java +++ b/Mage.Sets/src/mage/cards/g/GrinningDemon.java @@ -28,7 +28,7 @@ public final class GrinningDemon extends CardImpl { // At the beginning of your upkeep, you lose 2 life. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new LoseLifeSourceControllerEffect(2), TargetController.YOU, false)); // Morph {2}{B}{B} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{B}{B}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{B}{B}"))); } private GrinningDemon(final GrinningDemon card) { diff --git a/Mage.Sets/src/mage/cards/g/GuardianShieldBearer.java b/Mage.Sets/src/mage/cards/g/GuardianShieldBearer.java index 39e07e9915..d7810c327f 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianShieldBearer.java +++ b/Mage.Sets/src/mage/cards/g/GuardianShieldBearer.java @@ -37,7 +37,7 @@ public final class GuardianShieldBearer extends CardImpl { this.toughness = new MageInt(1); // Megamorph {3}{G} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{3}{G}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{G}"), true)); // When Guardian Shield-Bearer is turned face up, put a +1/+1 counter on another target creature you control. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), false); diff --git a/Mage.Sets/src/mage/cards/g/GudulLurker.java b/Mage.Sets/src/mage/cards/g/GudulLurker.java index 6e7d7af371..ddac8b1345 100644 --- a/Mage.Sets/src/mage/cards/g/GudulLurker.java +++ b/Mage.Sets/src/mage/cards/g/GudulLurker.java @@ -27,7 +27,7 @@ public final class GudulLurker extends CardImpl { this.addAbility(new CantBeBlockedSourceAbility()); // Megamorph {U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{U}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl("{U}"), true)); } private GudulLurker(final GudulLurker card) { diff --git a/Mage.Sets/src/mage/cards/h/HauntedCadaver.java b/Mage.Sets/src/mage/cards/h/HauntedCadaver.java index 55fd95ff84..a5c089ec90 100644 --- a/Mage.Sets/src/mage/cards/h/HauntedCadaver.java +++ b/Mage.Sets/src/mage/cards/h/HauntedCadaver.java @@ -31,7 +31,7 @@ public final class HauntedCadaver extends CardImpl { ability.addEffect( new DiscardTargetEffect(3)); this.addAbility(ability); // Morph {1}{B} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{1}{B}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{1}{B}"))); } private HauntedCadaver(final HauntedCadaver card) { diff --git a/Mage.Sets/src/mage/cards/h/Headhunter.java b/Mage.Sets/src/mage/cards/h/Headhunter.java index 382a69b669..6a9237a229 100644 --- a/Mage.Sets/src/mage/cards/h/Headhunter.java +++ b/Mage.Sets/src/mage/cards/h/Headhunter.java @@ -31,7 +31,7 @@ public final class Headhunter extends CardImpl { this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DiscardTargetEffect(1), false, true)); // Morph {B} (You may cast this face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.) - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{B}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{B}"))); } diff --git a/Mage.Sets/src/mage/cards/h/HellMongrel.java b/Mage.Sets/src/mage/cards/h/HellMongrel.java index 334b84710b..eab3ccfa64 100644 --- a/Mage.Sets/src/mage/cards/h/HellMongrel.java +++ b/Mage.Sets/src/mage/cards/h/HellMongrel.java @@ -33,7 +33,7 @@ public final class HellMongrel extends CardImpl { )); // Madness {2}{B} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl<>("{2}{B}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{2}{B}"))); } private HellMongrel(final HellMongrel card) { diff --git a/Mage.Sets/src/mage/cards/h/HerdchaserDragon.java b/Mage.Sets/src/mage/cards/h/HerdchaserDragon.java index 7378bfdfeb..c61cbc3d0f 100644 --- a/Mage.Sets/src/mage/cards/h/HerdchaserDragon.java +++ b/Mage.Sets/src/mage/cards/h/HerdchaserDragon.java @@ -43,7 +43,7 @@ public final class HerdchaserDragon extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Megamorph {5}{G}{G} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{5}{G}{G}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl("{5}{G}{G}"), true)); // When Herdchaser Dragon is turned face up, put a +1/+1 counter on each other Dragon creature you control. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter), false, false)); diff --git a/Mage.Sets/src/mage/cards/h/HiddenDragonslayer.java b/Mage.Sets/src/mage/cards/h/HiddenDragonslayer.java index 8f46cc6c24..315ff5b193 100644 --- a/Mage.Sets/src/mage/cards/h/HiddenDragonslayer.java +++ b/Mage.Sets/src/mage/cards/h/HiddenDragonslayer.java @@ -43,7 +43,7 @@ public final class HiddenDragonslayer extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // Megamorph {2}{W} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{W}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{W}"), true)); // When Hidden Dragonslayer is turned face up, destroy target creature with power 4 or greater an opponent controls. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new DestroyTargetEffect(), false, false); diff --git a/Mage.Sets/src/mage/cards/h/HoodedHydra.java b/Mage.Sets/src/mage/cards/h/HoodedHydra.java index 514b447d9b..48c6bf1d41 100644 --- a/Mage.Sets/src/mage/cards/h/HoodedHydra.java +++ b/Mage.Sets/src/mage/cards/h/HoodedHydra.java @@ -44,7 +44,7 @@ public final class HoodedHydra extends CardImpl { this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new SnakeToken(), new CountersSourceCount(CounterType.P1P1)), false)); // Morph {3}{G}{G} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{3}{G}{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{G}{G}"))); // As Hooded Hydra is turned face up, put five +1/+1 counters on it. Effect effect = new AddCountersSourceEffect(CounterType.P1P1.createInstance(5)); diff --git a/Mage.Sets/src/mage/cards/h/HordeAmbusher.java b/Mage.Sets/src/mage/cards/h/HordeAmbusher.java index 258a57d61f..cdaf7fb0df 100644 --- a/Mage.Sets/src/mage/cards/h/HordeAmbusher.java +++ b/Mage.Sets/src/mage/cards/h/HordeAmbusher.java @@ -45,7 +45,7 @@ public final class HordeAmbusher extends CardImpl { this.addAbility(new BlocksSourceTriggeredAbility(new DamageControllerEffect(1, "it"), false)); // Morph - Reveal a red card in your hand. - this.addAbility(new MorphAbility(this, new RevealTargetFromHandCost(new TargetCardInHand(filter)))); + this.addAbility(new MorphAbility(new RevealTargetFromHandCost(new TargetCardInHand(filter)))); // When Horde Ambusher is turned face up, target creature can't block this turn. Effect effect = new CantBlockTargetEffect(Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/cards/h/Hystrodon.java b/Mage.Sets/src/mage/cards/h/Hystrodon.java index 29a92f6da5..c6222c5b85 100644 --- a/Mage.Sets/src/mage/cards/h/Hystrodon.java +++ b/Mage.Sets/src/mage/cards/h/Hystrodon.java @@ -31,7 +31,7 @@ public final class Hystrodon extends CardImpl { // Whenever Hystrodon deals combat damage to a player, you may draw a card. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DrawCardSourceControllerEffect(1), true)); // Morph {1}{G}{G} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{1}{G}{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{1}{G}{G}"))); } private Hystrodon(final Hystrodon card) { diff --git a/Mage.Sets/src/mage/cards/i/IcefeatherAven.java b/Mage.Sets/src/mage/cards/i/IcefeatherAven.java index 48c07f245f..206169db7a 100644 --- a/Mage.Sets/src/mage/cards/i/IcefeatherAven.java +++ b/Mage.Sets/src/mage/cards/i/IcefeatherAven.java @@ -40,7 +40,7 @@ public final class IcefeatherAven extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Morph {1}{G}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{1}{G}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{1}{G}{U}"))); // When Icefeather Aven is turned face up, you may return another target creature to its owner's hand. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new ReturnToHandTargetEffect(), false, true); ability.addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/i/IchorSlick.java b/Mage.Sets/src/mage/cards/i/IchorSlick.java index f72717008d..b5a6a49faf 100644 --- a/Mage.Sets/src/mage/cards/i/IchorSlick.java +++ b/Mage.Sets/src/mage/cards/i/IchorSlick.java @@ -30,7 +30,7 @@ public final class IchorSlick extends CardImpl { this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); // Madness {3}{B} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{3}{B}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{3}{B}"))); } private IchorSlick(final IchorSlick card) { diff --git a/Mage.Sets/src/mage/cards/i/ImperialHellkite.java b/Mage.Sets/src/mage/cards/i/ImperialHellkite.java index 5302c3337b..2c634f3083 100644 --- a/Mage.Sets/src/mage/cards/i/ImperialHellkite.java +++ b/Mage.Sets/src/mage/cards/i/ImperialHellkite.java @@ -32,7 +32,7 @@ public final class ImperialHellkite extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Morph {6}{R}{R} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{6}{R}{R}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{6}{R}{R}"))); // When Imperial Hellkite is turned face up, you may search your library for a Dragon card, reveal it, and put it into your hand. If you do, shuffle your library. Effect effect = new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 1, new FilterBySubtypeCard(SubType.DRAGON)), true, true); diff --git a/Mage.Sets/src/mage/cards/i/IncorrigibleYouths.java b/Mage.Sets/src/mage/cards/i/IncorrigibleYouths.java index 4ea10666ae..216e55f723 100644 --- a/Mage.Sets/src/mage/cards/i/IncorrigibleYouths.java +++ b/Mage.Sets/src/mage/cards/i/IncorrigibleYouths.java @@ -26,7 +26,7 @@ public final class IncorrigibleYouths extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // Madness {2}{R} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{2}{R}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{2}{R}"))); } private IncorrigibleYouths(final IncorrigibleYouths card) { diff --git a/Mage.Sets/src/mage/cards/i/InfernalCaretaker.java b/Mage.Sets/src/mage/cards/i/InfernalCaretaker.java index d02b7a99cd..12fdda32ad 100644 --- a/Mage.Sets/src/mage/cards/i/InfernalCaretaker.java +++ b/Mage.Sets/src/mage/cards/i/InfernalCaretaker.java @@ -31,7 +31,7 @@ public final class InfernalCaretaker extends CardImpl { this.toughness = new MageInt(2); // Morph {3}{B} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{3}{B}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{B}"))); // When Infernal Caretaker is turned face up, return all Zombie cards from all graveyards to their owners' hands. Effect effect = new ReturnToHandFromGraveyardAllEffect(zombieCard); diff --git a/Mage.Sets/src/mage/cards/i/InsatiableGorgers.java b/Mage.Sets/src/mage/cards/i/InsatiableGorgers.java index ee73f9ed7a..a8af08653c 100644 --- a/Mage.Sets/src/mage/cards/i/InsatiableGorgers.java +++ b/Mage.Sets/src/mage/cards/i/InsatiableGorgers.java @@ -28,7 +28,7 @@ public final class InsatiableGorgers extends CardImpl { this.addAbility(new AttacksEachCombatStaticAbility()); // Madness {3}{R} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{3}{R}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{3}{R}"))); } private InsatiableGorgers(final InsatiableGorgers card) { diff --git a/Mage.Sets/src/mage/cards/i/IreShaman.java b/Mage.Sets/src/mage/cards/i/IreShaman.java index eca5196610..980fc8b7f5 100644 --- a/Mage.Sets/src/mage/cards/i/IreShaman.java +++ b/Mage.Sets/src/mage/cards/i/IreShaman.java @@ -30,7 +30,7 @@ public final class IreShaman extends CardImpl { this.addAbility(new MenaceAbility()); // Megamorph {R} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{R}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl("{R}"), true)); // When Ire Shaman is turned face up, exile the top card of your library. Until end of turn, you may play that card. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new ExileTopXMayPlayUntilEndOfTurnEffect(1), false)); diff --git a/Mage.Sets/src/mage/cards/i/IronfistCrusher.java b/Mage.Sets/src/mage/cards/i/IronfistCrusher.java index be50747fe9..db6f71dec3 100644 --- a/Mage.Sets/src/mage/cards/i/IronfistCrusher.java +++ b/Mage.Sets/src/mage/cards/i/IronfistCrusher.java @@ -30,7 +30,7 @@ public final class IronfistCrusher extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(0))); // Morph {3}{W} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{3}{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{W}"))); } private IronfistCrusher(final IronfistCrusher card) { diff --git a/Mage.Sets/src/mage/cards/j/JeeringInstigator.java b/Mage.Sets/src/mage/cards/j/JeeringInstigator.java index 61beb4fa0e..0801a0884f 100644 --- a/Mage.Sets/src/mage/cards/j/JeeringInstigator.java +++ b/Mage.Sets/src/mage/cards/j/JeeringInstigator.java @@ -44,7 +44,7 @@ public final class JeeringInstigator extends CardImpl { this.toughness = new MageInt(1); // Morph {2}{R} - this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{R}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{R}"))); // When Jeering Instigator is turned face up, if it's your turn, gain control of another target creature until end of turn. Untap it. That creature gains haste until end of turn. Ability ability = new ConditionalInterveningIfTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/j/JustTheWind.java b/Mage.Sets/src/mage/cards/j/JustTheWind.java index 07c217b013..5700435a65 100644 --- a/Mage.Sets/src/mage/cards/j/JustTheWind.java +++ b/Mage.Sets/src/mage/cards/j/JustTheWind.java @@ -24,7 +24,7 @@ public final class JustTheWind extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Madness {U} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{U}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{U}"))); } private JustTheWind(final JustTheWind card) { diff --git a/Mage.Sets/src/mage/cards/k/KadenasSilencer.java b/Mage.Sets/src/mage/cards/k/KadenasSilencer.java index 2e4793ace1..3f3c988ba5 100644 --- a/Mage.Sets/src/mage/cards/k/KadenasSilencer.java +++ b/Mage.Sets/src/mage/cards/k/KadenasSilencer.java @@ -33,7 +33,7 @@ public final class KadenasSilencer extends CardImpl { this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new KadenasSilencerEffect())); // Megamorph {1}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{1}{U}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl("{1}{U}"), true)); } private KadenasSilencer(final KadenasSilencer card) { diff --git a/Mage.Sets/src/mage/cards/k/KaronasZealot.java b/Mage.Sets/src/mage/cards/k/KaronasZealot.java index 5f1f804bfc..5432c1d6b9 100644 --- a/Mage.Sets/src/mage/cards/k/KaronasZealot.java +++ b/Mage.Sets/src/mage/cards/k/KaronasZealot.java @@ -30,7 +30,7 @@ public final class KaronasZealot extends CardImpl { this.toughness = new MageInt(5); // Morph {3}{W}{W} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{3}{W}{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{W}{W}"))); // When Karona's Zealot is turned face up, all damage that would be dealt to it this turn is dealt to target creature instead. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new RedirectDamageFromSourceToTargetEffect(Duration.EndOfTurn, Integer.MAX_VALUE, ACCORDING_DURATION) diff --git a/Mage.Sets/src/mage/cards/k/KheruSpellsnatcher.java b/Mage.Sets/src/mage/cards/k/KheruSpellsnatcher.java index f2d1aa45cd..af63724b79 100644 --- a/Mage.Sets/src/mage/cards/k/KheruSpellsnatcher.java +++ b/Mage.Sets/src/mage/cards/k/KheruSpellsnatcher.java @@ -32,7 +32,7 @@ public final class KheruSpellsnatcher extends CardImpl { this.toughness = new MageInt(3); // Morph {4}{U}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{4}{U}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{U}{U}"))); // When Kheru Spellthief is turned face up, counter target spell. If that spell is countered this way, exile it instead of putting it into its owner's graveyard. You may cast that card without paying its mana cost as long as it remains exiled. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new KheruSpellsnatcherEffect()); diff --git a/Mage.Sets/src/mage/cards/k/KinTreeWarden.java b/Mage.Sets/src/mage/cards/k/KinTreeWarden.java index 0f4eea23ba..916e1d0ccb 100644 --- a/Mage.Sets/src/mage/cards/k/KinTreeWarden.java +++ b/Mage.Sets/src/mage/cards/k/KinTreeWarden.java @@ -31,7 +31,7 @@ public final class KinTreeWarden extends CardImpl { // {2}: Regenerate Kin-Tree Warden this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new GenericManaCost(2))); // Morph {G} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{G}"))); } private KinTreeWarden(final KinTreeWarden card) { diff --git a/Mage.Sets/src/mage/cards/k/KitchenImp.java b/Mage.Sets/src/mage/cards/k/KitchenImp.java index 922e70600e..12b59351bf 100644 --- a/Mage.Sets/src/mage/cards/k/KitchenImp.java +++ b/Mage.Sets/src/mage/cards/k/KitchenImp.java @@ -31,7 +31,7 @@ public final class KitchenImp extends CardImpl { this.addAbility(HasteAbility.getInstance()); // Madness {B} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl<>("{B}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{B}"))); } private KitchenImp(final KitchenImp card) { diff --git a/Mage.Sets/src/mage/cards/k/KolaghanForerunners.java b/Mage.Sets/src/mage/cards/k/KolaghanForerunners.java index 91ee35e572..010c61480f 100644 --- a/Mage.Sets/src/mage/cards/k/KolaghanForerunners.java +++ b/Mage.Sets/src/mage/cards/k/KolaghanForerunners.java @@ -38,7 +38,7 @@ public final class KolaghanForerunners extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.ALL, effect).addHint(CreaturesYouControlHint.instance)); // Dash {2}{R} - this.addAbility(new DashAbility(this, "{2}{R}")); + this.addAbility(new DashAbility("{2}{R}")); } private KolaghanForerunners(final KolaghanForerunners card) { diff --git a/Mage.Sets/src/mage/cards/k/KolaghanSkirmisher.java b/Mage.Sets/src/mage/cards/k/KolaghanSkirmisher.java index d7c6356020..55080fbe8d 100644 --- a/Mage.Sets/src/mage/cards/k/KolaghanSkirmisher.java +++ b/Mage.Sets/src/mage/cards/k/KolaghanSkirmisher.java @@ -23,7 +23,7 @@ public final class KolaghanSkirmisher extends CardImpl { this.toughness = new MageInt(2); // Dash {2}{B} - this.addAbility(new DashAbility(this, "{2}{B}")); + this.addAbility(new DashAbility("{2}{B}")); } private KolaghanSkirmisher(final KolaghanSkirmisher card) { diff --git a/Mage.Sets/src/mage/cards/k/KolaghanStormsinger.java b/Mage.Sets/src/mage/cards/k/KolaghanStormsinger.java index e5d948f765..d30ffdd6c5 100644 --- a/Mage.Sets/src/mage/cards/k/KolaghanStormsinger.java +++ b/Mage.Sets/src/mage/cards/k/KolaghanStormsinger.java @@ -32,7 +32,7 @@ public final class KolaghanStormsinger extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // Megamorph {R} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{R}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl("{R}"), true)); // When Kolaghan Stormsinger is turned face up, target creature gains haste until end of turn. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), false); diff --git a/Mage.Sets/src/mage/cards/k/KolaghanTheStormsFury.java b/Mage.Sets/src/mage/cards/k/KolaghanTheStormsFury.java index 9d000e820d..9cf7be7dce 100644 --- a/Mage.Sets/src/mage/cards/k/KolaghanTheStormsFury.java +++ b/Mage.Sets/src/mage/cards/k/KolaghanTheStormsFury.java @@ -42,7 +42,7 @@ public final class KolaghanTheStormsFury extends CardImpl { false, filter, SetTargetPointer.NONE, false)); // Dash {3}{B}{R} - this.addAbility(new DashAbility(this, "{3}{B}{R}")); + this.addAbility(new DashAbility("{3}{B}{R}")); } private KolaghanTheStormsFury(final KolaghanTheStormsFury card) { diff --git a/Mage.Sets/src/mage/cards/k/KrosanCloudscraper.java b/Mage.Sets/src/mage/cards/k/KrosanCloudscraper.java index 46d57b5246..c04ba14adf 100644 --- a/Mage.Sets/src/mage/cards/k/KrosanCloudscraper.java +++ b/Mage.Sets/src/mage/cards/k/KrosanCloudscraper.java @@ -31,7 +31,7 @@ public final class KrosanCloudscraper extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{G}{G}")), TargetController.YOU, false)); // Morph {7}{G}{G} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{7}{G}{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{7}{G}{G}"))); } private KrosanCloudscraper(final KrosanCloudscraper card) { diff --git a/Mage.Sets/src/mage/cards/k/KrosanColossus.java b/Mage.Sets/src/mage/cards/k/KrosanColossus.java index 1cfea736ac..c1e74d7747 100644 --- a/Mage.Sets/src/mage/cards/k/KrosanColossus.java +++ b/Mage.Sets/src/mage/cards/k/KrosanColossus.java @@ -23,7 +23,7 @@ public final class KrosanColossus extends CardImpl { this.toughness = new MageInt(9); // Morph {6}{G}{G} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{6}{G}{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{6}{G}{G}"))); } private KrosanColossus(final KrosanColossus card) { diff --git a/Mage.Sets/src/mage/cards/k/KrumarBondKin.java b/Mage.Sets/src/mage/cards/k/KrumarBondKin.java index 23548f0556..82c7102424 100644 --- a/Mage.Sets/src/mage/cards/k/KrumarBondKin.java +++ b/Mage.Sets/src/mage/cards/k/KrumarBondKin.java @@ -25,7 +25,7 @@ public final class KrumarBondKin extends CardImpl { this.toughness = new MageInt(3); // Morph {4}{B} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{4}{B}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{B}"))); } private KrumarBondKin(final KrumarBondKin card) { diff --git a/Mage.Sets/src/mage/cards/l/LeapOfFlame.java b/Mage.Sets/src/mage/cards/l/LeapOfFlame.java index 5561998ddc..aa48c41638 100644 --- a/Mage.Sets/src/mage/cards/l/LeapOfFlame.java +++ b/Mage.Sets/src/mage/cards/l/LeapOfFlame.java @@ -25,7 +25,7 @@ public final class LeapOfFlame extends CardImpl { // Replicate {U}{R} - this.addAbility(new ReplicateAbility(this, "{U}{R}")); + this.addAbility(new ReplicateAbility("{U}{R}")); // Target creature gets +1/+0 and gains flying and first strike until end of turn. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); Effect effect = new BoostTargetEffect(1,0,Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/cards/l/LiegeOfTheAxe.java b/Mage.Sets/src/mage/cards/l/LiegeOfTheAxe.java index 3ba86d786f..4043a22eb3 100644 --- a/Mage.Sets/src/mage/cards/l/LiegeOfTheAxe.java +++ b/Mage.Sets/src/mage/cards/l/LiegeOfTheAxe.java @@ -29,7 +29,7 @@ public final class LiegeOfTheAxe extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); // Morph {1}{W} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{1}{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{1}{W}"))); // When Liege of the Axe is turned face up, untap it. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new UntapSourceEffect())); } diff --git a/Mage.Sets/src/mage/cards/l/LiegeOfThePit.java b/Mage.Sets/src/mage/cards/l/LiegeOfThePit.java index 50b0a4b1be..2e33b43f41 100644 --- a/Mage.Sets/src/mage/cards/l/LiegeOfThePit.java +++ b/Mage.Sets/src/mage/cards/l/LiegeOfThePit.java @@ -39,7 +39,7 @@ public final class LiegeOfThePit extends CardImpl { // At the beginning of your upkeep, sacrifice a creature other than Liege of the Pit. If you can't, Liege of the Pit deals 7 damage to you. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new LiegeOfThePitEffect(), TargetController.YOU, false)); // Morph {B}{B}{B}{B} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{B}{B}{B}{B}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{B}{B}{B}{B}"))); } private LiegeOfThePit(final LiegeOfThePit card) { diff --git a/Mage.Sets/src/mage/cards/l/LightningBerserker.java b/Mage.Sets/src/mage/cards/l/LightningBerserker.java index 6eb687a740..03da0b0da4 100644 --- a/Mage.Sets/src/mage/cards/l/LightningBerserker.java +++ b/Mage.Sets/src/mage/cards/l/LightningBerserker.java @@ -33,7 +33,7 @@ public final class LightningBerserker extends CardImpl { new ManaCostsImpl("{R}"))); // Dash {R} - this.addAbility(new DashAbility(this, "{R}")); + this.addAbility(new DashAbility("{R}")); } private LightningBerserker(final LightningBerserker card) { diff --git a/Mage.Sets/src/mage/cards/l/LoseFocus.java b/Mage.Sets/src/mage/cards/l/LoseFocus.java index 0c53eca9b6..a517cb9a5a 100644 --- a/Mage.Sets/src/mage/cards/l/LoseFocus.java +++ b/Mage.Sets/src/mage/cards/l/LoseFocus.java @@ -19,7 +19,7 @@ public final class LoseFocus extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{U}"); // Replicate {U} - this.addAbility(new ReplicateAbility(this, "{U}")); + this.addAbility(new ReplicateAbility("{U}")); // Counter target spell unless its controller pays {2}. this.getSpellAbility().addEffect(new CounterUnlessPaysEffect(new GenericManaCost(2))); diff --git a/Mage.Sets/src/mage/cards/l/LumithreadField.java b/Mage.Sets/src/mage/cards/l/LumithreadField.java index 401ac81f3a..9534763ff0 100644 --- a/Mage.Sets/src/mage/cards/l/LumithreadField.java +++ b/Mage.Sets/src/mage/cards/l/LumithreadField.java @@ -25,7 +25,7 @@ public final class LumithreadField extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield))); // Morph {1}{W} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{1}{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{1}{W}"))); } private LumithreadField(final LumithreadField card) { diff --git a/Mage.Sets/src/mage/cards/m/MaelstromDjinn.java b/Mage.Sets/src/mage/cards/m/MaelstromDjinn.java index 96c5ec2a88..a0998a4d4b 100644 --- a/Mage.Sets/src/mage/cards/m/MaelstromDjinn.java +++ b/Mage.Sets/src/mage/cards/m/MaelstromDjinn.java @@ -35,7 +35,7 @@ public final class MaelstromDjinn extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Morph {2}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{U}"))); // When Maelstrom Djinn is turned face up, put two time counters on it and it gains vanishing. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new AddCountersSourceEffect(CounterType.TIME.createInstance(2))); Effect effect = new GainAbilitySourceEffect(new VanishingUpkeepAbility(0), Duration.WhileOnBattlefield); diff --git a/Mage.Sets/src/mage/cards/m/MalevolentWhispers.java b/Mage.Sets/src/mage/cards/m/MalevolentWhispers.java index c90b9876a8..2a1eae5a81 100644 --- a/Mage.Sets/src/mage/cards/m/MalevolentWhispers.java +++ b/Mage.Sets/src/mage/cards/m/MalevolentWhispers.java @@ -40,7 +40,7 @@ public final class MalevolentWhispers extends CardImpl { this.getSpellAbility().addEffect(effect); // Madness {3}{R} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{3}{R}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{3}{R}"))); } private MalevolentWhispers(final MalevolentWhispers card) { diff --git a/Mage.Sets/src/mage/cards/m/MarangRiverSkeleton.java b/Mage.Sets/src/mage/cards/m/MarangRiverSkeleton.java index 57215f6aa9..9adbddd484 100644 --- a/Mage.Sets/src/mage/cards/m/MarangRiverSkeleton.java +++ b/Mage.Sets/src/mage/cards/m/MarangRiverSkeleton.java @@ -29,7 +29,7 @@ public final class MarangRiverSkeleton extends CardImpl { this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}"))); // Megamorph {3}{B} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{3}{B}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{B}"), true)); } private MarangRiverSkeleton(final MarangRiverSkeleton card) { diff --git a/Mage.Sets/src/mage/cards/m/MarduScout.java b/Mage.Sets/src/mage/cards/m/MarduScout.java index 376d6a595f..e633ecf067 100644 --- a/Mage.Sets/src/mage/cards/m/MarduScout.java +++ b/Mage.Sets/src/mage/cards/m/MarduScout.java @@ -23,7 +23,7 @@ public final class MarduScout extends CardImpl { this.toughness = new MageInt(1); // Dash {1}{R} - this.addAbility(new DashAbility(this, "{1}{R}")); + this.addAbility(new DashAbility("{1}{R}")); } private MarduScout(final MarduScout card) { diff --git a/Mage.Sets/src/mage/cards/m/MarduShadowspear.java b/Mage.Sets/src/mage/cards/m/MarduShadowspear.java index 3b000f46bc..30621d3a92 100644 --- a/Mage.Sets/src/mage/cards/m/MarduShadowspear.java +++ b/Mage.Sets/src/mage/cards/m/MarduShadowspear.java @@ -26,7 +26,7 @@ public final class MarduShadowspear extends CardImpl { // Whenever Mardu Shadowspear attacks, each opponent loses 1 life. this.addAbility(new AttacksTriggeredAbility(new LoseLifeOpponentsEffect(1),false)); // Dash {1}{B} - this.addAbility(new DashAbility(this, "{1}{B}")); + this.addAbility(new DashAbility("{1}{B}")); } private MarduShadowspear(final MarduShadowspear card) { diff --git a/Mage.Sets/src/mage/cards/m/MarduStrikeLeader.java b/Mage.Sets/src/mage/cards/m/MarduStrikeLeader.java index 91c9d2540c..10e2bf1afe 100644 --- a/Mage.Sets/src/mage/cards/m/MarduStrikeLeader.java +++ b/Mage.Sets/src/mage/cards/m/MarduStrikeLeader.java @@ -29,7 +29,7 @@ public final class MarduStrikeLeader extends CardImpl { this.addAbility(new AttacksTriggeredAbility(new CreateTokenEffect(new MarduStrikeLeaderWarriorToken()), false)); // Dash {3}{B} - this.addAbility(new DashAbility(this, "{3}{B}")); + this.addAbility(new DashAbility("{3}{B}")); } private MarduStrikeLeader(final MarduStrikeLeader card) { diff --git a/Mage.Sets/src/mage/cards/m/MarshHulk.java b/Mage.Sets/src/mage/cards/m/MarshHulk.java index 4866a37b2b..61d8410a64 100644 --- a/Mage.Sets/src/mage/cards/m/MarshHulk.java +++ b/Mage.Sets/src/mage/cards/m/MarshHulk.java @@ -24,7 +24,7 @@ public final class MarshHulk extends CardImpl { this.toughness = new MageInt(6); // Megamorph {6}{B} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{6}{B}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl("{6}{B}"), true)); } private MarshHulk(final MarshHulk card) { diff --git a/Mage.Sets/src/mage/cards/m/MasterOfPearls.java b/Mage.Sets/src/mage/cards/m/MasterOfPearls.java index e3238f5cd4..e0733f7146 100644 --- a/Mage.Sets/src/mage/cards/m/MasterOfPearls.java +++ b/Mage.Sets/src/mage/cards/m/MasterOfPearls.java @@ -29,7 +29,7 @@ public final class MasterOfPearls extends CardImpl { this.toughness = new MageInt(2); // Morph {3}{W}{W} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{3}{W}{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{W}{W}"))); // When Master of Pearls is turned face up, creatures you control get +2/+2 until end of turn. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new BoostControlledEffect(2, 2, Duration.EndOfTurn, FILTER_PERMANENT_CREATURES))); } diff --git a/Mage.Sets/src/mage/cards/m/MasterOfTheVeil.java b/Mage.Sets/src/mage/cards/m/MasterOfTheVeil.java index 339cc3dd01..8bae3f7511 100644 --- a/Mage.Sets/src/mage/cards/m/MasterOfTheVeil.java +++ b/Mage.Sets/src/mage/cards/m/MasterOfTheVeil.java @@ -44,7 +44,7 @@ public final class MasterOfTheVeil extends CardImpl { this.toughness = new MageInt(3); // Morph {2}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{U}"))); // When Master of the Veil is turned face up, you may turn target creature with a morph ability face down. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new MasterOfTheVeilEffect(), false, true); diff --git a/Mage.Sets/src/mage/cards/m/Mimeofacture.java b/Mage.Sets/src/mage/cards/m/Mimeofacture.java index 75fc2b3bb6..11c20adbd7 100644 --- a/Mage.Sets/src/mage/cards/m/Mimeofacture.java +++ b/Mage.Sets/src/mage/cards/m/Mimeofacture.java @@ -30,7 +30,7 @@ public final class Mimeofacture extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{U}"); // Replicate {3}{U} - this.addAbility(new ReplicateAbility(this, "{3}{U}")); + this.addAbility(new ReplicateAbility("{3}{U}")); // Choose target permanent an opponent controls. Search that player's library for a card with the same name and put it onto the battlefield under your control. Then that player shuffles their library. this.getSpellAbility().addEffect(new MimeofactureEffect()); diff --git a/Mage.Sets/src/mage/cards/m/MischievousQuanar.java b/Mage.Sets/src/mage/cards/m/MischievousQuanar.java index cf44d28acf..25d1c41090 100644 --- a/Mage.Sets/src/mage/cards/m/MischievousQuanar.java +++ b/Mage.Sets/src/mage/cards/m/MischievousQuanar.java @@ -38,7 +38,7 @@ public final class MischievousQuanar extends CardImpl { this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{3}{U}{U}"))); // Morph {1}{U}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{1}{U}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{1}{U}{U}"))); // When Mischievous Quanar is turned face up, copy target instant or sorcery spell. You may choose new targets for that copy. Effect effect2 = new CopyTargetSpellEffect(); diff --git a/Mage.Sets/src/mage/cards/m/MistfireWeaver.java b/Mage.Sets/src/mage/cards/m/MistfireWeaver.java index b1eba873cf..9357ac73cd 100644 --- a/Mage.Sets/src/mage/cards/m/MistfireWeaver.java +++ b/Mage.Sets/src/mage/cards/m/MistfireWeaver.java @@ -35,7 +35,7 @@ public final class MistfireWeaver extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Morph {2}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{U}"))); // When Misfire Weaver is turned face up, target creature you control gains hexproof until end of turn Effect effect = new GainAbilityTargetEffect(HexproofAbility.getInstance(), Duration.EndOfTurn); Ability ability = new TurnedFaceUpSourceTriggeredAbility(effect); diff --git a/Mage.Sets/src/mage/cards/m/MistformSeaswift.java b/Mage.Sets/src/mage/cards/m/MistformSeaswift.java index 89dec158f7..1715a6dc12 100644 --- a/Mage.Sets/src/mage/cards/m/MistformSeaswift.java +++ b/Mage.Sets/src/mage/cards/m/MistformSeaswift.java @@ -34,7 +34,7 @@ public final class MistformSeaswift extends CardImpl { this.addAbility(new SimpleActivatedAbility(new BecomesChosenCreatureTypeSourceEffect(), new GenericManaCost(1))); // Morph {1}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{1}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{1}{U}"))); } diff --git a/Mage.Sets/src/mage/cards/m/MistformShrieker.java b/Mage.Sets/src/mage/cards/m/MistformShrieker.java index 240625b079..cbcb87b542 100644 --- a/Mage.Sets/src/mage/cards/m/MistformShrieker.java +++ b/Mage.Sets/src/mage/cards/m/MistformShrieker.java @@ -35,7 +35,7 @@ public final class MistformShrieker extends CardImpl { this.addAbility(new SimpleActivatedAbility(new BecomesChosenCreatureTypeSourceEffect(), new GenericManaCost(1))); // Morph {3}{U}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{3}{U}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{U}{U}"))); } diff --git a/Mage.Sets/src/mage/cards/m/MisthoofKirin.java b/Mage.Sets/src/mage/cards/m/MisthoofKirin.java index 14acac890e..ab3f2edec8 100644 --- a/Mage.Sets/src/mage/cards/m/MisthoofKirin.java +++ b/Mage.Sets/src/mage/cards/m/MisthoofKirin.java @@ -31,7 +31,7 @@ public final class MisthoofKirin extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Megamorph {1}{W} (You may cast this face down as a 2/2 creature for {3}. Turn it face up any time for its megamorph cost and put a +1/+1 counter on it.) - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{1}{W}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl("{1}{W}"), true)); } private MisthoofKirin(final MisthoofKirin card) { diff --git a/Mage.Sets/src/mage/cards/m/MonasteryFlock.java b/Mage.Sets/src/mage/cards/m/MonasteryFlock.java index f0a2e054cc..cea30ee5b4 100644 --- a/Mage.Sets/src/mage/cards/m/MonasteryFlock.java +++ b/Mage.Sets/src/mage/cards/m/MonasteryFlock.java @@ -30,7 +30,7 @@ public final class MonasteryFlock extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Morph {U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{U}"))); } private MonasteryFlock(final MonasteryFlock card) { diff --git a/Mage.Sets/src/mage/cards/m/MonasteryLoremaster.java b/Mage.Sets/src/mage/cards/m/MonasteryLoremaster.java index 06cb6ce6d7..d5a352d2ef 100644 --- a/Mage.Sets/src/mage/cards/m/MonasteryLoremaster.java +++ b/Mage.Sets/src/mage/cards/m/MonasteryLoremaster.java @@ -37,7 +37,7 @@ public final class MonasteryLoremaster extends CardImpl { this.toughness = new MageInt(2); // Megamorph {5}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{5}{U}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl("{5}{U}"), true)); // When Monastery Loremaster is turned face up, return target noncreature, nonland card from your graveyard to your hand. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new ReturnFromGraveyardToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/cards/m/MuckDrubb.java b/Mage.Sets/src/mage/cards/m/MuckDrubb.java index 47f4327956..462f2c62c0 100644 --- a/Mage.Sets/src/mage/cards/m/MuckDrubb.java +++ b/Mage.Sets/src/mage/cards/m/MuckDrubb.java @@ -56,7 +56,7 @@ public final class MuckDrubb extends CardImpl { this.addAbility(ability); // Madness {2}{B} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{2}{B}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{2}{B}"))); } private MuckDrubb(final MuckDrubb card) { diff --git a/Mage.Sets/src/mage/cards/m/MurderousCompulsion.java b/Mage.Sets/src/mage/cards/m/MurderousCompulsion.java index 4b40f78d4c..f261e7951b 100644 --- a/Mage.Sets/src/mage/cards/m/MurderousCompulsion.java +++ b/Mage.Sets/src/mage/cards/m/MurderousCompulsion.java @@ -32,7 +32,7 @@ public final class MurderousCompulsion extends CardImpl { getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); // Madness {1}{B} (If you discard card, discard it into exile. When you do, cast it for its madness cost or put it into your graveyard.) - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{1}{B}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{1}{B}"))); } private MurderousCompulsion(final MurderousCompulsion card) { diff --git a/Mage.Sets/src/mage/cards/m/MysticOfTheHiddenWay.java b/Mage.Sets/src/mage/cards/m/MysticOfTheHiddenWay.java index 4992aa374d..02054232f2 100644 --- a/Mage.Sets/src/mage/cards/m/MysticOfTheHiddenWay.java +++ b/Mage.Sets/src/mage/cards/m/MysticOfTheHiddenWay.java @@ -28,7 +28,7 @@ public final class MysticOfTheHiddenWay extends CardImpl { // Mystic of the Hidden Way can't be blocked. this.addAbility(new CantBeBlockedSourceAbility()); // Morph {2}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{U}"))); } private MysticOfTheHiddenWay(final MysticOfTheHiddenWay card) { diff --git a/Mage.Sets/src/mage/cards/n/NaggingThoughts.java b/Mage.Sets/src/mage/cards/n/NaggingThoughts.java index 554573a6e4..f8d7545ae7 100644 --- a/Mage.Sets/src/mage/cards/n/NaggingThoughts.java +++ b/Mage.Sets/src/mage/cards/n/NaggingThoughts.java @@ -25,7 +25,7 @@ public final class NaggingThoughts extends CardImpl { this.getSpellAbility().addEffect(new LookLibraryAndPickControllerEffect(StaticValue.get(2), false, StaticValue.get(1), new FilterCard(), Zone.GRAVEYARD, false, false)); // Madness {1}{U} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{1}{U}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{1}{U}"))); } private NaggingThoughts(final NaggingThoughts card) { diff --git a/Mage.Sets/src/mage/cards/n/NamelessOne.java b/Mage.Sets/src/mage/cards/n/NamelessOne.java index a742d3ab21..bcb025383a 100644 --- a/Mage.Sets/src/mage/cards/n/NamelessOne.java +++ b/Mage.Sets/src/mage/cards/n/NamelessOne.java @@ -38,7 +38,7 @@ public final class NamelessOne extends CardImpl { // Nameless One's power and toughness are each equal to the number of Wizards on the battlefield. this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Duration.EndOfGame))); // Morph {2}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{U}"))); } private NamelessOne(final NamelessOne card) { diff --git a/Mage.Sets/src/mage/cards/n/NantukoVigilante.java b/Mage.Sets/src/mage/cards/n/NantukoVigilante.java index 1d01f9be34..9a0eced886 100644 --- a/Mage.Sets/src/mage/cards/n/NantukoVigilante.java +++ b/Mage.Sets/src/mage/cards/n/NantukoVigilante.java @@ -32,7 +32,7 @@ public final class NantukoVigilante extends CardImpl { this.toughness = new MageInt(2); // Morph {1}{G} - this.addAbility(new MorphAbility(this,new ManaCostsImpl("{1}{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{1}{G}"))); // When Nantuko Vigilante is turned face up, destroy target artifact or enchantment. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new DestroyTargetEffect()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/cards/n/Necrogoyf.java b/Mage.Sets/src/mage/cards/n/Necrogoyf.java index 70434c06f7..84e59fb821 100644 --- a/Mage.Sets/src/mage/cards/n/Necrogoyf.java +++ b/Mage.Sets/src/mage/cards/n/Necrogoyf.java @@ -42,7 +42,7 @@ public final class Necrogoyf extends CardImpl { )); // Madness {1}{B}{B} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl<>("{1}{B}{B}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{1}{B}{B}"))); } private Necrogoyf(final Necrogoyf card) { diff --git a/Mage.Sets/src/mage/cards/n/NightshadeAssassin.java b/Mage.Sets/src/mage/cards/n/NightshadeAssassin.java index 1c233b348a..e162bc012d 100644 --- a/Mage.Sets/src/mage/cards/n/NightshadeAssassin.java +++ b/Mage.Sets/src/mage/cards/n/NightshadeAssassin.java @@ -49,7 +49,7 @@ public final class NightshadeAssassin extends CardImpl { this.addAbility(ability); // Madness {1}{B} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{1}{B}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{1}{B}"))); } private NightshadeAssassin(final NightshadeAssassin card) { diff --git a/Mage.Sets/src/mage/cards/o/ObsessiveSearch.java b/Mage.Sets/src/mage/cards/o/ObsessiveSearch.java index 48907421e6..971c40a788 100644 --- a/Mage.Sets/src/mage/cards/o/ObsessiveSearch.java +++ b/Mage.Sets/src/mage/cards/o/ObsessiveSearch.java @@ -23,7 +23,7 @@ public final class ObsessiveSearch extends CardImpl { this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); // Madness {U} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{U}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{U}"))); } private ObsessiveSearch(final ObsessiveSearch card) { diff --git a/Mage.Sets/src/mage/cards/o/OjutaiInterceptor.java b/Mage.Sets/src/mage/cards/o/OjutaiInterceptor.java index f038b4f071..730947fa6c 100644 --- a/Mage.Sets/src/mage/cards/o/OjutaiInterceptor.java +++ b/Mage.Sets/src/mage/cards/o/OjutaiInterceptor.java @@ -28,7 +28,7 @@ public final class OjutaiInterceptor extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Megamorph {3}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{3}{U}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{U}"), true)); } diff --git a/Mage.Sets/src/mage/cards/p/PatronOfTheWild.java b/Mage.Sets/src/mage/cards/p/PatronOfTheWild.java index 8ea524d56f..db5bedc0e9 100644 --- a/Mage.Sets/src/mage/cards/p/PatronOfTheWild.java +++ b/Mage.Sets/src/mage/cards/p/PatronOfTheWild.java @@ -28,7 +28,7 @@ public final class PatronOfTheWild extends CardImpl { this.toughness = new MageInt(1); // Morph {2}{G} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{G}"))); // When Patron of the Wild is turned face up, target creature gets +3/+3 until end of turn. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new BoostTargetEffect(3, 3, Duration.EndOfTurn)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/p/PineWalker.java b/Mage.Sets/src/mage/cards/p/PineWalker.java index 2543d269a0..cf408f2214 100644 --- a/Mage.Sets/src/mage/cards/p/PineWalker.java +++ b/Mage.Sets/src/mage/cards/p/PineWalker.java @@ -28,7 +28,7 @@ public final class PineWalker extends CardImpl { this.toughness = new MageInt(5); // Morph {4}{G} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{4}{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{G}"))); // Whenever Pine Walker or another creature you control is turned face up, untap that creature. Effect effect = new UntapTargetEffect(); effect.setText("untap that creature"); diff --git a/Mage.Sets/src/mage/cards/p/PitilessHorde.java b/Mage.Sets/src/mage/cards/p/PitilessHorde.java index fd24f8b681..3fddaf2580 100644 --- a/Mage.Sets/src/mage/cards/p/PitilessHorde.java +++ b/Mage.Sets/src/mage/cards/p/PitilessHorde.java @@ -29,7 +29,7 @@ public final class PitilessHorde extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new LoseLifeSourceControllerEffect(2), TargetController.YOU, false)); // Dash {2}{B}{B} - this.addAbility(new DashAbility(this, "{2}{B}{B}")); + this.addAbility(new DashAbility("{2}{B}{B}")); } private PitilessHorde(final PitilessHorde card) { diff --git a/Mage.Sets/src/mage/cards/p/PonybackBrigade.java b/Mage.Sets/src/mage/cards/p/PonybackBrigade.java index 5fa30bc973..c67129f4d5 100644 --- a/Mage.Sets/src/mage/cards/p/PonybackBrigade.java +++ b/Mage.Sets/src/mage/cards/p/PonybackBrigade.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.game.permanent.token.GoblinToken; import mage.game.permanent.token.Token; @@ -37,7 +36,7 @@ public final class PonybackBrigade extends CardImpl { this.addAbility(new PonybackBrigadeAbility(new GoblinToken())); // Morph {2}{R}{W}{B} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{R}{W}{B}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{R}{W}{B}"))); } private PonybackBrigade(final PonybackBrigade card) { diff --git a/Mage.Sets/src/mage/cards/p/PrimalWhisperer.java b/Mage.Sets/src/mage/cards/p/PrimalWhisperer.java index 6d41b7ed3f..72a7275e07 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalWhisperer.java +++ b/Mage.Sets/src/mage/cards/p/PrimalWhisperer.java @@ -40,7 +40,7 @@ public final class PrimalWhisperer extends CardImpl { PermanentsOnBattlefieldCount amount = new PermanentsOnBattlefieldCount(filter, 2); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield))); // Morph {3}{G} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{3}{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{G}"))); } private PrimalWhisperer(final PrimalWhisperer card) { diff --git a/Mage.Sets/src/mage/cards/p/ProteusMachine.java b/Mage.Sets/src/mage/cards/p/ProteusMachine.java index a38591273f..4e8cb1312f 100644 --- a/Mage.Sets/src/mage/cards/p/ProteusMachine.java +++ b/Mage.Sets/src/mage/cards/p/ProteusMachine.java @@ -26,7 +26,7 @@ public final class ProteusMachine extends CardImpl { this.toughness = new MageInt(2); // Morph {0} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{0}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{0}"))); // When Proteus Machine is turned face up, it becomes the creature type of your choice. (This effect lasts indefinitely.) this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new BecomesChosenCreatureTypeSourceEffect(false, Duration.Custom))); diff --git a/Mage.Sets/src/mage/cards/p/PsychoticEpisode.java b/Mage.Sets/src/mage/cards/p/PsychoticEpisode.java index 539173ccac..d9998b81a0 100644 --- a/Mage.Sets/src/mage/cards/p/PsychoticEpisode.java +++ b/Mage.Sets/src/mage/cards/p/PsychoticEpisode.java @@ -34,7 +34,7 @@ public final class PsychoticEpisode extends CardImpl { this.getSpellAbility().addEffect(new PsychoticEpisodeEffect()); this.getSpellAbility().addTarget(new TargetPlayer()); // Madness {1}{B} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{1}{B}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{1}{B}"))); } private PsychoticEpisode(final PsychoticEpisode card) { diff --git a/Mage.Sets/src/mage/cards/p/PsychoticHaze.java b/Mage.Sets/src/mage/cards/p/PsychoticHaze.java index cfc3c70a42..e222257364 100644 --- a/Mage.Sets/src/mage/cards/p/PsychoticHaze.java +++ b/Mage.Sets/src/mage/cards/p/PsychoticHaze.java @@ -23,7 +23,7 @@ public final class PsychoticHaze extends CardImpl { this.getSpellAbility().addEffect(new DamageEverythingEffect(1)); // Madness {1}{B} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{1}{B}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{1}{B}"))); } private PsychoticHaze(final PsychoticHaze card) { diff --git a/Mage.Sets/src/mage/cards/p/PutridRaptor.java b/Mage.Sets/src/mage/cards/p/PutridRaptor.java index effdc56764..bac4f72591 100644 --- a/Mage.Sets/src/mage/cards/p/PutridRaptor.java +++ b/Mage.Sets/src/mage/cards/p/PutridRaptor.java @@ -32,7 +32,7 @@ public final class PutridRaptor extends CardImpl { this.toughness = new MageInt(4); // Morph-Discard a Zombie card. - this.addAbility(new MorphAbility(this, new DiscardCardCost(filter))); + this.addAbility(new MorphAbility(new DiscardCardCost(filter))); } private PutridRaptor(final PutridRaptor card) { diff --git a/Mage.Sets/src/mage/cards/p/Pyromatics.java b/Mage.Sets/src/mage/cards/p/Pyromatics.java index 28e4ae9597..ae25b1f27d 100644 --- a/Mage.Sets/src/mage/cards/p/Pyromatics.java +++ b/Mage.Sets/src/mage/cards/p/Pyromatics.java @@ -20,7 +20,7 @@ public final class Pyromatics extends CardImpl { // Replicate {1}{R} - this.addAbility(new ReplicateAbility(this, "{1}{R}")); + this.addAbility(new ReplicateAbility("{1}{R}")); // Pyromatics deals 1 damage to any target. this.getSpellAbility().addEffect(new DamageTargetEffect(1)); this.getSpellAbility().addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/q/QuicksilverDragon.java b/Mage.Sets/src/mage/cards/q/QuicksilverDragon.java index 358c2274fe..6a48f146f6 100644 --- a/Mage.Sets/src/mage/cards/q/QuicksilverDragon.java +++ b/Mage.Sets/src/mage/cards/q/QuicksilverDragon.java @@ -43,7 +43,7 @@ public final class QuicksilverDragon extends CardImpl { this.addAbility(ability); // Morph {4}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{4}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{U}"))); } private QuicksilverDragon(final QuicksilverDragon card) { diff --git a/Mage.Sets/src/mage/cards/r/RagavanNimblePilferer.java b/Mage.Sets/src/mage/cards/r/RagavanNimblePilferer.java index 8d5751714f..87cca377d8 100644 --- a/Mage.Sets/src/mage/cards/r/RagavanNimblePilferer.java +++ b/Mage.Sets/src/mage/cards/r/RagavanNimblePilferer.java @@ -39,7 +39,7 @@ public final class RagavanNimblePilferer extends CardImpl { this.addAbility(ability); // Dash {1}{R} - this.addAbility(new DashAbility(this, "{1}{R}")); + this.addAbility(new DashAbility("{1}{R}")); } private RagavanNimblePilferer(final RagavanNimblePilferer card) { diff --git a/Mage.Sets/src/mage/cards/r/RattleclawMystic.java b/Mage.Sets/src/mage/cards/r/RattleclawMystic.java index 4a6c47398d..2a8fc3c49b 100644 --- a/Mage.Sets/src/mage/cards/r/RattleclawMystic.java +++ b/Mage.Sets/src/mage/cards/r/RattleclawMystic.java @@ -36,7 +36,7 @@ public final class RattleclawMystic extends CardImpl { this.addAbility(new RedManaAbility()); // Morph {2} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}"))); // When Rattleclaw Mystic is turned face up, add {G}{U}{R}. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new AddManaToManaPoolSourceControllerEffect(new Mana(0, 1, 0, 1,1, 0,0, 0)))); diff --git a/Mage.Sets/src/mage/cards/r/RavenGuildInitiate.java b/Mage.Sets/src/mage/cards/r/RavenGuildInitiate.java index 9825c9f547..c098c694c7 100644 --- a/Mage.Sets/src/mage/cards/r/RavenGuildInitiate.java +++ b/Mage.Sets/src/mage/cards/r/RavenGuildInitiate.java @@ -33,7 +33,7 @@ public final class RavenGuildInitiate extends CardImpl { this.toughness = new MageInt(4); // Morph-Return a Bird you control to its owner's hand. - this.addAbility(new MorphAbility(this, new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(filter)))); + this.addAbility(new MorphAbility(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(filter)))); } diff --git a/Mage.Sets/src/mage/cards/r/RavenGuildMaster.java b/Mage.Sets/src/mage/cards/r/RavenGuildMaster.java index db5856c117..25d2eae10e 100644 --- a/Mage.Sets/src/mage/cards/r/RavenGuildMaster.java +++ b/Mage.Sets/src/mage/cards/r/RavenGuildMaster.java @@ -30,7 +30,7 @@ public final class RavenGuildMaster extends CardImpl { this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new ExileCardsFromTopOfLibraryTargetEffect(10, "that player"), false, true)); // Morph {2}{U}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{U}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{U}{U}"))); } private RavenGuildMaster(final RavenGuildMaster card) { diff --git a/Mage.Sets/src/mage/cards/r/RecklessImp.java b/Mage.Sets/src/mage/cards/r/RecklessImp.java index 3b8c9f72ac..58f9657eb5 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessImp.java +++ b/Mage.Sets/src/mage/cards/r/RecklessImp.java @@ -30,7 +30,7 @@ public final class RecklessImp extends CardImpl { this.addAbility(new CantBlockAbility()); // Dash {1}{B} - this.addAbility(new DashAbility(this, "{1}{B}")); + this.addAbility(new DashAbility("{1}{B}")); } private RecklessImp(final RecklessImp card) { diff --git a/Mage.Sets/src/mage/cards/r/RecklessWurm.java b/Mage.Sets/src/mage/cards/r/RecklessWurm.java index e37e946404..6c9452912a 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessWurm.java +++ b/Mage.Sets/src/mage/cards/r/RecklessWurm.java @@ -28,7 +28,7 @@ public final class RecklessWurm extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Madness {2}{R} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{2}{R}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{2}{R}"))); } private RecklessWurm(final RecklessWurm card) { diff --git a/Mage.Sets/src/mage/cards/r/Revolutionist.java b/Mage.Sets/src/mage/cards/r/Revolutionist.java index 9fb5d4e2a0..33c8d83dd8 100644 --- a/Mage.Sets/src/mage/cards/r/Revolutionist.java +++ b/Mage.Sets/src/mage/cards/r/Revolutionist.java @@ -34,7 +34,7 @@ public final class Revolutionist extends CardImpl { this.addAbility(ability); // Madness {3}{R} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl<>("{3}{R}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{3}{R}"))); } private Revolutionist(final Revolutionist card) { diff --git a/Mage.Sets/src/mage/cards/r/RiptideBiologist.java b/Mage.Sets/src/mage/cards/r/RiptideBiologist.java index 827fe7c2bb..515ac8e8f0 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideBiologist.java +++ b/Mage.Sets/src/mage/cards/r/RiptideBiologist.java @@ -34,7 +34,7 @@ public final class RiptideBiologist extends CardImpl { // Protection from Beasts this.addAbility(new ProtectionAbility(filter)); // Morph {2}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{U}"))); } private RiptideBiologist(final RiptideBiologist card) { diff --git a/Mage.Sets/src/mage/cards/r/RiptideEntrancer.java b/Mage.Sets/src/mage/cards/r/RiptideEntrancer.java index c6833b8115..674c026fb7 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideEntrancer.java +++ b/Mage.Sets/src/mage/cards/r/RiptideEntrancer.java @@ -39,7 +39,7 @@ public final class RiptideEntrancer extends CardImpl { this.addAbility(new RiptideEntrancerTriggeredAbility()); // Morph {U}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{U}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{U}{U}"))); } private RiptideEntrancer(final RiptideEntrancer card) { diff --git a/Mage.Sets/src/mage/cards/r/RiptidePilferer.java b/Mage.Sets/src/mage/cards/r/RiptidePilferer.java index 70e692d175..4fd1669cc6 100644 --- a/Mage.Sets/src/mage/cards/r/RiptidePilferer.java +++ b/Mage.Sets/src/mage/cards/r/RiptidePilferer.java @@ -27,7 +27,7 @@ public final class RiptidePilferer extends CardImpl { // Whenever Riptide Pilferer deals combat damage to a player, that player discards a card. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DiscardTargetEffect(1), false, true)); // Morph {U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{U}"))); } private RiptidePilferer(final RiptidePilferer card) { diff --git a/Mage.Sets/src/mage/cards/r/RiptideSurvivor.java b/Mage.Sets/src/mage/cards/r/RiptideSurvivor.java index dd7a114bbf..b7d8b365f7 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideSurvivor.java +++ b/Mage.Sets/src/mage/cards/r/RiptideSurvivor.java @@ -30,7 +30,7 @@ public final class RiptideSurvivor extends CardImpl { this.toughness = new MageInt(1); // Morph {1}{U}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{1}{U}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{1}{U}{U}"))); // When Riptide Survivor is turned face up, discard two cards, then draw three cards. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new DiscardControllerEffect(2)); Effect effect = new DrawCardSourceControllerEffect(3); diff --git a/Mage.Sets/src/mage/cards/r/RockshardElemental.java b/Mage.Sets/src/mage/cards/r/RockshardElemental.java index e38782d19f..4f9257586f 100644 --- a/Mage.Sets/src/mage/cards/r/RockshardElemental.java +++ b/Mage.Sets/src/mage/cards/r/RockshardElemental.java @@ -26,7 +26,7 @@ public final class RockshardElemental extends CardImpl { // Double strike this.addAbility(DoubleStrikeAbility.getInstance()); // Morph {4}{R}{R} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{4}{R}{R}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{R}{R}"))); } private RockshardElemental(final RockshardElemental card) { diff --git a/Mage.Sets/src/mage/cards/r/RootElemental.java b/Mage.Sets/src/mage/cards/r/RootElemental.java index 1d47710a43..fcc12c300a 100644 --- a/Mage.Sets/src/mage/cards/r/RootElemental.java +++ b/Mage.Sets/src/mage/cards/r/RootElemental.java @@ -26,7 +26,7 @@ public final class RootElemental extends CardImpl { this.toughness = new MageInt(5); // Morph {5}{G}{G} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{5}{G}{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{5}{G}{G}"))); // When Root Elemental is turned face up, you may put a creature card from your hand onto the battlefield. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_CREATURE_A))); } diff --git a/Mage.Sets/src/mage/cards/r/RuthlessRipper.java b/Mage.Sets/src/mage/cards/r/RuthlessRipper.java index 01f4da08f5..efd680cf51 100644 --- a/Mage.Sets/src/mage/cards/r/RuthlessRipper.java +++ b/Mage.Sets/src/mage/cards/r/RuthlessRipper.java @@ -43,7 +43,7 @@ public final class RuthlessRipper extends CardImpl { this.addAbility(DeathtouchAbility.getInstance()); // Morph - Reveal a black card in your hand. - this.addAbility(new MorphAbility(this, new RevealTargetFromHandCost(new TargetCardInHand(filter)))); + this.addAbility(new MorphAbility(new RevealTargetFromHandCost(new TargetCardInHand(filter)))); // When Ruthless Ripper is turned face up, target player loses 2 life. Effect effect = new LoseLifeTargetEffect(2); diff --git a/Mage.Sets/src/mage/cards/s/SageEyeHarrier.java b/Mage.Sets/src/mage/cards/s/SageEyeHarrier.java index 96f7cf1130..5b2215efc6 100644 --- a/Mage.Sets/src/mage/cards/s/SageEyeHarrier.java +++ b/Mage.Sets/src/mage/cards/s/SageEyeHarrier.java @@ -28,7 +28,7 @@ public final class SageEyeHarrier extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Morph {3}{W} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{3}{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{W}"))); } private SageEyeHarrier(final SageEyeHarrier card) { diff --git a/Mage.Sets/src/mage/cards/s/SaguArcher.java b/Mage.Sets/src/mage/cards/s/SaguArcher.java index 70b2e9bf31..b706cb6015 100644 --- a/Mage.Sets/src/mage/cards/s/SaguArcher.java +++ b/Mage.Sets/src/mage/cards/s/SaguArcher.java @@ -28,7 +28,7 @@ public final class SaguArcher extends CardImpl { // Reach this.addAbility(ReachAbility.getInstance()); // Morph {4}{G} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{4}{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{G}"))); } private SaguArcher(final SaguArcher card) { diff --git a/Mage.Sets/src/mage/cards/s/SaguMauler.java b/Mage.Sets/src/mage/cards/s/SaguMauler.java index bc16cb9669..79995068d7 100644 --- a/Mage.Sets/src/mage/cards/s/SaguMauler.java +++ b/Mage.Sets/src/mage/cards/s/SaguMauler.java @@ -30,7 +30,7 @@ public final class SaguMauler extends CardImpl { // Hexproof this.addAbility(HexproofAbility.getInstance()); // Morph {3}{G}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{3}{G}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{G}{U}"))); } private SaguMauler(final SaguMauler card) { diff --git a/Mage.Sets/src/mage/cards/s/SaltRoadAmbushers.java b/Mage.Sets/src/mage/cards/s/SaltRoadAmbushers.java index 310828ec3f..d766236ffe 100644 --- a/Mage.Sets/src/mage/cards/s/SaltRoadAmbushers.java +++ b/Mage.Sets/src/mage/cards/s/SaltRoadAmbushers.java @@ -32,7 +32,7 @@ public final class SaltRoadAmbushers extends CardImpl { this.addAbility(new SaltRoadAmbushersTriggeredAbility()); // Megamorph {3}{G}{G} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{3}{G}{G}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{G}{G}"), true)); } private SaltRoadAmbushers(final SaltRoadAmbushers card) { diff --git a/Mage.Sets/src/mage/cards/s/SandstormCharger.java b/Mage.Sets/src/mage/cards/s/SandstormCharger.java index 099e7cbcb0..a37db03633 100644 --- a/Mage.Sets/src/mage/cards/s/SandstormCharger.java +++ b/Mage.Sets/src/mage/cards/s/SandstormCharger.java @@ -23,7 +23,7 @@ public final class SandstormCharger extends CardImpl { this.toughness = new MageInt(4); // Megamorph {4}{W} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{4}{W}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{W}"), true)); } private SandstormCharger(final SandstormCharger card) { diff --git a/Mage.Sets/src/mage/cards/s/ScornfulEgotist.java b/Mage.Sets/src/mage/cards/s/ScornfulEgotist.java index 5866692170..4f25f8af6b 100644 --- a/Mage.Sets/src/mage/cards/s/ScornfulEgotist.java +++ b/Mage.Sets/src/mage/cards/s/ScornfulEgotist.java @@ -24,7 +24,7 @@ public final class ScornfulEgotist extends CardImpl { this.toughness = new MageInt(1); // Morph {U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{U}"))); } private ScornfulEgotist(final ScornfulEgotist card) { diff --git a/Mage.Sets/src/mage/cards/s/ScreamreachBrawler.java b/Mage.Sets/src/mage/cards/s/ScreamreachBrawler.java index da58f92d57..d1ac4b2581 100644 --- a/Mage.Sets/src/mage/cards/s/ScreamreachBrawler.java +++ b/Mage.Sets/src/mage/cards/s/ScreamreachBrawler.java @@ -23,7 +23,7 @@ public final class ScreamreachBrawler extends CardImpl { this.toughness = new MageInt(3); // Dash {1}{R} - this.addAbility(new DashAbility(this, "{1}{R}")); + this.addAbility(new DashAbility("{1}{R}")); } private ScreamreachBrawler(final ScreamreachBrawler card) { diff --git a/Mage.Sets/src/mage/cards/s/SegmentedKrotiq.java b/Mage.Sets/src/mage/cards/s/SegmentedKrotiq.java index 4e7dffb329..78d228ac51 100644 --- a/Mage.Sets/src/mage/cards/s/SegmentedKrotiq.java +++ b/Mage.Sets/src/mage/cards/s/SegmentedKrotiq.java @@ -23,7 +23,7 @@ public final class SegmentedKrotiq extends CardImpl { this.toughness = new MageInt(5); // Megamorph {6}{G} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{6}{G}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl("{6}{G}"), true)); } private SegmentedKrotiq(final SegmentedKrotiq card) { diff --git a/Mage.Sets/src/mage/cards/s/SenselessRage.java b/Mage.Sets/src/mage/cards/s/SenselessRage.java index 37eb244e02..4379ae8d86 100644 --- a/Mage.Sets/src/mage/cards/s/SenselessRage.java +++ b/Mage.Sets/src/mage/cards/s/SenselessRage.java @@ -39,7 +39,7 @@ public final class SenselessRage extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // Madness {1}{R} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{1}{R}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{1}{R}"))); } private SenselessRage(final SenselessRage card) { diff --git a/Mage.Sets/src/mage/cards/s/SerpentineBasilisk.java b/Mage.Sets/src/mage/cards/s/SerpentineBasilisk.java index ecf2ab7db9..2a8681b908 100644 --- a/Mage.Sets/src/mage/cards/s/SerpentineBasilisk.java +++ b/Mage.Sets/src/mage/cards/s/SerpentineBasilisk.java @@ -31,7 +31,7 @@ public final class SerpentineBasilisk extends CardImpl { new CreateDelayedTriggeredAbilityEffect( new AtTheEndOfCombatDelayedTriggeredAbility(new DestroyTargetEffect("destroy that creature at end of combat")), true), false, true)); // Morph {1}{G}{G} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{1}{G}{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{1}{G}{G}"))); } private SerpentineBasilisk(final SerpentineBasilisk card) { diff --git a/Mage.Sets/src/mage/cards/s/ShadowgrangeArchfiend.java b/Mage.Sets/src/mage/cards/s/ShadowgrangeArchfiend.java index f5bfaf1dba..74faa038b0 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowgrangeArchfiend.java +++ b/Mage.Sets/src/mage/cards/s/ShadowgrangeArchfiend.java @@ -43,7 +43,7 @@ public final class ShadowgrangeArchfiend extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new ShadowgrangeArchfiendEffect())); // Madness—{2}{B}, Pay 8 life. - MadnessAbility madnessAbility = new MadnessAbility(this, new ManaCostsImpl<>("{2}{B}"), 8); + MadnessAbility madnessAbility = new MadnessAbility(new ManaCostsImpl<>("{2}{B}"), 8); this.addAbility(madnessAbility); } diff --git a/Mage.Sets/src/mage/cards/s/ShaleskinPlower.java b/Mage.Sets/src/mage/cards/s/ShaleskinPlower.java index 06d4c812c0..2e76ea2b86 100644 --- a/Mage.Sets/src/mage/cards/s/ShaleskinPlower.java +++ b/Mage.Sets/src/mage/cards/s/ShaleskinPlower.java @@ -27,7 +27,7 @@ public final class ShaleskinPlower extends CardImpl { this.toughness = new MageInt(2); // Morph {4}{R} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{4}{R}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{R}"))); // When Shaleskin Plower is turned face up, destroy target land. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new DestroyTargetEffect()); ability.addTarget(new TargetLandPermanent()); diff --git a/Mage.Sets/src/mage/cards/s/ShaperParasite.java b/Mage.Sets/src/mage/cards/s/ShaperParasite.java index 891421e658..d41caa1c26 100644 --- a/Mage.Sets/src/mage/cards/s/ShaperParasite.java +++ b/Mage.Sets/src/mage/cards/s/ShaperParasite.java @@ -35,7 +35,7 @@ public final class ShaperParasite extends CardImpl { this.toughness = new MageInt(3); // Morph {2}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{U}"))); // When Shaper Parasite is turned face up, target creature gets +2/-2 or -2/+2 until end of turn. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new ShaperParasiteEffect()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/s/ShatteringSpree.java b/Mage.Sets/src/mage/cards/s/ShatteringSpree.java index 71ad446089..de4ad775c5 100644 --- a/Mage.Sets/src/mage/cards/s/ShatteringSpree.java +++ b/Mage.Sets/src/mage/cards/s/ShatteringSpree.java @@ -19,7 +19,7 @@ public final class ShatteringSpree extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{R}"); // Replicate {R} - this.addAbility(new ReplicateAbility(this, "{R}")); + this.addAbility(new ReplicateAbility("{R}")); // Destroy target artifact. this.getSpellAbility().addEffect(new DestroyTargetEffect(false)); this.getSpellAbility().addTarget(new TargetArtifactPermanent()); diff --git a/Mage.Sets/src/mage/cards/s/ShieldhideDragon.java b/Mage.Sets/src/mage/cards/s/ShieldhideDragon.java index 79bd73c9b2..2447912018 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldhideDragon.java +++ b/Mage.Sets/src/mage/cards/s/ShieldhideDragon.java @@ -43,7 +43,7 @@ public final class ShieldhideDragon extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // Megamorph {5}{W}{W} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{5}{W}{W}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl("{5}{W}{W}"), true)); // When Shieldhide Dragon is turned face up, put a +1/+1 counter on each other Dragon you control. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter), false, false)); diff --git a/Mage.Sets/src/mage/cards/s/ShorecrasherElemental.java b/Mage.Sets/src/mage/cards/s/ShorecrasherElemental.java index 7ad5d64daf..1996ca1408 100644 --- a/Mage.Sets/src/mage/cards/s/ShorecrasherElemental.java +++ b/Mage.Sets/src/mage/cards/s/ShorecrasherElemental.java @@ -44,7 +44,7 @@ public final class ShorecrasherElemental extends CardImpl { this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShorecrasherElementalBoostEffect(), new ManaCostsImpl("{1}"))); // Megamorph {4}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{4}{U}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{U}"), true)); } diff --git a/Mage.Sets/src/mage/cards/s/SidisisPet.java b/Mage.Sets/src/mage/cards/s/SidisisPet.java index 3785073bc2..7872976acc 100644 --- a/Mage.Sets/src/mage/cards/s/SidisisPet.java +++ b/Mage.Sets/src/mage/cards/s/SidisisPet.java @@ -29,7 +29,7 @@ public final class SidisisPet extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // Morph {1}{B} - this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{B}"))); } private SidisisPet(final SidisisPet card) { diff --git a/Mage.Sets/src/mage/cards/s/SiegeOfTowers.java b/Mage.Sets/src/mage/cards/s/SiegeOfTowers.java index 621a611d9d..36896ebc8d 100644 --- a/Mage.Sets/src/mage/cards/s/SiegeOfTowers.java +++ b/Mage.Sets/src/mage/cards/s/SiegeOfTowers.java @@ -32,7 +32,7 @@ public final class SiegeOfTowers extends CardImpl { // Replicate {1}{R} - this.addAbility(new ReplicateAbility(this, "{1}{R}")); + this.addAbility(new ReplicateAbility("{1}{R}")); // Target Mountain becomes a 3/1 creature. It's still a land. Effect effect = new BecomesCreatureTargetEffect(new CreatureToken(3, 1), false, true, Duration.EndOfGame); diff --git a/Mage.Sets/src/mage/cards/s/SilentSpecter.java b/Mage.Sets/src/mage/cards/s/SilentSpecter.java index 6413be75ae..f33626cb3e 100644 --- a/Mage.Sets/src/mage/cards/s/SilentSpecter.java +++ b/Mage.Sets/src/mage/cards/s/SilentSpecter.java @@ -31,7 +31,7 @@ public final class SilentSpecter extends CardImpl { // Whenever Silent Specter deals combat damage to a player, that player discards two cards. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DiscardTargetEffect(2), false, true)); // Morph {3}{B}{B} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{3}{B}{B}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{B}{B}"))); } private SilentSpecter(final SilentSpecter card) { diff --git a/Mage.Sets/src/mage/cards/s/SilumgarAssassin.java b/Mage.Sets/src/mage/cards/s/SilumgarAssassin.java index c0d1f3314f..7ec71e11a4 100644 --- a/Mage.Sets/src/mage/cards/s/SilumgarAssassin.java +++ b/Mage.Sets/src/mage/cards/s/SilumgarAssassin.java @@ -45,7 +45,7 @@ public final class SilumgarAssassin extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByCreaturesWithGreaterPowerEffect())); // Megamorph {2}{B} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{B}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{B}"), true)); // When Silumgar Assassin is turned face up, destroy target creature with power 3 or less an opponent controls. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new DestroyTargetEffect(), false); diff --git a/Mage.Sets/src/mage/cards/s/SilumgarSpellEater.java b/Mage.Sets/src/mage/cards/s/SilumgarSpellEater.java index 1baa6a02c2..08fdd03aee 100644 --- a/Mage.Sets/src/mage/cards/s/SilumgarSpellEater.java +++ b/Mage.Sets/src/mage/cards/s/SilumgarSpellEater.java @@ -29,7 +29,7 @@ public final class SilumgarSpellEater extends CardImpl { this.toughness = new MageInt(3); // Megamorph {4}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{4}{U}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{U}"), true)); // When Silumgar Spell-Eater is turned face up, counter target spell unless its controller pays {3}. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new CounterUnlessPaysEffect(new GenericManaCost(3)), false, false); diff --git a/Mage.Sets/src/mage/cards/s/Skinthinner.java b/Mage.Sets/src/mage/cards/s/Skinthinner.java index 2f442022d5..052190c5f5 100644 --- a/Mage.Sets/src/mage/cards/s/Skinthinner.java +++ b/Mage.Sets/src/mage/cards/s/Skinthinner.java @@ -27,7 +27,7 @@ public final class Skinthinner extends CardImpl { this.toughness = new MageInt(1); // Morph {3}{B}{B} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{3}{B}{B}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{B}{B}"))); // When Skinthinner is turned face up, destroy target nonblack creature. It can't be regenerated. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new DestroyTargetEffect(true)); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_PERMANENT_CREATURE_NON_BLACK)); diff --git a/Mage.Sets/src/mage/cards/s/SkirkCommando.java b/Mage.Sets/src/mage/cards/s/SkirkCommando.java index 746253a516..d44a07d1c9 100644 --- a/Mage.Sets/src/mage/cards/s/SkirkCommando.java +++ b/Mage.Sets/src/mage/cards/s/SkirkCommando.java @@ -35,7 +35,7 @@ public final class SkirkCommando extends CardImpl { this.addAbility(new SkirkCommandoTriggeredAbility()); //Morph {2}{R} (You may cast this card face down as a 2/2 creature for 3. Turn it face up any time for its morph cost.) - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{R}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{R}"))); } diff --git a/Mage.Sets/src/mage/cards/s/SkirkMarauder.java b/Mage.Sets/src/mage/cards/s/SkirkMarauder.java index fd811d16df..397940e73c 100644 --- a/Mage.Sets/src/mage/cards/s/SkirkMarauder.java +++ b/Mage.Sets/src/mage/cards/s/SkirkMarauder.java @@ -27,7 +27,7 @@ public final class SkirkMarauder extends CardImpl { this.toughness = new MageInt(1); // Morph {2}{R} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{R}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{R}"))); // When Skirk Marauder is turned face up, it deals 2 damage to any target. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new DamageTargetEffect(2, "it")); diff --git a/Mage.Sets/src/mage/cards/s/SkirkVolcanist.java b/Mage.Sets/src/mage/cards/s/SkirkVolcanist.java index d130eeb811..0d9c5b13e9 100644 --- a/Mage.Sets/src/mage/cards/s/SkirkVolcanist.java +++ b/Mage.Sets/src/mage/cards/s/SkirkVolcanist.java @@ -34,7 +34,7 @@ public final class SkirkVolcanist extends CardImpl { this.toughness = new MageInt(1); // Morph-Sacrifice two Mountains. - this.addAbility(new MorphAbility(this, new SacrificeTargetCost(new TargetControlledPermanent(2, filter)))); + this.addAbility(new MorphAbility(new SacrificeTargetCost(new TargetControlledPermanent(2, filter)))); // When Skirk Volcanist is turned face up, it deals 3 damage divided as you choose among one, two, or three target creatures. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new DamageMultiEffect(3, "it")); diff --git a/Mage.Sets/src/mage/cards/s/SkittishValesk.java b/Mage.Sets/src/mage/cards/s/SkittishValesk.java index 0eec5f0245..04d609547c 100644 --- a/Mage.Sets/src/mage/cards/s/SkittishValesk.java +++ b/Mage.Sets/src/mage/cards/s/SkittishValesk.java @@ -35,7 +35,7 @@ public final class SkittishValesk extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SkittishValeskEffect(), TargetController.YOU, false)); // Morph {5}{R} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{5}{R}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{5}{R}"))); } private SkittishValesk(final SkittishValesk card) { diff --git a/Mage.Sets/src/mage/cards/s/SkophosReaver.java b/Mage.Sets/src/mage/cards/s/SkophosReaver.java index 977aea32ff..88bc857134 100644 --- a/Mage.Sets/src/mage/cards/s/SkophosReaver.java +++ b/Mage.Sets/src/mage/cards/s/SkophosReaver.java @@ -35,7 +35,7 @@ public final class SkophosReaver extends CardImpl { ))); // Madness {1}{R} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl<>("{1}{R}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{1}{R}"))); } private SkophosReaver(final SkophosReaver card) { diff --git a/Mage.Sets/src/mage/cards/s/SlipstreamSerpent.java b/Mage.Sets/src/mage/cards/s/SlipstreamSerpent.java index d656a21b7f..03fb381a45 100644 --- a/Mage.Sets/src/mage/cards/s/SlipstreamSerpent.java +++ b/Mage.Sets/src/mage/cards/s/SlipstreamSerpent.java @@ -38,7 +38,7 @@ public final class SlipstreamSerpent extends CardImpl { new SacrificeSourceEffect())); // Morph {5}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{5}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{5}{U}"))); } private SlipstreamSerpent(final SlipstreamSerpent card) { diff --git a/Mage.Sets/src/mage/cards/s/SnappingThragg.java b/Mage.Sets/src/mage/cards/s/SnappingThragg.java index d18c30f2e9..490e959fdb 100644 --- a/Mage.Sets/src/mage/cards/s/SnappingThragg.java +++ b/Mage.Sets/src/mage/cards/s/SnappingThragg.java @@ -36,7 +36,7 @@ public final class SnappingThragg extends CardImpl { this.addAbility(new SnappingThraggTriggeredAbility()); // Morph {4}{R}{R} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{4}{R}{R}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{R}{R}"))); } diff --git a/Mage.Sets/src/mage/cards/s/SnarlingUndorak.java b/Mage.Sets/src/mage/cards/s/SnarlingUndorak.java index 2c6d6465d9..8f4a57db5f 100644 --- a/Mage.Sets/src/mage/cards/s/SnarlingUndorak.java +++ b/Mage.Sets/src/mage/cards/s/SnarlingUndorak.java @@ -40,7 +40,7 @@ public final class SnarlingUndorak extends CardImpl { ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); // Morph {1}{G}{G} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{1}{G}{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{1}{G}{G}"))); } private SnarlingUndorak(final SnarlingUndorak card) { diff --git a/Mage.Sets/src/mage/cards/s/SnowhornRider.java b/Mage.Sets/src/mage/cards/s/SnowhornRider.java index ad798dd990..cd543fbe5c 100644 --- a/Mage.Sets/src/mage/cards/s/SnowhornRider.java +++ b/Mage.Sets/src/mage/cards/s/SnowhornRider.java @@ -28,7 +28,7 @@ public final class SnowhornRider extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // Morph {2}{G}{U}{R} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{G}{U}{R}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{G}{U}{R}"))); } private SnowhornRider(final SnowhornRider card) { diff --git a/Mage.Sets/src/mage/cards/s/SootfeatherFlock.java b/Mage.Sets/src/mage/cards/s/SootfeatherFlock.java index 3927f63ec3..566a031610 100644 --- a/Mage.Sets/src/mage/cards/s/SootfeatherFlock.java +++ b/Mage.Sets/src/mage/cards/s/SootfeatherFlock.java @@ -26,7 +26,7 @@ public final class SootfeatherFlock extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Morph {3}{B} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{3}{B}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{B}"))); } private SootfeatherFlock(final SootfeatherFlock card) { diff --git a/Mage.Sets/src/mage/cards/s/SoulCollector.java b/Mage.Sets/src/mage/cards/s/SoulCollector.java index 8595cf79cc..a59acd0df5 100644 --- a/Mage.Sets/src/mage/cards/s/SoulCollector.java +++ b/Mage.Sets/src/mage/cards/s/SoulCollector.java @@ -31,7 +31,7 @@ public final class SoulCollector extends CardImpl { this.addAbility(new DealtDamageAndDiedTriggeredAbility(new ReturnToBattlefieldUnderYourControlTargetEffect())); // Morph {B}{B}{B} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{B}{B}{B}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{B}{B}{B}"))); } private SoulCollector(final SoulCollector card) { diff --git a/Mage.Sets/src/mage/cards/s/SpinedBasher.java b/Mage.Sets/src/mage/cards/s/SpinedBasher.java index 9d86aab6d0..084f3f2144 100644 --- a/Mage.Sets/src/mage/cards/s/SpinedBasher.java +++ b/Mage.Sets/src/mage/cards/s/SpinedBasher.java @@ -24,7 +24,7 @@ public final class SpinedBasher extends CardImpl { this.toughness = new MageInt(1); // Morph {2}{B} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{B}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{B}"))); } private SpinedBasher(final SpinedBasher card) { diff --git a/Mage.Sets/src/mage/cards/s/SpittingGourna.java b/Mage.Sets/src/mage/cards/s/SpittingGourna.java index e6986190bc..6c3821fc99 100644 --- a/Mage.Sets/src/mage/cards/s/SpittingGourna.java +++ b/Mage.Sets/src/mage/cards/s/SpittingGourna.java @@ -26,7 +26,7 @@ public final class SpittingGourna extends CardImpl { // Reach this.addAbility(ReachAbility.getInstance()); // Morph {4}{G} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{4}{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{G}"))); } private SpittingGourna(final SpittingGourna card) { diff --git a/Mage.Sets/src/mage/cards/s/SprintingWarbrute.java b/Mage.Sets/src/mage/cards/s/SprintingWarbrute.java index de2e1e8f32..fc912f8e74 100644 --- a/Mage.Sets/src/mage/cards/s/SprintingWarbrute.java +++ b/Mage.Sets/src/mage/cards/s/SprintingWarbrute.java @@ -26,7 +26,7 @@ public final class SprintingWarbrute extends CardImpl { // Sprinting Warbrute attacks each turn if able. this.addAbility(new AttacksEachCombatStaticAbility()); // Dash {3}{R} - this.addAbility(new DashAbility(this, "{3}{R}")); + this.addAbility(new DashAbility("{3}{R}")); } private SprintingWarbrute(final SprintingWarbrute card) { diff --git a/Mage.Sets/src/mage/cards/s/StensiaMasquerade.java b/Mage.Sets/src/mage/cards/s/StensiaMasquerade.java index df953fc890..b7d5b5869f 100644 --- a/Mage.Sets/src/mage/cards/s/StensiaMasquerade.java +++ b/Mage.Sets/src/mage/cards/s/StensiaMasquerade.java @@ -22,7 +22,6 @@ import mage.filter.predicate.permanent.AttackingPredicate; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; @@ -50,7 +49,7 @@ public final class StensiaMasquerade extends CardImpl { this.addAbility(new StensiaMasqueradeTriggeredAbility()); // Madness {2}{R} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{2}{R}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{2}{R}"))); } private StensiaMasquerade(final StensiaMasquerade card) { diff --git a/Mage.Sets/src/mage/cards/s/StormcragElemental.java b/Mage.Sets/src/mage/cards/s/StormcragElemental.java index 248d146de4..d2d26275ae 100644 --- a/Mage.Sets/src/mage/cards/s/StormcragElemental.java +++ b/Mage.Sets/src/mage/cards/s/StormcragElemental.java @@ -27,7 +27,7 @@ public final class StormcragElemental extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Megamorph {4}{R}{R} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{4}{R}{R}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{R}{R}"), true)); } private StormcragElemental(final StormcragElemental card) { diff --git a/Mage.Sets/src/mage/cards/s/StormwingDragon.java b/Mage.Sets/src/mage/cards/s/StormwingDragon.java index 2ab90cea19..0a1b7d52d9 100644 --- a/Mage.Sets/src/mage/cards/s/StormwingDragon.java +++ b/Mage.Sets/src/mage/cards/s/StormwingDragon.java @@ -43,7 +43,7 @@ public final class StormwingDragon extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // Megamorph {5}{R}{R} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{5}{R}{R}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl("{5}{R}{R}"), true)); // When Stormwing Dragon is turned face up, put a +1/+1 counter on each other Dragon creature you control. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter), false, false)); diff --git a/Mage.Sets/src/mage/cards/s/StratusDancer.java b/Mage.Sets/src/mage/cards/s/StratusDancer.java index bd0c35adf0..6e57901459 100644 --- a/Mage.Sets/src/mage/cards/s/StratusDancer.java +++ b/Mage.Sets/src/mage/cards/s/StratusDancer.java @@ -34,7 +34,7 @@ public final class StratusDancer extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Megamorph {1}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{1}{U}"), true)); + this.addAbility(new MorphAbility(new ManaCostsImpl("{1}{U}"), true)); // When Stratus Dancer is turned face up, counter target instant or sorcery spell Effect effect = new CounterTargetEffect(); diff --git a/Mage.Sets/src/mage/cards/s/StreamOfThought.java b/Mage.Sets/src/mage/cards/s/StreamOfThought.java index c2772831fd..4a0f2cc2b6 100644 --- a/Mage.Sets/src/mage/cards/s/StreamOfThought.java +++ b/Mage.Sets/src/mage/cards/s/StreamOfThought.java @@ -32,7 +32,7 @@ public final class StreamOfThought extends CardImpl { this.getSpellAbility().addTarget(new TargetPlayer()); // Replicate {2}{U}{U} - this.addAbility(new ReplicateAbility(this, "{2}{U}{U}")); + this.addAbility(new ReplicateAbility("{2}{U}{U}")); } private StreamOfThought(final StreamOfThought card) { diff --git a/Mage.Sets/src/mage/cards/s/StrengthOfIsolation.java b/Mage.Sets/src/mage/cards/s/StrengthOfIsolation.java index b8eef436c7..7382dda0dd 100644 --- a/Mage.Sets/src/mage/cards/s/StrengthOfIsolation.java +++ b/Mage.Sets/src/mage/cards/s/StrengthOfIsolation.java @@ -47,7 +47,7 @@ public final class StrengthOfIsolation extends CardImpl { ability.addEffect(effect); this.addAbility(ability); // Madness {W} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{W}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{W}"))); } private StrengthOfIsolation(final StrengthOfIsolation card) { diff --git a/Mage.Sets/src/mage/cards/s/StrengthOfLunacy.java b/Mage.Sets/src/mage/cards/s/StrengthOfLunacy.java index 879bf4adb1..a2d2fea2ce 100644 --- a/Mage.Sets/src/mage/cards/s/StrengthOfLunacy.java +++ b/Mage.Sets/src/mage/cards/s/StrengthOfLunacy.java @@ -47,7 +47,7 @@ public final class StrengthOfLunacy extends CardImpl { ability.addEffect(effect); this.addAbility(ability); // Madness {B} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{B}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{B}"))); } private StrengthOfLunacy(final StrengthOfLunacy card) { diff --git a/Mage.Sets/src/mage/cards/s/StromkirkOccultist.java b/Mage.Sets/src/mage/cards/s/StromkirkOccultist.java index a33db53e38..275548de47 100644 --- a/Mage.Sets/src/mage/cards/s/StromkirkOccultist.java +++ b/Mage.Sets/src/mage/cards/s/StromkirkOccultist.java @@ -33,7 +33,7 @@ public final class StromkirkOccultist extends CardImpl { this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new ExileTopXMayPlayUntilEndOfTurnEffect(1), false)); // Madness {1}{R} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{1}{R}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{1}{R}"))); } private StromkirkOccultist(final StromkirkOccultist card) { diff --git a/Mage.Sets/src/mage/cards/t/TemurCharger.java b/Mage.Sets/src/mage/cards/t/TemurCharger.java index d0df7b3843..764118f0bd 100644 --- a/Mage.Sets/src/mage/cards/t/TemurCharger.java +++ b/Mage.Sets/src/mage/cards/t/TemurCharger.java @@ -40,7 +40,7 @@ public final class TemurCharger extends CardImpl { this.toughness = new MageInt(1); // Morph - Reveal a green card in your hand. - this.addAbility(new MorphAbility(this, new RevealTargetFromHandCost(new TargetCardInHand(filter)))); + this.addAbility(new MorphAbility(new RevealTargetFromHandCost(new TargetCardInHand(filter)))); // When Temur Charger is turned face up, target creature gains trample until end of turn. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/cards/t/TerminalAgony.java b/Mage.Sets/src/mage/cards/t/TerminalAgony.java index f4200e43ee..c77ed38664 100644 --- a/Mage.Sets/src/mage/cards/t/TerminalAgony.java +++ b/Mage.Sets/src/mage/cards/t/TerminalAgony.java @@ -23,7 +23,7 @@ public final class TerminalAgony extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Madness {B}{R} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl<>("{B}{R}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{B}{R}"))); } private TerminalAgony(final TerminalAgony card) { diff --git a/Mage.Sets/src/mage/cards/t/TheloniteHermit.java b/Mage.Sets/src/mage/cards/t/TheloniteHermit.java index 7f78ecf9f1..1460dbc320 100644 --- a/Mage.Sets/src/mage/cards/t/TheloniteHermit.java +++ b/Mage.Sets/src/mage/cards/t/TheloniteHermit.java @@ -42,7 +42,7 @@ public final class TheloniteHermit extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); // Morph {3}{G}{G} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{3}{G}{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{G}{G}"))); // 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/ThousandWinds.java b/Mage.Sets/src/mage/cards/t/ThousandWinds.java index 38ec8ab347..d47f697661 100644 --- a/Mage.Sets/src/mage/cards/t/ThousandWinds.java +++ b/Mage.Sets/src/mage/cards/t/ThousandWinds.java @@ -39,7 +39,7 @@ public final class ThousandWinds extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Morph {5}{U}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{5}{U}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{5}{U}{U}"))); // When Thousand Winds is turned face up, return all other tapped creatures to their owners' hands. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new ReturnToHandFromBattlefieldAllEffect(filter))); } diff --git a/Mage.Sets/src/mage/cards/t/ThrashingMudspawn.java b/Mage.Sets/src/mage/cards/t/ThrashingMudspawn.java index 3f614b1a97..2eef3920f0 100644 --- a/Mage.Sets/src/mage/cards/t/ThrashingMudspawn.java +++ b/Mage.Sets/src/mage/cards/t/ThrashingMudspawn.java @@ -35,7 +35,7 @@ public final class ThrashingMudspawn extends CardImpl { this.addAbility(ability); // Morph {1}{B}{B} - this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{B}{B}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{B}{B}"))); } diff --git a/Mage.Sets/src/mage/cards/t/Thunderheads.java b/Mage.Sets/src/mage/cards/t/Thunderheads.java index ca78bae911..d7235eb053 100644 --- a/Mage.Sets/src/mage/cards/t/Thunderheads.java +++ b/Mage.Sets/src/mage/cards/t/Thunderheads.java @@ -23,7 +23,7 @@ public final class Thunderheads extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{U}"); // Replicate {2}{U} - this.addAbility(new ReplicateAbility(this, "{2}{U}")); + this.addAbility(new ReplicateAbility("{2}{U}")); // 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()); } diff --git a/Mage.Sets/src/mage/cards/t/Timebender.java b/Mage.Sets/src/mage/cards/t/Timebender.java index 6fba549bd1..e8ad5090cd 100644 --- a/Mage.Sets/src/mage/cards/t/Timebender.java +++ b/Mage.Sets/src/mage/cards/t/Timebender.java @@ -41,7 +41,7 @@ public final class Timebender extends CardImpl { this.toughness = new MageInt(1); // Morph {U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{U}"))); // When Timebender is turned face up, choose one — // Remove two time counters from target permanent or suspended card. diff --git a/Mage.Sets/src/mage/cards/t/TitanicBulvox.java b/Mage.Sets/src/mage/cards/t/TitanicBulvox.java index 7ddd62088c..a5d328987b 100644 --- a/Mage.Sets/src/mage/cards/t/TitanicBulvox.java +++ b/Mage.Sets/src/mage/cards/t/TitanicBulvox.java @@ -26,7 +26,7 @@ public final class TitanicBulvox extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // Morph {4}{G}{G}{G} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{4}{G}{G}{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{G}{G}{G}"))); } private TitanicBulvox(final TitanicBulvox card) { diff --git a/Mage.Sets/src/mage/cards/t/ToweringBaloth.java b/Mage.Sets/src/mage/cards/t/ToweringBaloth.java index a11b5876eb..115a8bf9d3 100644 --- a/Mage.Sets/src/mage/cards/t/ToweringBaloth.java +++ b/Mage.Sets/src/mage/cards/t/ToweringBaloth.java @@ -23,7 +23,7 @@ public final class ToweringBaloth extends CardImpl { this.toughness = new MageInt(6); // Morph {6}{G} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{6}{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{6}{G}"))); } private ToweringBaloth(final ToweringBaloth card) { diff --git a/Mage.Sets/src/mage/cards/t/TrainOfThought.java b/Mage.Sets/src/mage/cards/t/TrainOfThought.java index 59e39d6f44..e4722438cb 100644 --- a/Mage.Sets/src/mage/cards/t/TrainOfThought.java +++ b/Mage.Sets/src/mage/cards/t/TrainOfThought.java @@ -19,7 +19,7 @@ public final class TrainOfThought extends CardImpl { // Replicate {1}{U} - this.addAbility(new ReplicateAbility(this, "{1}{U}")); + this.addAbility(new ReplicateAbility("{1}{U}")); // Draw a card. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/cards/t/TreespringLorian.java b/Mage.Sets/src/mage/cards/t/TreespringLorian.java index 395bf7d8b9..1c54d8e614 100644 --- a/Mage.Sets/src/mage/cards/t/TreespringLorian.java +++ b/Mage.Sets/src/mage/cards/t/TreespringLorian.java @@ -23,7 +23,7 @@ public final class TreespringLorian extends CardImpl { this.toughness = new MageInt(4); // Morph {5}{G} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{5}{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{5}{G}"))); } private TreespringLorian(final TreespringLorian card) { diff --git a/Mage.Sets/src/mage/cards/t/TreetopAmbusher.java b/Mage.Sets/src/mage/cards/t/TreetopAmbusher.java index db38f1f9bf..e02c463cc8 100644 --- a/Mage.Sets/src/mage/cards/t/TreetopAmbusher.java +++ b/Mage.Sets/src/mage/cards/t/TreetopAmbusher.java @@ -28,7 +28,7 @@ public final class TreetopAmbusher extends CardImpl { this.toughness = new MageInt(1); // Dash {1}{G} - this.addAbility(new DashAbility(this, "{1}{G}")); + this.addAbility(new DashAbility("{1}{G}")); // Whenever Treetop Ambusher attacks, target creature you control gets +1/+1 until end of turn. Ability ability = new AttacksTriggeredAbility(new BoostTargetEffect( diff --git a/Mage.Sets/src/mage/cards/t/TribalForcemage.java b/Mage.Sets/src/mage/cards/t/TribalForcemage.java index 5f65eaa9d0..a0efc902fe 100644 --- a/Mage.Sets/src/mage/cards/t/TribalForcemage.java +++ b/Mage.Sets/src/mage/cards/t/TribalForcemage.java @@ -34,7 +34,7 @@ public final class TribalForcemage extends CardImpl { this.toughness = new MageInt(1); // Morph {1}{G} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{1}{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{1}{G}"))); // When Tribal Forcemage is turned face up, creatures of the creature type of your choice get +2/+2 and gain trample until end of turn. Effect effect = new ChooseCreatureTypeEffect(Outcome.BoostCreature); diff --git a/Mage.Sets/src/mage/cards/t/TwinsOfMaurerEstate.java b/Mage.Sets/src/mage/cards/t/TwinsOfMaurerEstate.java index 5a4baa1ef3..b2c237c73a 100644 --- a/Mage.Sets/src/mage/cards/t/TwinsOfMaurerEstate.java +++ b/Mage.Sets/src/mage/cards/t/TwinsOfMaurerEstate.java @@ -23,7 +23,7 @@ public final class TwinsOfMaurerEstate extends CardImpl { this.toughness = new MageInt(5); // Madness {2}{B} (If you discard this card, discard it into exile. When you do, cast it for its madness cost or put it into your graveyard.) - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{2}{B}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{2}{B}"))); } private TwinsOfMaurerEstate(final TwinsOfMaurerEstate card) { diff --git a/Mage.Sets/src/mage/cards/u/UnblinkingBleb.java b/Mage.Sets/src/mage/cards/u/UnblinkingBleb.java index f4c08a3002..f63c1b7624 100644 --- a/Mage.Sets/src/mage/cards/u/UnblinkingBleb.java +++ b/Mage.Sets/src/mage/cards/u/UnblinkingBleb.java @@ -28,7 +28,7 @@ public final class UnblinkingBleb extends CardImpl { this.toughness = new MageInt(3); // Morph {2}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{U}"))); // Whenever Unblinking Bleb or another permanent is turned face up, you may scry 2. this.addAbility(new TurnedFaceUpAllTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/u/UnstableHulk.java b/Mage.Sets/src/mage/cards/u/UnstableHulk.java index 3e2b970b65..3725e0cf6f 100644 --- a/Mage.Sets/src/mage/cards/u/UnstableHulk.java +++ b/Mage.Sets/src/mage/cards/u/UnstableHulk.java @@ -33,7 +33,7 @@ public final class UnstableHulk extends CardImpl { this.toughness = new MageInt(2); // Morph {3}{R}{R} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{R}{R}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{R}{R}"))); //When Unstable Hulk is turned face up, it gets +6/+6 and gains trample until end of turn. You skip your next turn. Effect effect = new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/cards/v/Vacuumelt.java b/Mage.Sets/src/mage/cards/v/Vacuumelt.java index 803fdea8f9..ab53f590a1 100644 --- a/Mage.Sets/src/mage/cards/v/Vacuumelt.java +++ b/Mage.Sets/src/mage/cards/v/Vacuumelt.java @@ -20,7 +20,7 @@ public final class Vacuumelt extends CardImpl { // Replicate {2}{U} - this.addAbility(new ReplicateAbility(this, "{2}{U}")); + this.addAbility(new ReplicateAbility("{2}{U}")); // Return target creature to its owner's hand. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/cards/v/Vaultbreaker.java b/Mage.Sets/src/mage/cards/v/Vaultbreaker.java index 46f60663c1..9afe53ea9d 100644 --- a/Mage.Sets/src/mage/cards/v/Vaultbreaker.java +++ b/Mage.Sets/src/mage/cards/v/Vaultbreaker.java @@ -31,7 +31,7 @@ public final class Vaultbreaker extends CardImpl { new DiscardCardCost()), false, "Whenever {this} attacks, you may discard a card. If you do, draw a card")); // Dash {2}{R} - this.addAbility(new DashAbility(this, "{2}{R}")); + this.addAbility(new DashAbility("{2}{R}")); } diff --git a/Mage.Sets/src/mage/cards/v/VenomspoutBrackus.java b/Mage.Sets/src/mage/cards/v/VenomspoutBrackus.java index c9c41a9077..0b53797dc3 100644 --- a/Mage.Sets/src/mage/cards/v/VenomspoutBrackus.java +++ b/Mage.Sets/src/mage/cards/v/VenomspoutBrackus.java @@ -45,7 +45,7 @@ public final class VenomspoutBrackus extends CardImpl { ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); // Morph {3}{G}{G} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{3}{G}{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{G}{G}"))); } diff --git a/Mage.Sets/src/mage/cards/v/VesuvanShapeshifter.java b/Mage.Sets/src/mage/cards/v/VesuvanShapeshifter.java index 69e6e3c519..7735264107 100644 --- a/Mage.Sets/src/mage/cards/v/VesuvanShapeshifter.java +++ b/Mage.Sets/src/mage/cards/v/VesuvanShapeshifter.java @@ -58,7 +58,7 @@ public final class VesuvanShapeshifter extends CardImpl { this.addAbility(ability); // Morph {1}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{1}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{1}{U}"))); } private VesuvanShapeshifter(final VesuvanShapeshifter card) { diff --git a/Mage.Sets/src/mage/cards/v/ViolentEruption.java b/Mage.Sets/src/mage/cards/v/ViolentEruption.java index 9adee17763..531e6adb94 100644 --- a/Mage.Sets/src/mage/cards/v/ViolentEruption.java +++ b/Mage.Sets/src/mage/cards/v/ViolentEruption.java @@ -23,7 +23,7 @@ public final class ViolentEruption extends CardImpl { this.getSpellAbility().addTarget(new TargetAnyTargetAmount(4)); // Madness {1}{R}{R} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{1}{R}{R}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{1}{R}{R}"))); } private ViolentEruption(final ViolentEruption card) { diff --git a/Mage.Sets/src/mage/cards/v/VoidmageApprentice.java b/Mage.Sets/src/mage/cards/v/VoidmageApprentice.java index 590b450790..2094448457 100644 --- a/Mage.Sets/src/mage/cards/v/VoidmageApprentice.java +++ b/Mage.Sets/src/mage/cards/v/VoidmageApprentice.java @@ -28,7 +28,7 @@ public final class VoidmageApprentice extends CardImpl { this.toughness = new MageInt(1); // Morph {2}{U}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{U}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{U}{U}"))); // When Voidmage Apprentice is turned face up, counter target spell. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new CounterTargetEffect(), false); diff --git a/Mage.Sets/src/mage/cards/v/VoidmageProdigy.java b/Mage.Sets/src/mage/cards/v/VoidmageProdigy.java index ba11561523..c4440d9c3e 100644 --- a/Mage.Sets/src/mage/cards/v/VoidmageProdigy.java +++ b/Mage.Sets/src/mage/cards/v/VoidmageProdigy.java @@ -47,7 +47,7 @@ public final class VoidmageProdigy extends CardImpl { this.addAbility(ability); // Morph {U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{U}"))); } private VoidmageProdigy(final VoidmageProdigy card) { diff --git a/Mage.Sets/src/mage/cards/v/VoldarenPariah.java b/Mage.Sets/src/mage/cards/v/VoldarenPariah.java index d5ead03280..0e683e6820 100644 --- a/Mage.Sets/src/mage/cards/v/VoldarenPariah.java +++ b/Mage.Sets/src/mage/cards/v/VoldarenPariah.java @@ -49,7 +49,7 @@ public final class VoldarenPariah extends CardImpl { new SacrificeTargetCost(new TargetControlledPermanent(3, 3, filter, false)))); // Madness {B}{B}{B} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{B}{B}{B}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{B}{B}{B}"))); } private VoldarenPariah(final VoldarenPariah card) { diff --git a/Mage.Sets/src/mage/cards/w/WallOfDeceit.java b/Mage.Sets/src/mage/cards/w/WallOfDeceit.java index a4df92b768..ca619f7b95 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfDeceit.java +++ b/Mage.Sets/src/mage/cards/w/WallOfDeceit.java @@ -37,7 +37,7 @@ public final class WallOfDeceit extends CardImpl { this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new WallOfDeceitEffect(), new ManaCostsImpl("{3}"))); // Morph {U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{U}"))); } private WallOfDeceit(final WallOfDeceit card) { diff --git a/Mage.Sets/src/mage/cards/w/WarBehemoth.java b/Mage.Sets/src/mage/cards/w/WarBehemoth.java index 3ec49a16de..c2f8422e56 100644 --- a/Mage.Sets/src/mage/cards/w/WarBehemoth.java +++ b/Mage.Sets/src/mage/cards/w/WarBehemoth.java @@ -24,7 +24,7 @@ public final class WarBehemoth extends CardImpl { this.toughness = new MageInt(6); // Morph {4}{W} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{4}{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{W}"))); } private WarBehemoth(final WarBehemoth card) { diff --git a/Mage.Sets/src/mage/cards/w/WarbreakTrumpeter.java b/Mage.Sets/src/mage/cards/w/WarbreakTrumpeter.java index 9294633e3a..5ce640adae 100644 --- a/Mage.Sets/src/mage/cards/w/WarbreakTrumpeter.java +++ b/Mage.Sets/src/mage/cards/w/WarbreakTrumpeter.java @@ -28,7 +28,7 @@ public final class WarbreakTrumpeter extends CardImpl { this.toughness = new MageInt(1); // Morph {X}{X}{R} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{X}{X}{R}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{X}{X}{R}"))); // When Warbreak Trumpeter is turned face up, create X 1/1 red Goblin creature tokens. DynamicValue morphX = MorphManacostVariableValue.instance; diff --git a/Mage.Sets/src/mage/cards/w/Warbringer.java b/Mage.Sets/src/mage/cards/w/Warbringer.java index 432e679a2f..d4690bc3ff 100644 --- a/Mage.Sets/src/mage/cards/w/Warbringer.java +++ b/Mage.Sets/src/mage/cards/w/Warbringer.java @@ -32,7 +32,7 @@ public final class Warbringer extends CardImpl { this.addAbility(new SimpleStaticAbility(new WarbringerSpellsCostReductionEffect())); // Dash {2}{R} - this.addAbility(new DashAbility(this, "{2}{R}")); + this.addAbility(new DashAbility("{2}{R}")); } private Warbringer(final Warbringer card) { diff --git a/Mage.Sets/src/mage/cards/w/WatcherOfTheRoost.java b/Mage.Sets/src/mage/cards/w/WatcherOfTheRoost.java index d4b25d7676..306b7903b7 100644 --- a/Mage.Sets/src/mage/cards/w/WatcherOfTheRoost.java +++ b/Mage.Sets/src/mage/cards/w/WatcherOfTheRoost.java @@ -41,7 +41,7 @@ public final class WatcherOfTheRoost extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Morph - Reveal a white card in your hand - this.addAbility(new MorphAbility(this, new RevealTargetFromHandCost(new TargetCardInHand(filter)))); + this.addAbility(new MorphAbility(new RevealTargetFromHandCost(new TargetCardInHand(filter)))); // When Watcher of the Roost is turned face up, you gain 2 life. Effect effect = new GainLifeEffect(2); diff --git a/Mage.Sets/src/mage/cards/w/WeatheredBodyguards.java b/Mage.Sets/src/mage/cards/w/WeatheredBodyguards.java index 7ba853e9df..873c3a4070 100644 --- a/Mage.Sets/src/mage/cards/w/WeatheredBodyguards.java +++ b/Mage.Sets/src/mage/cards/w/WeatheredBodyguards.java @@ -38,7 +38,7 @@ public final class WeatheredBodyguards extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WeatheredBodyguardsEffect())); // Morph {3}{W} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{3}{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/w/WeaverOfLies.java b/Mage.Sets/src/mage/cards/w/WeaverOfLies.java index d5c53665d3..144b913e01 100644 --- a/Mage.Sets/src/mage/cards/w/WeaverOfLies.java +++ b/Mage.Sets/src/mage/cards/w/WeaverOfLies.java @@ -45,7 +45,7 @@ public final class WeaverOfLies extends CardImpl { this.toughness = new MageInt(4); // Morph {4}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{4}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{U}"))); // When Weaver of Lies is turned face up, turn any number of target creatures with a morph ability other than Weaver of Lies face down. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new WeaverOfLiesEffect(), false, false); diff --git a/Mage.Sets/src/mage/cards/w/WeirdedVampire.java b/Mage.Sets/src/mage/cards/w/WeirdedVampire.java index fd7b94305c..4c39160da4 100644 --- a/Mage.Sets/src/mage/cards/w/WeirdedVampire.java +++ b/Mage.Sets/src/mage/cards/w/WeirdedVampire.java @@ -24,7 +24,7 @@ public final class WeirdedVampire extends CardImpl { this.toughness = new MageInt(3); // Madness {2}{B} - this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{2}{B}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl("{2}{B}"))); } private WeirdedVampire(final WeirdedVampire card) { diff --git a/Mage.Sets/src/mage/cards/w/WelcomeToTheFold.java b/Mage.Sets/src/mage/cards/w/WelcomeToTheFold.java index 8b4f281459..96ceb05678 100644 --- a/Mage.Sets/src/mage/cards/w/WelcomeToTheFold.java +++ b/Mage.Sets/src/mage/cards/w/WelcomeToTheFold.java @@ -28,7 +28,7 @@ public final class WelcomeToTheFold extends CardImpl { // Madness {X}{U}{U} (If you discard this card // discard it into exile. When you do // cast it for its madness cost or put it into your graveyard. - Ability ability = new MadnessAbility(this, new ManaCostsImpl("{X}{U}{U}")); + Ability ability = new MadnessAbility(new ManaCostsImpl("{X}{U}{U}")); ability.setRuleAtTheTop(true); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/Whetwheel.java b/Mage.Sets/src/mage/cards/w/Whetwheel.java index d6a5f80369..f242143fdd 100644 --- a/Mage.Sets/src/mage/cards/w/Whetwheel.java +++ b/Mage.Sets/src/mage/cards/w/Whetwheel.java @@ -31,7 +31,7 @@ public final class Whetwheel extends CardImpl { ability.addTarget(new TargetPlayer()); this.addAbility(ability); // Morph {3} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{3}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{3}"))); } private Whetwheel(final Whetwheel card) { diff --git a/Mage.Sets/src/mage/cards/w/WhipSpineDrake.java b/Mage.Sets/src/mage/cards/w/WhipSpineDrake.java index 71b42fb662..fd52c58058 100644 --- a/Mage.Sets/src/mage/cards/w/WhipSpineDrake.java +++ b/Mage.Sets/src/mage/cards/w/WhipSpineDrake.java @@ -26,7 +26,7 @@ public final class WhipSpineDrake extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Morph {2}{W} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{W}"))); } private WhipSpineDrake(final WhipSpineDrake card) { diff --git a/Mage.Sets/src/mage/cards/w/Whipcorder.java b/Mage.Sets/src/mage/cards/w/Whipcorder.java index b465fe2cfe..5b63a9718e 100644 --- a/Mage.Sets/src/mage/cards/w/Whipcorder.java +++ b/Mage.Sets/src/mage/cards/w/Whipcorder.java @@ -37,7 +37,7 @@ public final class Whipcorder extends CardImpl { ability.addCost(new TapSourceCost()); this.addAbility(ability); // Morph {W} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{W}"))); } private Whipcorder(final Whipcorder card) { diff --git a/Mage.Sets/src/mage/cards/w/Willbender.java b/Mage.Sets/src/mage/cards/w/Willbender.java index e5549ae89f..a768c03026 100644 --- a/Mage.Sets/src/mage/cards/w/Willbender.java +++ b/Mage.Sets/src/mage/cards/w/Willbender.java @@ -37,7 +37,7 @@ public final class Willbender extends CardImpl { this.toughness = new MageInt(2); // Morph {1}{U} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{1}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{1}{U}"))); // When Willbender is turned face up, change the target of target spell or ability with a single target. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new ChooseNewTargetsTargetEffect(true, true)); ability.addTarget(new TargetStackObject(FILTER)); diff --git a/Mage.Sets/src/mage/cards/w/WingbeatWarrior.java b/Mage.Sets/src/mage/cards/w/WingbeatWarrior.java index 8fabccbcd8..e5b209b817 100644 --- a/Mage.Sets/src/mage/cards/w/WingbeatWarrior.java +++ b/Mage.Sets/src/mage/cards/w/WingbeatWarrior.java @@ -34,7 +34,7 @@ public final class WingbeatWarrior extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Morph {2}{W} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{W}"))); // When Wingbeat Warrior is turned face up, target creature gains first strike until end of turn. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/w/WitnessOfTheAges.java b/Mage.Sets/src/mage/cards/w/WitnessOfTheAges.java index f0bc0a5a03..7ac769d030 100644 --- a/Mage.Sets/src/mage/cards/w/WitnessOfTheAges.java +++ b/Mage.Sets/src/mage/cards/w/WitnessOfTheAges.java @@ -24,7 +24,7 @@ public final class WitnessOfTheAges extends CardImpl { this.toughness = new MageInt(4); // Morph {5} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{5}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{5}"))); } private WitnessOfTheAges(final WitnessOfTheAges card) { diff --git a/Mage.Sets/src/mage/cards/w/Woodcloaker.java b/Mage.Sets/src/mage/cards/w/Woodcloaker.java index 9d1d16acf8..fcd7ce6054 100644 --- a/Mage.Sets/src/mage/cards/w/Woodcloaker.java +++ b/Mage.Sets/src/mage/cards/w/Woodcloaker.java @@ -29,7 +29,7 @@ public final class Woodcloaker extends CardImpl { this.toughness = new MageInt(3); // Morph {2}{G}{G} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}{G}{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{G}{G}"))); // When Woodcloaker is turned face up, target creature gains trample until end of turn. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/w/WoollyLoxodon.java b/Mage.Sets/src/mage/cards/w/WoollyLoxodon.java index 52ce808c5f..e1dc9de960 100644 --- a/Mage.Sets/src/mage/cards/w/WoollyLoxodon.java +++ b/Mage.Sets/src/mage/cards/w/WoollyLoxodon.java @@ -25,7 +25,7 @@ public final class WoollyLoxodon extends CardImpl { this.toughness = new MageInt(7); // Morph 5G - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{5}{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{5}{G}"))); } private WoollyLoxodon(final WoollyLoxodon card) { diff --git a/Mage.Sets/src/mage/cards/z/ZoeticCavern.java b/Mage.Sets/src/mage/cards/z/ZoeticCavern.java index a762b1be5c..aa92f91dce 100644 --- a/Mage.Sets/src/mage/cards/z/ZoeticCavern.java +++ b/Mage.Sets/src/mage/cards/z/ZoeticCavern.java @@ -21,7 +21,7 @@ public final class ZoeticCavern extends CardImpl { // {T}: Add {C}. this.addAbility(new ColorlessManaAbility()); // Morph {2} - this.addAbility(new MorphAbility(this, new ManaCostsImpl("{2}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl("{2}"))); } private ZoeticCavern(final ZoeticCavern card) { diff --git a/Mage.Sets/src/mage/cards/z/ZombieCutthroat.java b/Mage.Sets/src/mage/cards/z/ZombieCutthroat.java index 03e263e2b8..b78968b5c5 100644 --- a/Mage.Sets/src/mage/cards/z/ZombieCutthroat.java +++ b/Mage.Sets/src/mage/cards/z/ZombieCutthroat.java @@ -23,7 +23,7 @@ public final class ZombieCutthroat extends CardImpl { this.toughness = new MageInt(4); // Morph-Pay 5 life. - this.addAbility(new MorphAbility(this, new PayLifeCost(5))); + this.addAbility(new MorphAbility(new PayLifeCost(5))); } private ZombieCutthroat(final ZombieCutthroat card) { diff --git a/Mage.Sets/src/mage/cards/z/ZurgoBellstriker.java b/Mage.Sets/src/mage/cards/z/ZurgoBellstriker.java index ec81deef69..8a3303bdfc 100644 --- a/Mage.Sets/src/mage/cards/z/ZurgoBellstriker.java +++ b/Mage.Sets/src/mage/cards/z/ZurgoBellstriker.java @@ -34,7 +34,7 @@ public final class ZurgoBellstriker extends CardImpl { // Zurgo Bellstriker can't block creatures with power 2 or greater. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockCreaturesSourceEffect(filter))); // Dash {1}{R} - this.addAbility(new DashAbility(this, "{1}{R}")); + this.addAbility(new DashAbility("{1}{R}")); } private ZurgoBellstriker(final ZurgoBellstriker card) { diff --git a/Mage/src/main/java/mage/abilities/keyword/DashAbility.java b/Mage/src/main/java/mage/abilities/keyword/DashAbility.java index 67bd739b0a..5116b8ad62 100644 --- a/Mage/src/main/java/mage/abilities/keyword/DashAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/DashAbility.java @@ -40,7 +40,7 @@ public class DashAbility extends StaticAbility implements AlternativeSourceCosts // needed to check activation status, if card changes zone after casting it private int zoneChangeCounter = 0; - public DashAbility(Card card, String manaString) { + public DashAbility(String manaString) { super(Zone.ALL, null); name = KEYWORD; this.addDashCost(manaString); @@ -53,7 +53,7 @@ public class DashAbility extends StaticAbility implements AlternativeSourceCosts } - public DashAbility(final DashAbility ability) { + private DashAbility(final DashAbility ability) { super(ability); this.alternativeSourceCosts.addAll(ability.alternativeSourceCosts); this.zoneChangeCounter = ability.zoneChangeCounter; diff --git a/Mage/src/main/java/mage/abilities/keyword/MadnessAbility.java b/Mage/src/main/java/mage/abilities/keyword/MadnessAbility.java index da2b84a2ea..509739bf11 100644 --- a/Mage/src/main/java/mage/abilities/keyword/MadnessAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/MadnessAbility.java @@ -53,11 +53,11 @@ public class MadnessAbility extends StaticAbility { private final String rule; - public MadnessAbility(Card card, ManaCosts madnessCost) { - this(card, madnessCost, 0); + public MadnessAbility(ManaCosts madnessCost) { + this(madnessCost, 0); } - public MadnessAbility(Card card, ManaCosts madnessCost, int lifeCost) { + public MadnessAbility(ManaCosts madnessCost, int lifeCost) { super(Zone.HAND, new MadnessReplacementEffect(madnessCost, lifeCost)); addSubAbility(new MadnessTriggeredAbility(madnessCost, lifeCost, getOriginalId())); diff --git a/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java b/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java index e853ad0ec3..5c73d1f4c0 100644 --- a/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java @@ -85,19 +85,19 @@ public class MorphAbility extends StaticAbility implements AlternativeSourceCost private int zoneChangeCounter = 0; private boolean megamorph; - public MorphAbility(Card card, Cost morphCost) { - this(card, createCosts(morphCost)); + public MorphAbility(Cost morphCost) { + this(createCosts(morphCost)); } - public MorphAbility(Card card, Cost morphCost, boolean megamorph) { - this(card, createCosts(morphCost), megamorph); + public MorphAbility(Cost morphCost, boolean megamorph) { + this(createCosts(morphCost), megamorph); } - public MorphAbility(Card card, Costs morphCosts) { - this(card, morphCosts, false); + public MorphAbility(Costs morphCosts) { + this(morphCosts, false); } - public MorphAbility(Card card, Costs morphCosts, boolean megamorph) { + public MorphAbility(Costs morphCosts, boolean megamorph) { super(Zone.HAND, null); this.morphCosts = morphCosts; this.megamorph = megamorph; diff --git a/Mage/src/main/java/mage/abilities/keyword/ReplicateAbility.java b/Mage/src/main/java/mage/abilities/keyword/ReplicateAbility.java index 0e52e0a5e1..fc57cccc52 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ReplicateAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ReplicateAbility.java @@ -30,7 +30,7 @@ public class ReplicateAbility extends StaticAbility implements OptionalAdditiona + " You may choose new targets for the copies."; protected OptionalAdditionalCost additionalCost; - public ReplicateAbility(Card card, String manaString) { + public ReplicateAbility(String manaString) { super(Zone.STACK, null); this.additionalCost = new OptionalAdditionalCostImpl(keywordText, reminderTextMana, new ManaCostsImpl(manaString)); diff --git a/Utils/keywords.txt b/Utils/keywords.txt index 065d96fea2..763ff0d0f6 100644 --- a/Utils/keywords.txt +++ b/Utils/keywords.txt @@ -17,7 +17,7 @@ Convoke|new| Crew|number| Cumulative upkeep|cost| Cycling|cost| -Dash|card, manaString| +Dash|manaString| Daybound|new| Deathtouch|instance| Demonstrate|new| @@ -65,7 +65,7 @@ Kicker|manaString| Level up|cost| Lifelink|instance| Living weapon|new| -Madness|card, cost| +Madness|cost| Melee|new| Menace|new| Mentor|new| @@ -73,7 +73,7 @@ Miracle|cost| Modular|card, number| Mountaincycling|cost| Mountainwalk|new| -Morph|card, cost| +Morph|cost| Mutate|card, manaString| Myriad|new| Nightbound|new| @@ -91,7 +91,7 @@ Reach|instance| Rebound|new| Reconfigure|manaString| Renown|number| -Replicate|card, manaString| +Replicate|manaString| Riot|new| Scavenge|cost| Shadow|instance|