From ee2b430479a9f07d6e13759225b0ee0b7b38ac44 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:13:46 -0500 Subject: [PATCH] refactor: SimpleStaticAbility default zone (cards L M) --- Mage.Sets/src/mage/cards/l/LaboratoryManiac.java | 2 +- Mage.Sets/src/mage/cards/l/LairwatchGiant.java | 2 +- Mage.Sets/src/mage/cards/l/LambholtPacifist.java | 3 +-- Mage.Sets/src/mage/cards/l/Lance.java | 2 +- Mage.Sets/src/mage/cards/l/LandCap.java | 2 +- Mage.Sets/src/mage/cards/l/Lashknife.java | 2 +- Mage.Sets/src/mage/cards/l/LashknifeBarrier.java | 2 +- Mage.Sets/src/mage/cards/l/Lashwrithe.java | 2 +- Mage.Sets/src/mage/cards/l/Launch.java | 2 +- Mage.Sets/src/mage/cards/l/LavaTubes.java | 2 +- Mage.Sets/src/mage/cards/l/LavamancersSkill.java | 4 ++-- Mage.Sets/src/mage/cards/l/LaviniaAzoriusRenegade.java | 2 +- Mage.Sets/src/mage/cards/l/LawmagesBinding.java | 2 +- Mage.Sets/src/mage/cards/l/LayClaim.java | 2 +- Mage.Sets/src/mage/cards/l/LeadenFists.java | 2 +- Mage.Sets/src/mage/cards/l/LeafcrownDryad.java | 2 +- Mage.Sets/src/mage/cards/l/LeafdrakeRoost.java | 2 +- Mage.Sets/src/mage/cards/l/LegionLieutenant.java | 2 +- Mage.Sets/src/mage/cards/l/LeoninAbunas.java | 2 +- Mage.Sets/src/mage/cards/l/LeoninArbiter.java | 2 +- Mage.Sets/src/mage/cards/l/LeoninDenGuard.java | 4 ++-- Mage.Sets/src/mage/cards/l/LeoninScimitar.java | 2 +- Mage.Sets/src/mage/cards/l/LeoninShikari.java | 2 +- Mage.Sets/src/mage/cards/l/LeovoldEmissaryOfTrest.java | 2 +- Mage.Sets/src/mage/cards/l/LeshracsRite.java | 2 +- Mage.Sets/src/mage/cards/l/Leviathan.java | 2 +- Mage.Sets/src/mage/cards/l/Levitation.java | 2 +- Mage.Sets/src/mage/cards/l/LeylineOfAnticipation.java | 2 +- Mage.Sets/src/mage/cards/l/LeylineOfLifeforce.java | 2 +- Mage.Sets/src/mage/cards/l/LeylineOfPunishment.java | 4 ++-- Mage.Sets/src/mage/cards/l/LeylineOfSanctity.java | 3 +-- Mage.Sets/src/mage/cards/l/LeylineOfSingularity.java | 2 +- Mage.Sets/src/mage/cards/l/LeylineOfTheVoid.java | 2 +- Mage.Sets/src/mage/cards/l/LeylineOfVitality.java | 2 +- Mage.Sets/src/mage/cards/l/LibraryOfLeng.java | 4 ++-- Mage.Sets/src/mage/cards/l/Lich.java | 4 ++-- Mage.Sets/src/mage/cards/l/Lichenthrope.java | 2 +- Mage.Sets/src/mage/cards/l/LichsMastery.java | 2 +- Mage.Sets/src/mage/cards/l/LichsMirror.java | 2 +- Mage.Sets/src/mage/cards/l/LichsTomb.java | 2 +- Mage.Sets/src/mage/cards/l/LifeAndLimb.java | 2 +- Mage.Sets/src/mage/cards/l/Lifelink.java | 2 +- Mage.Sets/src/mage/cards/l/LightOfDay.java | 2 +- Mage.Sets/src/mage/cards/l/LightOfSanction.java | 2 +- Mage.Sets/src/mage/cards/l/Lightform.java | 4 +--- Mage.Sets/src/mage/cards/l/LightningDiadem.java | 2 +- Mage.Sets/src/mage/cards/l/LightningGreaves.java | 2 +- Mage.Sets/src/mage/cards/l/LightningMauler.java | 2 +- Mage.Sets/src/mage/cards/l/LightningProwess.java | 4 ++-- Mage.Sets/src/mage/cards/l/LightningReflexes.java | 2 +- Mage.Sets/src/mage/cards/l/LightningTalons.java | 2 +- Mage.Sets/src/mage/cards/l/Lightwalker.java | 2 +- Mage.Sets/src/mage/cards/l/LilianasElite.java | 2 +- Mage.Sets/src/mage/cards/l/LilianasMastery.java | 2 +- Mage.Sets/src/mage/cards/l/LingeringMirage.java | 2 +- Mage.Sets/src/mage/cards/l/LinvalaKeeperOfSilence.java | 2 +- Mage.Sets/src/mage/cards/l/LiuBeiLordOfShu.java | 2 +- Mage.Sets/src/mage/cards/l/LivingLands.java | 2 +- Mage.Sets/src/mage/cards/l/LivingPlane.java | 2 +- Mage.Sets/src/mage/cards/l/LivingTerrain.java | 2 +- Mage.Sets/src/mage/cards/l/LlawanCephalidEmpress.java | 2 +- Mage.Sets/src/mage/cards/l/LobeLobber.java | 2 +- Mage.Sets/src/mage/cards/l/LocketOfYesterdays.java | 2 +- Mage.Sets/src/mage/cards/l/LodestoneGolem.java | 2 +- Mage.Sets/src/mage/cards/l/LongForgottenGohei.java | 4 ++-- Mage.Sets/src/mage/cards/l/LordMagnus.java | 4 ++-- Mage.Sets/src/mage/cards/l/LordOfAtlantis.java | 2 +- Mage.Sets/src/mage/cards/l/LordOfLineage.java | 2 +- Mage.Sets/src/mage/cards/l/LordOfTheAccursed.java | 4 ++-- Mage.Sets/src/mage/cards/l/LordOfTheNazgul.java | 2 +- Mage.Sets/src/mage/cards/l/LordOfTheUnreal.java | 2 +- Mage.Sets/src/mage/cards/l/LostInThought.java | 2 +- Mage.Sets/src/mage/cards/l/LovisaColdeyes.java | 2 +- Mage.Sets/src/mage/cards/l/LoxodonPunisher.java | 2 +- Mage.Sets/src/mage/cards/l/LoxodonWarhammer.java | 2 +- Mage.Sets/src/mage/cards/l/LumberingSatyr.java | 2 +- Mage.Sets/src/mage/cards/l/LuminousBonds.java | 2 +- Mage.Sets/src/mage/cards/l/LumithreadField.java | 2 +- Mage.Sets/src/mage/cards/l/LunarchMantle.java | 2 +- Mage.Sets/src/mage/cards/l/Lure.java | 2 +- Mage.Sets/src/mage/cards/l/Lurker.java | 2 +- Mage.Sets/src/mage/cards/l/LushGrowth.java | 2 +- Mage.Sets/src/mage/cards/l/LymphSliver.java | 4 ++-- Mage.Sets/src/mage/cards/l/LyraDawnbringer.java | 2 +- Mage.Sets/src/mage/cards/m/MadAuntie.java | 2 +- Mage.Sets/src/mage/cards/m/MaelstromNexus.java | 2 +- Mage.Sets/src/mage/cards/m/MageRingResponder.java | 2 +- Mage.Sets/src/mage/cards/m/MagebaneArmor.java | 2 +- Mage.Sets/src/mage/cards/m/MagetasBoon.java | 2 +- Mage.Sets/src/mage/cards/m/MaggotTherapy.java | 2 +- Mage.Sets/src/mage/cards/m/MagistratesVeto.java | 2 +- Mage.Sets/src/mage/cards/m/MagusOfTheFuture.java | 4 ++-- Mage.Sets/src/mage/cards/m/MagusOfTheMoat.java | 2 +- Mage.Sets/src/mage/cards/m/MagusOfTheTabernacle.java | 2 +- Mage.Sets/src/mage/cards/m/MaintenanceHangar.java | 2 +- Mage.Sets/src/mage/cards/m/MairsilThePretender.java | 2 +- Mage.Sets/src/mage/cards/m/MakeshiftMannequin.java | 2 +- Mage.Sets/src/mage/cards/m/Malfunction.java | 2 +- Mage.Sets/src/mage/cards/m/MaliciousIntent.java | 2 +- Mage.Sets/src/mage/cards/m/Malignus.java | 2 +- Mage.Sets/src/mage/cards/m/ManaChains.java | 2 +- Mage.Sets/src/mage/cards/m/ManaMatrix.java | 2 +- Mage.Sets/src/mage/cards/m/ManaMaze.java | 2 +- Mage.Sets/src/mage/cards/m/ManaVault.java | 2 +- Mage.Sets/src/mage/cards/m/ManaclesOfDecay.java | 2 +- Mage.Sets/src/mage/cards/m/ManaweftSliver.java | 2 +- Mage.Sets/src/mage/cards/m/ManiacalRage.java | 2 +- Mage.Sets/src/mage/cards/m/ManorGargoyle.java | 2 +- Mage.Sets/src/mage/cards/m/ManrikiGusari.java | 4 ++-- Mage.Sets/src/mage/cards/m/MantaRay.java | 2 +- Mage.Sets/src/mage/cards/m/MantellianSavrip.java | 2 +- Mage.Sets/src/mage/cards/m/MaralenOfTheMornsong.java | 2 +- Mage.Sets/src/mage/cards/m/MarangRiverProwler.java | 2 +- Mage.Sets/src/mage/cards/m/MaraudersAxe.java | 2 +- Mage.Sets/src/mage/cards/m/MaraudingBoneslasher.java | 2 +- Mage.Sets/src/mage/cards/m/MaraudingKnight.java | 2 +- Mage.Sets/src/mage/cards/m/MaraudingMaulhorn.java | 2 +- Mage.Sets/src/mage/cards/m/MarchOfTheMachines.java | 2 +- Mage.Sets/src/mage/cards/m/MarduRunemark.java | 2 +- Mage.Sets/src/mage/cards/m/MariTheKillingQuill.java | 2 +- Mage.Sets/src/mage/cards/m/Marjhan.java | 4 ++-- Mage.Sets/src/mage/cards/m/MarkOfFury.java | 2 +- Mage.Sets/src/mage/cards/m/MarkOfSakiko.java | 2 +- Mage.Sets/src/mage/cards/m/MarkOfTheOni.java | 2 +- Mage.Sets/src/mage/cards/m/MarkOfTheVampire.java | 2 +- Mage.Sets/src/mage/cards/m/MarkedByHonor.java | 2 +- Mage.Sets/src/mage/cards/m/MarkovCrusader.java | 2 +- Mage.Sets/src/mage/cards/m/MarrowGnawer.java | 2 +- Mage.Sets/src/mage/cards/m/MartyrsOfKorlis.java | 2 +- Mage.Sets/src/mage/cards/m/MasakoTheHumorless.java | 2 +- Mage.Sets/src/mage/cards/m/MaskOfAvacyn.java | 2 +- Mage.Sets/src/mage/cards/m/MaskOfLawAndGrace.java | 2 +- Mage.Sets/src/mage/cards/m/MaskOfRiddles.java | 2 +- Mage.Sets/src/mage/cards/m/MassHysteria.java | 2 +- Mage.Sets/src/mage/cards/m/MasterOfEtherium.java | 2 +- Mage.Sets/src/mage/cards/m/MasterSplicer.java | 2 +- Mage.Sets/src/mage/cards/m/MaulSplicer.java | 2 +- Mage.Sets/src/mage/cards/m/MazeAbomination.java | 2 +- Mage.Sets/src/mage/cards/m/MazeBehemoth.java | 2 +- Mage.Sets/src/mage/cards/m/MazeGlider.java | 2 +- Mage.Sets/src/mage/cards/m/MazeRusher.java | 2 +- Mage.Sets/src/mage/cards/m/MazeSentinel.java | 2 +- Mage.Sets/src/mage/cards/m/MazesMantle.java | 2 +- Mage.Sets/src/mage/cards/m/MeddlingMage.java | 2 +- Mage.Sets/src/mage/cards/m/MedomaiTheAgeless.java | 2 +- Mage.Sets/src/mage/cards/m/MegatronTyrant.java | 2 +- Mage.Sets/src/mage/cards/m/MeishinTheMindCage.java | 2 +- Mage.Sets/src/mage/cards/m/Melancholy.java | 2 +- Mage.Sets/src/mage/cards/m/MelekIzzetParagon.java | 4 ++-- Mage.Sets/src/mage/cards/m/MelekReforgedResearcher.java | 2 +- Mage.Sets/src/mage/cards/m/MeliraSylvokOutcast.java | 6 +++--- Mage.Sets/src/mage/cards/m/MelirasKeepers.java | 2 +- Mage.Sets/src/mage/cards/m/Melting.java | 2 +- Mage.Sets/src/mage/cards/m/MengHuoBarbarianKing.java | 2 +- Mage.Sets/src/mage/cards/m/MephidrossVampire.java | 2 +- Mage.Sets/src/mage/cards/m/MephiticOoze.java | 2 +- Mage.Sets/src/mage/cards/m/MercenaryInformer.java | 2 +- Mage.Sets/src/mage/cards/m/MerchantShip.java | 2 +- Mage.Sets/src/mage/cards/m/MerfolkMistbinder.java | 2 +- Mage.Sets/src/mage/cards/m/MerfolkSovereign.java | 2 +- Mage.Sets/src/mage/cards/m/MeriekeRiBerit.java | 2 +- Mage.Sets/src/mage/cards/m/MerrowReejerey.java | 2 +- Mage.Sets/src/mage/cards/m/Merseine.java | 2 +- Mage.Sets/src/mage/cards/m/MetallicMimic.java | 4 ++-- Mage.Sets/src/mage/cards/m/MetamorphicAlteration.java | 2 +- Mage.Sets/src/mage/cards/m/MetathranElite.java | 2 +- Mage.Sets/src/mage/cards/m/MidnightCovenant.java | 2 +- Mage.Sets/src/mage/cards/m/MidnightEntourage.java | 2 +- Mage.Sets/src/mage/cards/m/MightSliver.java | 2 +- Mage.Sets/src/mage/cards/m/MilitantInquisitor.java | 2 +- Mage.Sets/src/mage/cards/m/MinaAndDennWildborn.java | 2 +- Mage.Sets/src/mage/cards/m/MindControl.java | 3 +-- Mage.Sets/src/mage/cards/m/MindHarness.java | 2 +- Mage.Sets/src/mage/cards/m/MindbenderSpores.java | 2 +- Mage.Sets/src/mage/cards/m/MindlashSliver.java | 2 +- Mage.Sets/src/mage/cards/m/MindlessNull.java | 2 +- Mage.Sets/src/mage/cards/m/MindlockOrb.java | 2 +- Mage.Sets/src/mage/cards/m/MindwrackLiege.java | 4 ++-- Mage.Sets/src/mage/cards/m/MineMineMine.java | 4 ++-- Mage.Sets/src/mage/cards/m/MinotaurTactician.java | 4 ++-- Mage.Sets/src/mage/cards/m/MiragePhalanx.java | 2 +- Mage.Sets/src/mage/cards/m/MirarisWake.java | 2 +- Mage.Sets/src/mage/cards/m/MireKavu.java | 2 +- Mage.Sets/src/mage/cards/m/MirriWeatherlightDuelist.java | 4 ++-- Mage.Sets/src/mage/cards/m/MirrorGolem.java | 2 +- Mage.Sets/src/mage/cards/m/MistformWall.java | 2 +- Mage.Sets/src/mage/cards/m/MizzixOfTheIzmagnus.java | 2 +- Mage.Sets/src/mage/cards/m/Moat.java | 2 +- Mage.Sets/src/mage/cards/m/MobMentality.java | 2 +- Mage.Sets/src/mage/cards/m/Mobilization.java | 2 +- Mage.Sets/src/mage/cards/m/MoggConscripts.java | 2 +- Mage.Sets/src/mage/cards/m/MoggJailer.java | 2 +- Mage.Sets/src/mage/cards/m/MoggSquad.java | 2 +- Mage.Sets/src/mage/cards/m/MoggToady.java | 4 ++-- Mage.Sets/src/mage/cards/m/MogissWarhound.java | 2 +- Mage.Sets/src/mage/cards/m/MoldervineCloak.java | 2 +- Mage.Sets/src/mage/cards/m/MoldgrafScavenger.java | 2 +- Mage.Sets/src/mage/cards/m/MoltingSnakeskin.java | 2 +- Mage.Sets/src/mage/cards/m/Momentum.java | 2 +- Mage.Sets/src/mage/cards/m/MonasterySiege.java | 2 +- Mage.Sets/src/mage/cards/m/MondrakGloryDominus.java | 2 +- Mage.Sets/src/mage/cards/m/MonkeyMonkeyMonkey.java | 2 +- Mage.Sets/src/mage/cards/m/MoonsilverSpear.java | 2 +- Mage.Sets/src/mage/cards/m/MoorlandDrifter.java | 2 +- Mage.Sets/src/mage/cards/m/MortalObstinacy.java | 3 +-- Mage.Sets/src/mage/cards/m/Mortarpod.java | 2 +- Mage.Sets/src/mage/cards/m/MountainStronghold.java | 2 +- Mage.Sets/src/mage/cards/m/Mourning.java | 2 +- Mage.Sets/src/mage/cards/m/MudbrawlerCohort.java | 2 +- Mage.Sets/src/mage/cards/m/MulDayaChannelers.java | 6 +++--- Mage.Sets/src/mage/cards/m/MuldrothaTheGravetide.java | 2 +- Mage.Sets/src/mage/cards/m/MultanisHarmony.java | 2 +- Mage.Sets/src/mage/cards/m/MunghaWurm.java | 2 +- Mage.Sets/src/mage/cards/m/MurderersAxe.java | 2 +- Mage.Sets/src/mage/cards/m/MurkfiendLiege.java | 6 +++--- Mage.Sets/src/mage/cards/m/MuscleSliver.java | 2 +- Mage.Sets/src/mage/cards/m/Muzzle.java | 2 +- Mage.Sets/src/mage/cards/m/MycosynthFiend.java | 2 +- Mage.Sets/src/mage/cards/m/MycosynthGolem.java | 2 +- Mage.Sets/src/mage/cards/m/MycosynthLattice.java | 6 +++--- Mage.Sets/src/mage/cards/m/MyojinOfCleansingFire.java | 2 +- Mage.Sets/src/mage/cards/m/MyojinOfInfiniteRage.java | 2 +- Mage.Sets/src/mage/cards/m/MyojinOfNightsReach.java | 2 +- Mage.Sets/src/mage/cards/m/MyojinOfSeeingWinds.java | 2 +- Mage.Sets/src/mage/cards/m/MyrAdapter.java | 2 +- Mage.Sets/src/mage/cards/m/MyrMatrix.java | 2 +- Mage.Sets/src/mage/cards/m/MyrPrototype.java | 2 +- Mage.Sets/src/mage/cards/m/MyrWelder.java | 2 +- Mage.Sets/src/mage/cards/m/MysticMight.java | 2 +- Mage.Sets/src/mage/cards/m/MysticPenitent.java | 2 +- Mage.Sets/src/mage/cards/m/MysticRestraints.java | 2 +- Mage.Sets/src/mage/cards/m/MysticVeil.java | 2 +- Mage.Sets/src/mage/cards/m/MythicProportions.java | 2 +- 233 files changed, 261 insertions(+), 267 deletions(-) diff --git a/Mage.Sets/src/mage/cards/l/LaboratoryManiac.java b/Mage.Sets/src/mage/cards/l/LaboratoryManiac.java index 0f809207cd8..75a5100a69e 100644 --- a/Mage.Sets/src/mage/cards/l/LaboratoryManiac.java +++ b/Mage.Sets/src/mage/cards/l/LaboratoryManiac.java @@ -33,7 +33,7 @@ public final class LaboratoryManiac extends CardImpl { this.toughness = new MageInt(2); // If you would draw a card while your library has no cards in it, you win the game instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LaboratoryManiacEffect())); + this.addAbility(new SimpleStaticAbility(new LaboratoryManiacEffect())); } diff --git a/Mage.Sets/src/mage/cards/l/LairwatchGiant.java b/Mage.Sets/src/mage/cards/l/LairwatchGiant.java index 8ace748e68c..f4aa0406d1e 100644 --- a/Mage.Sets/src/mage/cards/l/LairwatchGiant.java +++ b/Mage.Sets/src/mage/cards/l/LairwatchGiant.java @@ -33,7 +33,7 @@ public final class LairwatchGiant extends CardImpl { this.toughness = new MageInt(3); // Lairwatch Giant can block an additional creature each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(1))); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect(1))); // Whenever Lairwatch Giant blocks two or more creatures, it gains first strike until end of turn. this.addAbility(new LairwatchGiantTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/l/LambholtPacifist.java b/Mage.Sets/src/mage/cards/l/LambholtPacifist.java index 7a3a06bd20b..baf535a3d1d 100644 --- a/Mage.Sets/src/mage/cards/l/LambholtPacifist.java +++ b/Mage.Sets/src/mage/cards/l/LambholtPacifist.java @@ -32,7 +32,7 @@ public final class LambholtPacifist extends CardImpl { this.secondSideCardClazz = mage.cards.l.LambholtButcher.class; // Lambholt Pacifist can't attack unless you control a creature with power 4 or greater. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LambholtPacifistEffect())); + this.addAbility(new SimpleStaticAbility(new LambholtPacifistEffect())); // At the beginning of each upkeep, if no spells were cast last turn, transform Lambholt Pacifist. this.addAbility(new TransformAbility()); @@ -84,4 +84,3 @@ class LambholtPacifistEffect extends RestrictionEffect { return false; } } - diff --git a/Mage.Sets/src/mage/cards/l/Lance.java b/Mage.Sets/src/mage/cards/l/Lance.java index 528f878d5e3..17d588872a2 100644 --- a/Mage.Sets/src/mage/cards/l/Lance.java +++ b/Mage.Sets/src/mage/cards/l/Lance.java @@ -36,7 +36,7 @@ public final class Lance extends CardImpl { this.addAbility(ability); // Enchanted creature has first strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA))); } private Lance(final Lance card) { diff --git a/Mage.Sets/src/mage/cards/l/LandCap.java b/Mage.Sets/src/mage/cards/l/LandCap.java index 8715406dcf4..b0e41ca6f37 100644 --- a/Mage.Sets/src/mage/cards/l/LandCap.java +++ b/Mage.Sets/src/mage/cards/l/LandCap.java @@ -33,7 +33,7 @@ public final class LandCap extends CardImpl { Effect effect = new ConditionalContinuousRuleModifyingEffect(new DontUntapInControllersUntapStepSourceEffect(false, true), new SourceHasCounterCondition(CounterType.DEPLETION, 1, Integer.MAX_VALUE)); effect.setText("{this} doesn't untap during your untap step if it has a depletion counter on it"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); this.addAbility(ability); // At the beginning of your upkeep, remove a depletion counter from Land Cap. Ability ability2 = new BeginningOfUpkeepTriggeredAbility(new RemoveCounterSourceEffect(CounterType.DEPLETION.createInstance())); diff --git a/Mage.Sets/src/mage/cards/l/Lashknife.java b/Mage.Sets/src/mage/cards/l/Lashknife.java index ba5adc8e2f9..f00119b1896 100644 --- a/Mage.Sets/src/mage/cards/l/Lashknife.java +++ b/Mage.Sets/src/mage/cards/l/Lashknife.java @@ -55,7 +55,7 @@ public final class Lashknife extends CardImpl { this.addAbility(ability); // Enchanted creature has first strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA))); } private Lashknife(final Lashknife card) { diff --git a/Mage.Sets/src/mage/cards/l/LashknifeBarrier.java b/Mage.Sets/src/mage/cards/l/LashknifeBarrier.java index f4e061f3a2c..a1f450ac17b 100644 --- a/Mage.Sets/src/mage/cards/l/LashknifeBarrier.java +++ b/Mage.Sets/src/mage/cards/l/LashknifeBarrier.java @@ -29,7 +29,7 @@ public final class LashknifeBarrier extends CardImpl { // When Lashknife Barrier enters the battlefield, draw a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); // If a source would deal damage to a creature you control, it deals that much damage minus 1 to that creature instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LashknifeBarrierEffect())); + this.addAbility(new SimpleStaticAbility(new LashknifeBarrierEffect())); } private LashknifeBarrier(final LashknifeBarrier card) { diff --git a/Mage.Sets/src/mage/cards/l/Lashwrithe.java b/Mage.Sets/src/mage/cards/l/Lashwrithe.java index 6d3546936a9..527bd74589d 100644 --- a/Mage.Sets/src/mage/cards/l/Lashwrithe.java +++ b/Mage.Sets/src/mage/cards/l/Lashwrithe.java @@ -35,7 +35,7 @@ public final class Lashwrithe extends CardImpl { // Equipped creature gets +1/+1 for each Swamp you control. PermanentsOnBattlefieldCount value = new PermanentsOnBattlefieldCount(filter); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(value, value))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(value, value))); // Equip {B/P}{B/P} (Phyrexian Black can be paid with either Black or 2 life.) this.addAbility(new EquipAbility(Outcome.BoostCreature, new ManaCostsImpl<>("{B/P}{B/P}"), false)); diff --git a/Mage.Sets/src/mage/cards/l/Launch.java b/Mage.Sets/src/mage/cards/l/Launch.java index 9238c767de1..f3dc626d324 100644 --- a/Mage.Sets/src/mage/cards/l/Launch.java +++ b/Mage.Sets/src/mage/cards/l/Launch.java @@ -30,7 +30,7 @@ public final class Launch extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield))); // When Launch is put into a graveyard from the battlefield, return Launch to its owner's hand. this.addAbility(new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new ReturnToHandSourceEffect())); diff --git a/Mage.Sets/src/mage/cards/l/LavaTubes.java b/Mage.Sets/src/mage/cards/l/LavaTubes.java index bd934a28c11..78de147fb20 100644 --- a/Mage.Sets/src/mage/cards/l/LavaTubes.java +++ b/Mage.Sets/src/mage/cards/l/LavaTubes.java @@ -33,7 +33,7 @@ public final class LavaTubes extends CardImpl { Effect effect = new ConditionalContinuousRuleModifyingEffect(new DontUntapInControllersUntapStepSourceEffect(false, true), new SourceHasCounterCondition(CounterType.DEPLETION, 1, Integer.MAX_VALUE)); effect.setText("{this} doesn't untap during your untap step if it has a depletion counter on it"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); this.addAbility(ability); // At the beginning of your upkeep, remove a depletion counter from Lava Tubes. Ability ability2 = new BeginningOfUpkeepTriggeredAbility(new RemoveCounterSourceEffect(CounterType.DEPLETION.createInstance())); diff --git a/Mage.Sets/src/mage/cards/l/LavamancersSkill.java b/Mage.Sets/src/mage/cards/l/LavamancersSkill.java index e3e35f56418..d027fd8908b 100644 --- a/Mage.Sets/src/mage/cards/l/LavamancersSkill.java +++ b/Mage.Sets/src/mage/cards/l/LavamancersSkill.java @@ -40,14 +40,14 @@ public final class LavamancersSkill extends CardImpl { // Enchanted creature has "{tap}: This creature deals 1 damage to target creature." Ability pingAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); pingAbility.addTarget(new TargetCreaturePermanent()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(pingAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(pingAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{T}: This creature deals 1 damage to target creature.\""))); // As long as enchanted creature is a Wizard, it has "{tap}: This creature deals 2 damage to target creature." Ability pingTwoAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); pingTwoAbility.addTarget(new TargetCreaturePermanent()); ContinuousEffect isWizardEffect = new GainAbilityAttachedEffect(pingTwoAbility, AttachmentType.AURA); - SimpleStaticAbility ifWizardAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(isWizardEffect, new EnchantedCreatureSubtypeCondition(SubType.WIZARD), + SimpleStaticAbility ifWizardAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(isWizardEffect, new EnchantedCreatureSubtypeCondition(SubType.WIZARD), "As long as enchanted creature is a Wizard, it has \"{T}: This creature deals 2 damage to target creature.\"")); this.addAbility(ifWizardAbility); diff --git a/Mage.Sets/src/mage/cards/l/LaviniaAzoriusRenegade.java b/Mage.Sets/src/mage/cards/l/LaviniaAzoriusRenegade.java index fecffdcf513..5820d24f257 100644 --- a/Mage.Sets/src/mage/cards/l/LaviniaAzoriusRenegade.java +++ b/Mage.Sets/src/mage/cards/l/LaviniaAzoriusRenegade.java @@ -39,7 +39,7 @@ public final class LaviniaAzoriusRenegade extends CardImpl { this.toughness = new MageInt(2); // Each opponent can't cast noncreature spells with converted mana cost greater than the number of lands that player controls. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LaviniaAzoriusRenegadeReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new LaviniaAzoriusRenegadeReplacementEffect())); // Whenever an opponent casts a spell, if no mana was spent to cast it, counter that spell. this.addAbility(new SpellCastOpponentNoManaSpentTriggeredAbility(new CounterTargetEffect().setText("counter that spell"))); diff --git a/Mage.Sets/src/mage/cards/l/LawmagesBinding.java b/Mage.Sets/src/mage/cards/l/LawmagesBinding.java index fb6fac14478..13678ff6138 100644 --- a/Mage.Sets/src/mage/cards/l/LawmagesBinding.java +++ b/Mage.Sets/src/mage/cards/l/LawmagesBinding.java @@ -38,7 +38,7 @@ public final class LawmagesBinding extends CardImpl { this.addAbility(ability); // Enchanted creature can't attack or block, and its activate abilities can't be activated. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAttackActivateAttachedEffect())); + this.addAbility(new SimpleStaticAbility(new CantBlockAttackActivateAttachedEffect())); } private LawmagesBinding(final LawmagesBinding card) { diff --git a/Mage.Sets/src/mage/cards/l/LayClaim.java b/Mage.Sets/src/mage/cards/l/LayClaim.java index 81577f464d6..dc76b297904 100644 --- a/Mage.Sets/src/mage/cards/l/LayClaim.java +++ b/Mage.Sets/src/mage/cards/l/LayClaim.java @@ -36,7 +36,7 @@ public final class LayClaim extends CardImpl { this.addAbility(ability); // You control enchanted permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect("permanent"))); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect("permanent"))); // Cycling {2} this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); diff --git a/Mage.Sets/src/mage/cards/l/LeadenFists.java b/Mage.Sets/src/mage/cards/l/LeadenFists.java index 804e33b49ec..40c74a6a894 100644 --- a/Mage.Sets/src/mage/cards/l/LeadenFists.java +++ b/Mage.Sets/src/mage/cards/l/LeadenFists.java @@ -41,7 +41,7 @@ public final class LeadenFists extends CardImpl { this.addAbility(ability); // Enchanted creature gets +3/+3 and doesn't untap during its controller's untap step. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield)); Effect effect = new DontUntapInControllersUntapStepEnchantedEffect(); effect.setText("and doesn't untap during its controller's untap step"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/l/LeafcrownDryad.java b/Mage.Sets/src/mage/cards/l/LeafcrownDryad.java index da0644a5e48..abf4d678917 100644 --- a/Mage.Sets/src/mage/cards/l/LeafcrownDryad.java +++ b/Mage.Sets/src/mage/cards/l/LeafcrownDryad.java @@ -36,7 +36,7 @@ public final class LeafcrownDryad extends CardImpl { // Reach this.addAbility(ReachAbility.getInstance()); // Enchanted creature gets +2/+2 and has reach. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2,2)); + Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(2,2)); Effect effect = new GainAbilityAttachedEffect(ReachAbility.getInstance(), AttachmentType.AURA); effect.setText("and has reach"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/l/LeafdrakeRoost.java b/Mage.Sets/src/mage/cards/l/LeafdrakeRoost.java index 8461baea806..4ebdaee66e6 100644 --- a/Mage.Sets/src/mage/cards/l/LeafdrakeRoost.java +++ b/Mage.Sets/src/mage/cards/l/LeafdrakeRoost.java @@ -43,7 +43,7 @@ public final class LeafdrakeRoost extends CardImpl { // Enchanted land has "{G}{U}, {tap}: Create a 2/2 green and blue Drake creature token with flying." Ability abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new LeafdrakeRoostDrakeToken()), new ManaCostsImpl<>("{G}{U}")); abilityToGain.addCost(new TapSourceCost()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(abilityToGain, AttachmentType.AURA, Duration.WhileOnBattlefield, + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(abilityToGain, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{G}{U}, {T}: Create a 2/2 green and blue Drake creature token with flying.\""))); } diff --git a/Mage.Sets/src/mage/cards/l/LegionLieutenant.java b/Mage.Sets/src/mage/cards/l/LegionLieutenant.java index 7e313d3d861..7d749f3ded3 100644 --- a/Mage.Sets/src/mage/cards/l/LegionLieutenant.java +++ b/Mage.Sets/src/mage/cards/l/LegionLieutenant.java @@ -36,7 +36,7 @@ public final class LegionLieutenant extends CardImpl { this.toughness = new MageInt(2); // Other Vampires you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); } private LegionLieutenant(final LegionLieutenant card) { diff --git a/Mage.Sets/src/mage/cards/l/LeoninAbunas.java b/Mage.Sets/src/mage/cards/l/LeoninAbunas.java index 077f2575546..68649ba7118 100644 --- a/Mage.Sets/src/mage/cards/l/LeoninAbunas.java +++ b/Mage.Sets/src/mage/cards/l/LeoninAbunas.java @@ -28,7 +28,7 @@ public final class LeoninAbunas extends CardImpl { this.toughness = new MageInt(5); // Artifacts you control have hexproof. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ARTIFACTS, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ARTIFACTS, false))); } private LeoninAbunas(final LeoninAbunas card) { diff --git a/Mage.Sets/src/mage/cards/l/LeoninArbiter.java b/Mage.Sets/src/mage/cards/l/LeoninArbiter.java index 2d837484baa..6bd7856cae5 100644 --- a/Mage.Sets/src/mage/cards/l/LeoninArbiter.java +++ b/Mage.Sets/src/mage/cards/l/LeoninArbiter.java @@ -34,7 +34,7 @@ public final class LeoninArbiter extends CardImpl { this.toughness = new MageInt(2); // Players can't search libraries. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LeoninArbiterCantSearchEffect(KEY_STRING))); + this.addAbility(new SimpleStaticAbility(new LeoninArbiterCantSearchEffect(KEY_STRING))); // Any player may pay {2} for that player to ignore this effect until end of turn. this.addAbility(new LeoninArbiterSpecialAction(KEY_STRING)); diff --git a/Mage.Sets/src/mage/cards/l/LeoninDenGuard.java b/Mage.Sets/src/mage/cards/l/LeoninDenGuard.java index db61405e6f0..8ac510c0d9e 100644 --- a/Mage.Sets/src/mage/cards/l/LeoninDenGuard.java +++ b/Mage.Sets/src/mage/cards/l/LeoninDenGuard.java @@ -36,9 +36,9 @@ public final class LeoninDenGuard extends CardImpl { // As long as Leonin Den-Guard is equipped, it gets +1/+1 and has vigilance. ConditionalContinuousEffect effect1 = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), EquippedSourceCondition.instance, rule1); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect1)); + this.addAbility(new SimpleStaticAbility(effect1)); ConditionalContinuousEffect effect2 = new ConditionalContinuousEffect(new GainAbilitySourceEffect(VigilanceAbility.getInstance()), EquippedSourceCondition.instance, rule2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect2)); + this.addAbility(new SimpleStaticAbility(effect2)); } diff --git a/Mage.Sets/src/mage/cards/l/LeoninScimitar.java b/Mage.Sets/src/mage/cards/l/LeoninScimitar.java index f7c4374a72f..724a154acc3 100644 --- a/Mage.Sets/src/mage/cards/l/LeoninScimitar.java +++ b/Mage.Sets/src/mage/cards/l/LeoninScimitar.java @@ -23,7 +23,7 @@ public final class LeoninScimitar extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 1))); // Equip {1} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1))); } diff --git a/Mage.Sets/src/mage/cards/l/LeoninShikari.java b/Mage.Sets/src/mage/cards/l/LeoninShikari.java index 7fd2ff1ca48..bb4e3bab3e4 100644 --- a/Mage.Sets/src/mage/cards/l/LeoninShikari.java +++ b/Mage.Sets/src/mage/cards/l/LeoninShikari.java @@ -26,7 +26,7 @@ public final class LeoninShikari extends CardImpl { this.toughness = new MageInt(2); // You may activate equip abilities any time you could cast an instant. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ActivateAbilitiesAnyTimeYouCouldCastInstantEffect(EquipAbility.class, "equip abilities"))); + this.addAbility(new SimpleStaticAbility(new ActivateAbilitiesAnyTimeYouCouldCastInstantEffect(EquipAbility.class, "equip abilities"))); } private LeoninShikari(final LeoninShikari card) { diff --git a/Mage.Sets/src/mage/cards/l/LeovoldEmissaryOfTrest.java b/Mage.Sets/src/mage/cards/l/LeovoldEmissaryOfTrest.java index 699b9364879..dd3dc1d6258 100644 --- a/Mage.Sets/src/mage/cards/l/LeovoldEmissaryOfTrest.java +++ b/Mage.Sets/src/mage/cards/l/LeovoldEmissaryOfTrest.java @@ -32,7 +32,7 @@ public final class LeovoldEmissaryOfTrest extends CardImpl { this.toughness = new MageInt(3); // Each opponent can't draw more than one card each turn. (Based on SpiritOfTheLabyrinth) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LeovoldEmissaryOfTrestEffect()), new CardsAmountDrawnThisTurnWatcher()); + this.addAbility(new SimpleStaticAbility(new LeovoldEmissaryOfTrestEffect()), new CardsAmountDrawnThisTurnWatcher()); // Whenever you or a permanent you control becomes the target of a spell or ability an opponent controls, you may draw a card. this.addAbility(new BecomesTargetControllerTriggeredAbility(new DrawCardSourceControllerEffect(1), diff --git a/Mage.Sets/src/mage/cards/l/LeshracsRite.java b/Mage.Sets/src/mage/cards/l/LeshracsRite.java index dde906fe68f..0c0c7957d86 100644 --- a/Mage.Sets/src/mage/cards/l/LeshracsRite.java +++ b/Mage.Sets/src/mage/cards/l/LeshracsRite.java @@ -36,7 +36,7 @@ public final class LeshracsRite extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has swampwalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new SwampwalkAbility(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(new SwampwalkAbility(), AttachmentType.AURA))); } private LeshracsRite(final LeshracsRite card) { diff --git a/Mage.Sets/src/mage/cards/l/Leviathan.java b/Mage.Sets/src/mage/cards/l/Leviathan.java index b3ec3625bd8..38384efd5da 100644 --- a/Mage.Sets/src/mage/cards/l/Leviathan.java +++ b/Mage.Sets/src/mage/cards/l/Leviathan.java @@ -61,7 +61,7 @@ public final class Leviathan extends CardImpl { )); // Leviathan can't attack unless you sacrifice two Islands. (This cost is paid as attackers are declared.) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LeviathanCostToAttackBlockEffect())); + this.addAbility(new SimpleStaticAbility(new LeviathanCostToAttackBlockEffect())); } diff --git a/Mage.Sets/src/mage/cards/l/Levitation.java b/Mage.Sets/src/mage/cards/l/Levitation.java index 72068134548..925fe64636b 100644 --- a/Mage.Sets/src/mage/cards/l/Levitation.java +++ b/Mage.Sets/src/mage/cards/l/Levitation.java @@ -22,7 +22,7 @@ public final class Levitation extends CardImpl { public Levitation (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{U}{U}"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, false))); } private Levitation(final Levitation card) { diff --git a/Mage.Sets/src/mage/cards/l/LeylineOfAnticipation.java b/Mage.Sets/src/mage/cards/l/LeylineOfAnticipation.java index 59d79a8eb02..344eebd8b62 100644 --- a/Mage.Sets/src/mage/cards/l/LeylineOfAnticipation.java +++ b/Mage.Sets/src/mage/cards/l/LeylineOfAnticipation.java @@ -32,7 +32,7 @@ public final class LeylineOfAnticipation extends CardImpl { this.addAbility(LeylineAbility.getInstance()); // You may cast spells as though they had flash. (You may cast them any time you could cast an instant.) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter))); } private LeylineOfAnticipation(final LeylineOfAnticipation card) { diff --git a/Mage.Sets/src/mage/cards/l/LeylineOfLifeforce.java b/Mage.Sets/src/mage/cards/l/LeylineOfLifeforce.java index 394fdc95a9d..d16a3bc9f9b 100644 --- a/Mage.Sets/src/mage/cards/l/LeylineOfLifeforce.java +++ b/Mage.Sets/src/mage/cards/l/LeylineOfLifeforce.java @@ -30,7 +30,7 @@ public final class LeylineOfLifeforce extends CardImpl { this.addAbility(LeylineAbility.getInstance()); // Creature spells can't be countered. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LeylineOfLifeforceEffect())); + this.addAbility(new SimpleStaticAbility(new LeylineOfLifeforceEffect())); } private LeylineOfLifeforce(final LeylineOfLifeforce card) { diff --git a/Mage.Sets/src/mage/cards/l/LeylineOfPunishment.java b/Mage.Sets/src/mage/cards/l/LeylineOfPunishment.java index de2d2d47642..e7672d52edb 100644 --- a/Mage.Sets/src/mage/cards/l/LeylineOfPunishment.java +++ b/Mage.Sets/src/mage/cards/l/LeylineOfPunishment.java @@ -30,9 +30,9 @@ public final class LeylineOfPunishment extends CardImpl { // If Leyline of Punishment is in your opening hand, you may begin the game with it on the battlefield. this.addAbility(LeylineAbility.getInstance()); // Players can't gain life. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantGainLifeAllEffect())); + this.addAbility(new SimpleStaticAbility(new CantGainLifeAllEffect())); // Damage can't be prevented. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LeylineOfPunishmentEffect2())); + this.addAbility(new SimpleStaticAbility(new LeylineOfPunishmentEffect2())); } private LeylineOfPunishment(final LeylineOfPunishment card) { diff --git a/Mage.Sets/src/mage/cards/l/LeylineOfSanctity.java b/Mage.Sets/src/mage/cards/l/LeylineOfSanctity.java index 7f723fab67c..61625c8a049 100644 --- a/Mage.Sets/src/mage/cards/l/LeylineOfSanctity.java +++ b/Mage.Sets/src/mage/cards/l/LeylineOfSanctity.java @@ -34,7 +34,7 @@ public final class LeylineOfSanctity extends CardImpl { this.addAbility(LeylineAbility.getInstance()); // You have hexproof. (You can't be the target of spells or abilities your opponents control.) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControllerEffect(HexproofAbility.getInstance()))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControllerEffect(HexproofAbility.getInstance()))); } private LeylineOfSanctity(final LeylineOfSanctity card) { @@ -47,4 +47,3 @@ public final class LeylineOfSanctity extends CardImpl { } } - diff --git a/Mage.Sets/src/mage/cards/l/LeylineOfSingularity.java b/Mage.Sets/src/mage/cards/l/LeylineOfSingularity.java index 952cb9d945b..e2fd00ab094 100644 --- a/Mage.Sets/src/mage/cards/l/LeylineOfSingularity.java +++ b/Mage.Sets/src/mage/cards/l/LeylineOfSingularity.java @@ -27,7 +27,7 @@ public final class LeylineOfSingularity extends CardImpl { this.addAbility(LeylineAbility.getInstance()); // All nonland permanents are legendary. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SetSupertypeAllEffect())); + this.addAbility(new SimpleStaticAbility(new SetSupertypeAllEffect())); } private LeylineOfSingularity(final LeylineOfSingularity card) { diff --git a/Mage.Sets/src/mage/cards/l/LeylineOfTheVoid.java b/Mage.Sets/src/mage/cards/l/LeylineOfTheVoid.java index 7d0f7dea421..6443008edc8 100644 --- a/Mage.Sets/src/mage/cards/l/LeylineOfTheVoid.java +++ b/Mage.Sets/src/mage/cards/l/LeylineOfTheVoid.java @@ -32,7 +32,7 @@ public final class LeylineOfTheVoid extends CardImpl { // If Leyline of the Void is in your opening hand, you may begin the game with it on the battlefield. this.addAbility(LeylineAbility.getInstance()); // If a card would be put into an opponent's graveyard from anywhere, exile it instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LeylineOfTheVoidEffect())); + this.addAbility(new SimpleStaticAbility(new LeylineOfTheVoidEffect())); } private LeylineOfTheVoid(final LeylineOfTheVoid card) { diff --git a/Mage.Sets/src/mage/cards/l/LeylineOfVitality.java b/Mage.Sets/src/mage/cards/l/LeylineOfVitality.java index 7f22fc2053c..f16ee6fe700 100644 --- a/Mage.Sets/src/mage/cards/l/LeylineOfVitality.java +++ b/Mage.Sets/src/mage/cards/l/LeylineOfVitality.java @@ -27,7 +27,7 @@ public final class LeylineOfVitality extends CardImpl { this.addAbility(LeylineAbility.getInstance()); // Creatures you control get +0/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, false))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, false))); // Whenever a creature you control enters, you may gain 1 life. this.addAbility(new EntersBattlefieldControlledTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/l/LibraryOfLeng.java b/Mage.Sets/src/mage/cards/l/LibraryOfLeng.java index eeacdb17a15..59910c3782c 100644 --- a/Mage.Sets/src/mage/cards/l/LibraryOfLeng.java +++ b/Mage.Sets/src/mage/cards/l/LibraryOfLeng.java @@ -28,10 +28,10 @@ public final class LibraryOfLeng extends CardImpl { // You have no maximum hand size. Effect effect = new MaximumHandSizeControllerEffect(Integer.MAX_VALUE, Duration.WhileOnBattlefield, MaximumHandSizeControllerEffect.HandSizeModification.SET); - addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + addAbility(new SimpleStaticAbility(effect)); // If an effect causes you to discard a card, discard it, but you may put it on top of your library instead of into your graveyard. - addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LibraryOfLengEffect())); + addAbility(new SimpleStaticAbility(new LibraryOfLengEffect())); } diff --git a/Mage.Sets/src/mage/cards/l/Lich.java b/Mage.Sets/src/mage/cards/l/Lich.java index 4be19bb51ee..da1e22d33d2 100644 --- a/Mage.Sets/src/mage/cards/l/Lich.java +++ b/Mage.Sets/src/mage/cards/l/Lich.java @@ -43,10 +43,10 @@ public final class Lich extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new LoseLifeSourceControllerEffect(ControllerLifeCount.instance), null, "As Lich enters the battlefield, you lose life equal to your life total.", null)); // You don't lose the game for having 0 or less life. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontLoseByZeroOrLessLifeEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new DontLoseByZeroOrLessLifeEffect(Duration.WhileOnBattlefield))); // If you would gain life, draw that many cards instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LichLifeGainReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new LichLifeGainReplacementEffect())); // Whenever you're dealt damage, sacrifice that many nontoken permanents. If you can't, you lose the game. this.addAbility(new LichDamageTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/l/Lichenthrope.java b/Mage.Sets/src/mage/cards/l/Lichenthrope.java index 40dc576460a..15ff902b797 100644 --- a/Mage.Sets/src/mage/cards/l/Lichenthrope.java +++ b/Mage.Sets/src/mage/cards/l/Lichenthrope.java @@ -36,7 +36,7 @@ public final class Lichenthrope extends CardImpl { this.toughness = new MageInt(5); // If damage would be dealt to Lichenthrope, put that many -1/-1 counters on it instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LichenthropeEffect())); + this.addAbility(new SimpleStaticAbility(new LichenthropeEffect())); // At the beginning of your upkeep, remove a -1/-1 counter from Lichenthrope. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new RemoveCounterSourceEffect(CounterType.M1M1.createInstance()))); diff --git a/Mage.Sets/src/mage/cards/l/LichsMastery.java b/Mage.Sets/src/mage/cards/l/LichsMastery.java index 516590290d2..c62db9e6f64 100644 --- a/Mage.Sets/src/mage/cards/l/LichsMastery.java +++ b/Mage.Sets/src/mage/cards/l/LichsMastery.java @@ -47,7 +47,7 @@ public final class LichsMastery extends CardImpl { this.addAbility(HexproofAbility.getInstance()); // You can't lose the game. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LichsMasteryCantLoseEffect())); + this.addAbility(new SimpleStaticAbility(new LichsMasteryCantLoseEffect())); // Whenever you gain life, draw that many cards. this.addAbility(new GainLifeControllerTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/l/LichsMirror.java b/Mage.Sets/src/mage/cards/l/LichsMirror.java index b6373798bcd..60e6a57859a 100644 --- a/Mage.Sets/src/mage/cards/l/LichsMirror.java +++ b/Mage.Sets/src/mage/cards/l/LichsMirror.java @@ -27,7 +27,7 @@ public final class LichsMirror extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); // If you would lose the game, instead shuffle your hand, your graveyard, and all permanents you own into your library, then draw seven cards and your life total becomes 20. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LichsMirrorEffect())); + this.addAbility(new SimpleStaticAbility(new LichsMirrorEffect())); } private LichsMirror(final LichsMirror card) { diff --git a/Mage.Sets/src/mage/cards/l/LichsTomb.java b/Mage.Sets/src/mage/cards/l/LichsTomb.java index 44727140f34..f1991509497 100644 --- a/Mage.Sets/src/mage/cards/l/LichsTomb.java +++ b/Mage.Sets/src/mage/cards/l/LichsTomb.java @@ -28,7 +28,7 @@ public final class LichsTomb extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // You don't lose the game for having 0 or less life. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontLoseByZeroOrLessLifeEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new DontLoseByZeroOrLessLifeEffect(Duration.WhileOnBattlefield))); // Whenever you lose life, sacrifice a permanent for each 1 life you lost. this.addAbility(new LichsTombTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/l/LifeAndLimb.java b/Mage.Sets/src/mage/cards/l/LifeAndLimb.java index 28217daaffa..28847dcff26 100644 --- a/Mage.Sets/src/mage/cards/l/LifeAndLimb.java +++ b/Mage.Sets/src/mage/cards/l/LifeAndLimb.java @@ -25,7 +25,7 @@ public final class LifeAndLimb extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{G}"); // All Forests and all Saprolings are 1/1 green Saproling creatures and Forest lands in addition to their other types. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LifeAndLimbEffect())); + this.addAbility(new SimpleStaticAbility(new LifeAndLimbEffect())); } private LifeAndLimb(final LifeAndLimb card) { diff --git a/Mage.Sets/src/mage/cards/l/Lifelink.java b/Mage.Sets/src/mage/cards/l/Lifelink.java index 170d5ba5e5c..69ac98bd64a 100644 --- a/Mage.Sets/src/mage/cards/l/Lifelink.java +++ b/Mage.Sets/src/mage/cards/l/Lifelink.java @@ -30,7 +30,7 @@ public final class Lifelink extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA))); } private Lifelink(final Lifelink card) { diff --git a/Mage.Sets/src/mage/cards/l/LightOfDay.java b/Mage.Sets/src/mage/cards/l/LightOfDay.java index 5754eca4fcf..63c2d94db81 100644 --- a/Mage.Sets/src/mage/cards/l/LightOfDay.java +++ b/Mage.Sets/src/mage/cards/l/LightOfDay.java @@ -29,7 +29,7 @@ public final class LightOfDay extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{W}"); // Black creatures can't attack or block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockAllEffect(Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new CantAttackBlockAllEffect(Duration.WhileOnBattlefield, filter))); } diff --git a/Mage.Sets/src/mage/cards/l/LightOfSanction.java b/Mage.Sets/src/mage/cards/l/LightOfSanction.java index f60d2efb876..1d2e056afa3 100644 --- a/Mage.Sets/src/mage/cards/l/LightOfSanction.java +++ b/Mage.Sets/src/mage/cards/l/LightOfSanction.java @@ -27,7 +27,7 @@ public final class LightOfSanction extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{W}{W}"); // Prevent all damage that would be dealt to creatures you control by sources you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LightOfSanctionEffect())); + this.addAbility(new SimpleStaticAbility(new LightOfSanctionEffect())); } private LightOfSanction(final LightOfSanction card) { diff --git a/Mage.Sets/src/mage/cards/l/Lightform.java b/Mage.Sets/src/mage/cards/l/Lightform.java index 0a2aa7afd92..7c9b403d4de 100644 --- a/Mage.Sets/src/mage/cards/l/Lightform.java +++ b/Mage.Sets/src/mage/cards/l/Lightform.java @@ -30,7 +30,7 @@ public final class Lightform extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new BecomesAuraAttachToManifestSourceEffect())); // Enchanted creature has flying and lifelink. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield)); + Ability ability = new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("and lifelink"); ability.addEffect(effect); @@ -46,5 +46,3 @@ public final class Lightform extends CardImpl { return new Lightform(this); } } - - diff --git a/Mage.Sets/src/mage/cards/l/LightningDiadem.java b/Mage.Sets/src/mage/cards/l/LightningDiadem.java index 8d72627bbcc..fa31371938f 100644 --- a/Mage.Sets/src/mage/cards/l/LightningDiadem.java +++ b/Mage.Sets/src/mage/cards/l/LightningDiadem.java @@ -44,7 +44,7 @@ public final class LightningDiadem extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2,2,Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2,2,Duration.WhileOnBattlefield))); } private LightningDiadem(final LightningDiadem card) { diff --git a/Mage.Sets/src/mage/cards/l/LightningGreaves.java b/Mage.Sets/src/mage/cards/l/LightningGreaves.java index 8f26b95960d..5792a3ee0c7 100644 --- a/Mage.Sets/src/mage/cards/l/LightningGreaves.java +++ b/Mage.Sets/src/mage/cards/l/LightningGreaves.java @@ -29,7 +29,7 @@ public final class LightningGreaves extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has haste and shroud. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.EQUIPMENT)); + Ability ability = new SimpleStaticAbility(new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.EQUIPMENT)); Effect effect = new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.EQUIPMENT); effect.setText("and shroud"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/l/LightningMauler.java b/Mage.Sets/src/mage/cards/l/LightningMauler.java index ae78a9bd4a1..6e5384b609d 100644 --- a/Mage.Sets/src/mage/cards/l/LightningMauler.java +++ b/Mage.Sets/src/mage/cards/l/LightningMauler.java @@ -34,7 +34,7 @@ public final class LightningMauler extends CardImpl { this.addAbility(new SoulbondAbility()); // As long as Lightning Mauler is paired with another creature, both creatures have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(HasteAbility.getInstance(), ruleText))); + this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(HasteAbility.getInstance(), ruleText))); } private LightningMauler(final LightningMauler card) { diff --git a/Mage.Sets/src/mage/cards/l/LightningProwess.java b/Mage.Sets/src/mage/cards/l/LightningProwess.java index 260bb9a1437..e66746e8e4d 100644 --- a/Mage.Sets/src/mage/cards/l/LightningProwess.java +++ b/Mage.Sets/src/mage/cards/l/LightningProwess.java @@ -36,10 +36,10 @@ public final class LightningProwess extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has haste and "{tap}: This creature deals 1 damage to any target." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA))); ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability, AttachmentType.AURA))); } private LightningProwess(final LightningProwess card) { diff --git a/Mage.Sets/src/mage/cards/l/LightningReflexes.java b/Mage.Sets/src/mage/cards/l/LightningReflexes.java index 14c03640dd8..4e969e5d9b5 100644 --- a/Mage.Sets/src/mage/cards/l/LightningReflexes.java +++ b/Mage.Sets/src/mage/cards/l/LightningReflexes.java @@ -43,7 +43,7 @@ public final class LightningReflexes extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+0 and has first strike. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA); effect.setText("and has first strike"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/l/LightningTalons.java b/Mage.Sets/src/mage/cards/l/LightningTalons.java index e6dde22cd88..ad0e2a58e0d 100644 --- a/Mage.Sets/src/mage/cards/l/LightningTalons.java +++ b/Mage.Sets/src/mage/cards/l/LightningTalons.java @@ -39,7 +39,7 @@ public final class LightningTalons extends CardImpl { Effect effect2 = new BoostEnchantedEffect(3, 0, Duration.WhileOnBattlefield); effect2.setText("Enchanted creature gets +3/+0"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 0, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(3, 0, Duration.WhileOnBattlefield)); effect2 = new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA); effect2.setText("and has first strike"); ability.addEffect(effect2); diff --git a/Mage.Sets/src/mage/cards/l/Lightwalker.java b/Mage.Sets/src/mage/cards/l/Lightwalker.java index 9a496fa57d2..3ddc8f25aef 100644 --- a/Mage.Sets/src/mage/cards/l/Lightwalker.java +++ b/Mage.Sets/src/mage/cards/l/Lightwalker.java @@ -29,7 +29,7 @@ public final class Lightwalker extends CardImpl { this.toughness = new MageInt(1); // Lightwalker has flying as long as it has a +1/+1 counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), new SourceHasCounterCondition(CounterType.P1P1),"Lightwalker has flying as long as it has a +1/+1 counter on it"))); } diff --git a/Mage.Sets/src/mage/cards/l/LilianasElite.java b/Mage.Sets/src/mage/cards/l/LilianasElite.java index aba15727ae5..c2f67ad69f5 100644 --- a/Mage.Sets/src/mage/cards/l/LilianasElite.java +++ b/Mage.Sets/src/mage/cards/l/LilianasElite.java @@ -29,7 +29,7 @@ public final class LilianasElite extends CardImpl { // Liliana's Elite gets +1/+1 for each creature card in your graveyard. DynamicValue amount = new CardsInControllerGraveyardCount(StaticFilters.FILTER_CARD_CREATURE); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield)); + Ability ability = new SimpleStaticAbility(new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/l/LilianasMastery.java b/Mage.Sets/src/mage/cards/l/LilianasMastery.java index b41616fb495..3bf6c0bb9af 100644 --- a/Mage.Sets/src/mage/cards/l/LilianasMastery.java +++ b/Mage.Sets/src/mage/cards/l/LilianasMastery.java @@ -31,7 +31,7 @@ public final class LilianasMastery extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{B}{B}"); // Zombies creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); // When Liliana's Army enters the battlefield, create two 2/2 black Zombie creature tokens. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new ZombieToken(), 2))); diff --git a/Mage.Sets/src/mage/cards/l/LingeringMirage.java b/Mage.Sets/src/mage/cards/l/LingeringMirage.java index 44870c1976b..1c37cece4e7 100644 --- a/Mage.Sets/src/mage/cards/l/LingeringMirage.java +++ b/Mage.Sets/src/mage/cards/l/LingeringMirage.java @@ -37,7 +37,7 @@ public final class LingeringMirage extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land is an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesBasicLandEnchantedEffect(SubType.ISLAND))); + this.addAbility(new SimpleStaticAbility(new BecomesBasicLandEnchantedEffect(SubType.ISLAND))); // Cycling {2} this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/l/LinvalaKeeperOfSilence.java b/Mage.Sets/src/mage/cards/l/LinvalaKeeperOfSilence.java index 643c6ba7a80..ce78e0d98b5 100644 --- a/Mage.Sets/src/mage/cards/l/LinvalaKeeperOfSilence.java +++ b/Mage.Sets/src/mage/cards/l/LinvalaKeeperOfSilence.java @@ -30,7 +30,7 @@ public final class LinvalaKeeperOfSilence extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Activated abilities of creatures your opponents control can't be activated. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LinvalaKeeperOfSilenceCantActivateEffect())); + this.addAbility(new SimpleStaticAbility(new LinvalaKeeperOfSilenceCantActivateEffect())); } private LinvalaKeeperOfSilence(final LinvalaKeeperOfSilence card) { diff --git a/Mage.Sets/src/mage/cards/l/LiuBeiLordOfShu.java b/Mage.Sets/src/mage/cards/l/LiuBeiLordOfShu.java index 7888e804eaa..35ec583cab0 100644 --- a/Mage.Sets/src/mage/cards/l/LiuBeiLordOfShu.java +++ b/Mage.Sets/src/mage/cards/l/LiuBeiLordOfShu.java @@ -43,7 +43,7 @@ public final class LiuBeiLordOfShu extends CardImpl { // Horsemanship this.addAbility(HorsemanshipAbility.getInstance()); // Liu Bei, Lord of Shu gets +2/+2 as long as you control a permanent named Guan Yu, Sainted Warrior or a permanent named Zhang Fei, Fierce Warrior. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "{this} gets +2/+2 as long as you control a permanent named Guan Yu, Sainted Warrior or a permanent named Zhang Fei, Fierce Warrior"))); diff --git a/Mage.Sets/src/mage/cards/l/LivingLands.java b/Mage.Sets/src/mage/cards/l/LivingLands.java index 0b1d5368644..fee8a2eadcf 100644 --- a/Mage.Sets/src/mage/cards/l/LivingLands.java +++ b/Mage.Sets/src/mage/cards/l/LivingLands.java @@ -27,7 +27,7 @@ public final class LivingLands extends CardImpl { new CreatureToken(1, 1, "1/1 creatures"), "lands", filter, Duration.WhileOnBattlefield, false); effect.getDependencyTypes().add(DependencyType.BecomeForest); // TODO: are these dependencies correct/complete? - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private LivingLands(final LivingLands card) { diff --git a/Mage.Sets/src/mage/cards/l/LivingPlane.java b/Mage.Sets/src/mage/cards/l/LivingPlane.java index 9b0a098b773..3ad0b887dcd 100644 --- a/Mage.Sets/src/mage/cards/l/LivingPlane.java +++ b/Mage.Sets/src/mage/cards/l/LivingPlane.java @@ -25,7 +25,7 @@ public final class LivingPlane extends CardImpl { this.supertype.add(SuperType.WORLD); // All lands are 1/1 creatures that are still lands. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAllEffect( + this.addAbility(new SimpleStaticAbility(new BecomesCreatureAllEffect( new CreatureToken(1, 1, "1/1 creatures"), "lands", filter, Duration.WhileOnBattlefield, false))); } diff --git a/Mage.Sets/src/mage/cards/l/LivingTerrain.java b/Mage.Sets/src/mage/cards/l/LivingTerrain.java index a55ff8acf82..9cc0309c621 100644 --- a/Mage.Sets/src/mage/cards/l/LivingTerrain.java +++ b/Mage.Sets/src/mage/cards/l/LivingTerrain.java @@ -34,7 +34,7 @@ public final class LivingTerrain extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land is a 5/6 green Treefolk creature that's still a land. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect( + this.addAbility(new SimpleStaticAbility(new BecomesCreatureAttachedEffect( new TreefolkToken(), "Enchanted land is a 5/6 green Treefolk creature that's still a land", Duration.WhileOnBattlefield, BecomesCreatureAttachedEffect.LoseType.COLOR))); } diff --git a/Mage.Sets/src/mage/cards/l/LlawanCephalidEmpress.java b/Mage.Sets/src/mage/cards/l/LlawanCephalidEmpress.java index 28135200652..fb1032599f5 100644 --- a/Mage.Sets/src/mage/cards/l/LlawanCephalidEmpress.java +++ b/Mage.Sets/src/mage/cards/l/LlawanCephalidEmpress.java @@ -47,7 +47,7 @@ public final class LlawanCephalidEmpress extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new ReturnToHandFromBattlefieldAllEffect(filter), false)); // Your opponents can't cast blue creature spells. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LlawanCephalidRuleModifyingEffect())); + this.addAbility(new SimpleStaticAbility(new LlawanCephalidRuleModifyingEffect())); } private LlawanCephalidEmpress(final LlawanCephalidEmpress card) { diff --git a/Mage.Sets/src/mage/cards/l/LobeLobber.java b/Mage.Sets/src/mage/cards/l/LobeLobber.java index 281fa788431..fdb7813f8be 100644 --- a/Mage.Sets/src/mage/cards/l/LobeLobber.java +++ b/Mage.Sets/src/mage/cards/l/LobeLobber.java @@ -33,7 +33,7 @@ public final class LobeLobber extends CardImpl { Effect effect = new LobeLobberEffect(); SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); ability.addTarget(new TargetPlayer()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability, AttachmentType.EQUIPMENT))); // Equip 2 this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2), false)); diff --git a/Mage.Sets/src/mage/cards/l/LocketOfYesterdays.java b/Mage.Sets/src/mage/cards/l/LocketOfYesterdays.java index 24662243bc5..6a336627168 100644 --- a/Mage.Sets/src/mage/cards/l/LocketOfYesterdays.java +++ b/Mage.Sets/src/mage/cards/l/LocketOfYesterdays.java @@ -24,7 +24,7 @@ public final class LocketOfYesterdays extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // Spells you cast cost {1} less to cast for each card with the same name as that spell in your graveyard. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LocketOfYesterdaysCostReductionEffect())); + this.addAbility(new SimpleStaticAbility(new LocketOfYesterdaysCostReductionEffect())); } private LocketOfYesterdays(final LocketOfYesterdays card) { diff --git a/Mage.Sets/src/mage/cards/l/LodestoneGolem.java b/Mage.Sets/src/mage/cards/l/LodestoneGolem.java index 0a5d66aed0e..e8109ca0f44 100644 --- a/Mage.Sets/src/mage/cards/l/LodestoneGolem.java +++ b/Mage.Sets/src/mage/cards/l/LodestoneGolem.java @@ -33,7 +33,7 @@ public final class LodestoneGolem extends CardImpl { this.toughness = new MageInt(3); // Nonartifact spells cost {1} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostIncreasingAllEffect(1, filter, TargetController.ANY))); + this.addAbility(new SimpleStaticAbility(new SpellsCostIncreasingAllEffect(1, filter, TargetController.ANY))); } private LodestoneGolem(final LodestoneGolem card) { diff --git a/Mage.Sets/src/mage/cards/l/LongForgottenGohei.java b/Mage.Sets/src/mage/cards/l/LongForgottenGohei.java index 1c94ca1801a..802a5ec44a2 100644 --- a/Mage.Sets/src/mage/cards/l/LongForgottenGohei.java +++ b/Mage.Sets/src/mage/cards/l/LongForgottenGohei.java @@ -31,10 +31,10 @@ public final class LongForgottenGohei extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // Arcane spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(arcaneFilter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(arcaneFilter, 1))); // Spirit creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, spiritFilter, false))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, spiritFilter, false))); } private LongForgottenGohei(final LongForgottenGohei card) { diff --git a/Mage.Sets/src/mage/cards/l/LordMagnus.java b/Mage.Sets/src/mage/cards/l/LordMagnus.java index 5f2e883add4..619c9ee1ddf 100644 --- a/Mage.Sets/src/mage/cards/l/LordMagnus.java +++ b/Mage.Sets/src/mage/cards/l/LordMagnus.java @@ -30,10 +30,10 @@ public final class LordMagnus extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // Creatures with plainswalk can be blocked as though they didn't have plainswalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LordMagnusFirstEffect())); + this.addAbility(new SimpleStaticAbility(new LordMagnusFirstEffect())); // Creatures with forestwalk can be blocked as though they didn't have forestwalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LordMagnusSecondEffect())); + this.addAbility(new SimpleStaticAbility(new LordMagnusSecondEffect())); } private LordMagnus(final LordMagnus card) { diff --git a/Mage.Sets/src/mage/cards/l/LordOfAtlantis.java b/Mage.Sets/src/mage/cards/l/LordOfAtlantis.java index da152ddbe49..8a70d443071 100644 --- a/Mage.Sets/src/mage/cards/l/LordOfAtlantis.java +++ b/Mage.Sets/src/mage/cards/l/LordOfAtlantis.java @@ -35,7 +35,7 @@ public final class LordOfAtlantis extends CardImpl { // Other Merfolk creatures get +1/+1 and have islandwalk. Effect effect = new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true); effect.setText("Other Merfolk get +1/+1"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new GainAbilityAllEffect(new IslandwalkAbility(), Duration.WhileOnBattlefield, filter, true); effect.setText("and have islandwalk"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/l/LordOfLineage.java b/Mage.Sets/src/mage/cards/l/LordOfLineage.java index 33a576955e8..544ede58b4d 100644 --- a/Mage.Sets/src/mage/cards/l/LordOfLineage.java +++ b/Mage.Sets/src/mage/cards/l/LordOfLineage.java @@ -40,7 +40,7 @@ public final class LordOfLineage extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Other Vampire creatures you control get +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, true))); // {T}: Create a 2/2 black Vampire creature token with flying. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new VampireToken()), new TapSourceCost())); diff --git a/Mage.Sets/src/mage/cards/l/LordOfTheAccursed.java b/Mage.Sets/src/mage/cards/l/LordOfTheAccursed.java index 865c56683ab..bab7384e2d8 100644 --- a/Mage.Sets/src/mage/cards/l/LordOfTheAccursed.java +++ b/Mage.Sets/src/mage/cards/l/LordOfTheAccursed.java @@ -35,7 +35,7 @@ public final class LordOfTheAccursed extends CardImpl { this.toughness = new MageInt(3); // Other Zombie creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); //{2}{B}, Tap: All Zombies gain menace until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( @@ -55,4 +55,4 @@ public final class LordOfTheAccursed extends CardImpl { public LordOfTheAccursed copy() { return new LordOfTheAccursed(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/l/LordOfTheNazgul.java b/Mage.Sets/src/mage/cards/l/LordOfTheNazgul.java index ce07d072a9b..85706c2fa89 100644 --- a/Mage.Sets/src/mage/cards/l/LordOfTheNazgul.java +++ b/Mage.Sets/src/mage/cards/l/LordOfTheNazgul.java @@ -54,7 +54,7 @@ public final class LordOfTheNazgul extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Wraiths you control have protection from Ring-bearers. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( new ProtectionAbility(filterRingBearer), Duration.WhileOnBattlefield, filterWraith ))); diff --git a/Mage.Sets/src/mage/cards/l/LordOfTheUnreal.java b/Mage.Sets/src/mage/cards/l/LordOfTheUnreal.java index 26a13fadd63..83fc418edfb 100644 --- a/Mage.Sets/src/mage/cards/l/LordOfTheUnreal.java +++ b/Mage.Sets/src/mage/cards/l/LordOfTheUnreal.java @@ -37,7 +37,7 @@ public final class LordOfTheUnreal extends CardImpl { this.toughness = new MageInt(2); // Illusion creatures you control get +1/+1 and have hexproof - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false)); + Ability ability = new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false)); ability.addEffect(new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, filter, false) .setText("and have hexproof")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LostInThought.java b/Mage.Sets/src/mage/cards/l/LostInThought.java index 9e89b4e6572..703d907f8d2 100644 --- a/Mage.Sets/src/mage/cards/l/LostInThought.java +++ b/Mage.Sets/src/mage/cards/l/LostInThought.java @@ -44,7 +44,7 @@ public final class LostInThought extends CardImpl { // Enchanted creature can't attack or block, and its activated abilities can't be activated. // Its controller may exile three cards from their graveyard for that player to ignore this effect until end of turn. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new LostInThoughtRestrictionEffect()); + ability = new SimpleStaticAbility(new LostInThoughtRestrictionEffect()); ability.addEffect(new LostInThoughtCantActivateAbilitiesEffect()); this.addAbility(ability); this.addAbility(new LostInThoughtSpecialAction()); diff --git a/Mage.Sets/src/mage/cards/l/LovisaColdeyes.java b/Mage.Sets/src/mage/cards/l/LovisaColdeyes.java index 39b1e4cafd7..228ffd0613d 100644 --- a/Mage.Sets/src/mage/cards/l/LovisaColdeyes.java +++ b/Mage.Sets/src/mage/cards/l/LovisaColdeyes.java @@ -37,7 +37,7 @@ public final class LovisaColdeyes extends CardImpl { // Each creature that's a Barbarian, a Warrior, or a Berserker gets +2/+2 and has haste. Effect effect = new BoostAllEffect(2, 2, Duration.WhileOnBattlefield, filter, false); effect.setText("Each creature that's a Barbarian, a Warrior, or a Berserker gets +2/+2"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter, false); effect.setText("and has haste"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/l/LoxodonPunisher.java b/Mage.Sets/src/mage/cards/l/LoxodonPunisher.java index 678e3fc07cc..3c628b87756 100644 --- a/Mage.Sets/src/mage/cards/l/LoxodonPunisher.java +++ b/Mage.Sets/src/mage/cards/l/LoxodonPunisher.java @@ -29,7 +29,7 @@ public final class LoxodonPunisher extends CardImpl { // Loxodon Punisher gets +2/+2 for each Equipment attached to it EquipmentAttachedCount amount = new EquipmentAttachedCount(2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield))); } private LoxodonPunisher(final LoxodonPunisher card) { diff --git a/Mage.Sets/src/mage/cards/l/LoxodonWarhammer.java b/Mage.Sets/src/mage/cards/l/LoxodonWarhammer.java index 0e54713ba90..974396f4621 100644 --- a/Mage.Sets/src/mage/cards/l/LoxodonWarhammer.java +++ b/Mage.Sets/src/mage/cards/l/LoxodonWarhammer.java @@ -28,7 +28,7 @@ public final class LoxodonWarhammer extends CardImpl { // Equipped creature gets +3/+0 and has trample and lifelink. (If the creature would assign enough damage to its blockers to destroy them, you may have it assign the rest of its damage to defending player or planeswalker. Damage dealt by the creature also causes its controller to gain that much life.) Effect effect = new BoostEquippedEffect(3, 0); effect.setText("Equipped creature gets +3/+0"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT); effect.setText("and has trample"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/l/LumberingSatyr.java b/Mage.Sets/src/mage/cards/l/LumberingSatyr.java index 49545ea51b5..79e655905db 100644 --- a/Mage.Sets/src/mage/cards/l/LumberingSatyr.java +++ b/Mage.Sets/src/mage/cards/l/LumberingSatyr.java @@ -27,7 +27,7 @@ public final class LumberingSatyr extends CardImpl { this.toughness = new MageInt(4); // All creatures have forestwalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(new ForestwalkAbility(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_CREATURES))); } diff --git a/Mage.Sets/src/mage/cards/l/LuminousBonds.java b/Mage.Sets/src/mage/cards/l/LuminousBonds.java index c7fd1a69ede..f9ae5a9d540 100644 --- a/Mage.Sets/src/mage/cards/l/LuminousBonds.java +++ b/Mage.Sets/src/mage/cards/l/LuminousBonds.java @@ -36,7 +36,7 @@ public final class LuminousBonds extends CardImpl { this.addAbility(ability); // Enchanted creature can't attack or block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantAttackBlockAttachedEffect(AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/l/LumithreadField.java b/Mage.Sets/src/mage/cards/l/LumithreadField.java index b5868a8c5bd..9ac90205ba9 100644 --- a/Mage.Sets/src/mage/cards/l/LumithreadField.java +++ b/Mage.Sets/src/mage/cards/l/LumithreadField.java @@ -22,7 +22,7 @@ public final class LumithreadField extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{W}"); // Creatures you control get +0/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield))); // Morph {1}{W} this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{W}"))); diff --git a/Mage.Sets/src/mage/cards/l/LunarchMantle.java b/Mage.Sets/src/mage/cards/l/LunarchMantle.java index 05b6b51874f..d699d39d9bd 100644 --- a/Mage.Sets/src/mage/cards/l/LunarchMantle.java +++ b/Mage.Sets/src/mage/cards/l/LunarchMantle.java @@ -46,7 +46,7 @@ public final class LunarchMantle extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2 and has "{1}, Sacrifice a permanent: This creature gains flying until end of turn." - SimpleStaticAbility ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); + SimpleStaticAbility ability2 = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); Ability abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); abilityToGain.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT)); diff --git a/Mage.Sets/src/mage/cards/l/Lure.java b/Mage.Sets/src/mage/cards/l/Lure.java index 3469c118c8e..dec53e7c515 100644 --- a/Mage.Sets/src/mage/cards/l/Lure.java +++ b/Mage.Sets/src/mage/cards/l/Lure.java @@ -37,7 +37,7 @@ public final class Lure extends CardImpl { this.addAbility(ability); // All creatures able to block enchanted creature do so. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAllAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAllAttachedEffect(AttachmentType.AURA))); } private Lure(final Lure card) { diff --git a/Mage.Sets/src/mage/cards/l/Lurker.java b/Mage.Sets/src/mage/cards/l/Lurker.java index e49aa6bfe47..3252f667135 100644 --- a/Mage.Sets/src/mage/cards/l/Lurker.java +++ b/Mage.Sets/src/mage/cards/l/Lurker.java @@ -38,7 +38,7 @@ public final class Lurker extends CardImpl { Effect effect = new ConditionalContinuousRuleModifyingEffect( new CantBeTargetedSourceEffect(new FilterSpell(), Duration.WhileOnBattlefield), new InvertCondition(new OrCondition(AttackedThisTurnSourceCondition.instance, BlockedThisTurnSourceCondition.instance))); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect.setText("{this} can't be the target of spells unless it attacked or blocked this turn")); + Ability ability = new SimpleStaticAbility(effect.setText("{this} can't be the target of spells unless it attacked or blocked this turn")); ability.addWatcher(new BlockedThisTurnWatcher()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/l/LushGrowth.java b/Mage.Sets/src/mage/cards/l/LushGrowth.java index 1f3318f6114..cd768c01c9e 100644 --- a/Mage.Sets/src/mage/cards/l/LushGrowth.java +++ b/Mage.Sets/src/mage/cards/l/LushGrowth.java @@ -34,7 +34,7 @@ public final class LushGrowth extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted land is a Mountain, Forest, and Plains. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesBasicLandEnchantedEffect(SubType.MOUNTAIN, SubType.FOREST, SubType.PLAINS))); + this.addAbility(new SimpleStaticAbility(new BecomesBasicLandEnchantedEffect(SubType.MOUNTAIN, SubType.FOREST, SubType.PLAINS))); } private LushGrowth(final LushGrowth card) { diff --git a/Mage.Sets/src/mage/cards/l/LymphSliver.java b/Mage.Sets/src/mage/cards/l/LymphSliver.java index d1699b376b4..550a7dd45f8 100644 --- a/Mage.Sets/src/mage/cards/l/LymphSliver.java +++ b/Mage.Sets/src/mage/cards/l/LymphSliver.java @@ -32,8 +32,8 @@ public final class LymphSliver extends CardImpl { this.toughness = new MageInt(3); // All Sliver creatures have absorb 1. - Ability absorb = new SimpleStaticAbility(Zone.BATTLEFIELD, new SliverAbsorbEffect()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(absorb, + Ability absorb = new SimpleStaticAbility(new SliverAbsorbEffect()); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(absorb, Duration.WhileOnBattlefield, filter, "All Sliver creatures have absorb 1. (If a source would deal damage to a Sliver, prevent 1 of that damage.)"))); } diff --git a/Mage.Sets/src/mage/cards/l/LyraDawnbringer.java b/Mage.Sets/src/mage/cards/l/LyraDawnbringer.java index 0c5c75c77e9..d5b9de5b6cb 100644 --- a/Mage.Sets/src/mage/cards/l/LyraDawnbringer.java +++ b/Mage.Sets/src/mage/cards/l/LyraDawnbringer.java @@ -37,7 +37,7 @@ public final class LyraDawnbringer extends CardImpl { // Other Angels you control get +1/+1 and have lifelink. Effect effect = new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, AngelFilter, true); effect.setText("Other Angels you control get +1/+1"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); Effect effect2 = new GainAbilityControlledEffect(LifelinkAbility.getInstance(), Duration.WhileOnBattlefield, AngelFilter, true); effect2.setText("and have lifelink"); ability.addEffect(effect2); diff --git a/Mage.Sets/src/mage/cards/m/MadAuntie.java b/Mage.Sets/src/mage/cards/m/MadAuntie.java index 87fc95fefd5..ac5bfeb3d2a 100644 --- a/Mage.Sets/src/mage/cards/m/MadAuntie.java +++ b/Mage.Sets/src/mage/cards/m/MadAuntie.java @@ -42,7 +42,7 @@ public final class MadAuntie extends CardImpl { this.toughness = new MageInt(2); // Other Goblin creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE_GOBLINS, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE_GOBLINS, true))); // {T}: Regenerate another target Goblin. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/m/MaelstromNexus.java b/Mage.Sets/src/mage/cards/m/MaelstromNexus.java index 1879563f991..8611f038655 100644 --- a/Mage.Sets/src/mage/cards/m/MaelstromNexus.java +++ b/Mage.Sets/src/mage/cards/m/MaelstromNexus.java @@ -30,7 +30,7 @@ public final class MaelstromNexus extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{W}{U}{B}{R}{G}"); // The first spell you cast each turn has cascade. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MaelstromNexusGainCascadeFirstSpellEffect()), new FirstSpellCastThisTurnWatcher()); + this.addAbility(new SimpleStaticAbility(new MaelstromNexusGainCascadeFirstSpellEffect()), new FirstSpellCastThisTurnWatcher()); } private MaelstromNexus(final MaelstromNexus card) { diff --git a/Mage.Sets/src/mage/cards/m/MageRingResponder.java b/Mage.Sets/src/mage/cards/m/MageRingResponder.java index 24a48636abf..9401a4a33a8 100644 --- a/Mage.Sets/src/mage/cards/m/MageRingResponder.java +++ b/Mage.Sets/src/mage/cards/m/MageRingResponder.java @@ -35,7 +35,7 @@ public final class MageRingResponder extends CardImpl { this.toughness = new MageInt(7); // Mage-Ring Responder doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // {7}: Untap Mage-Ring Responder. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl<>("{7}"))); diff --git a/Mage.Sets/src/mage/cards/m/MagebaneArmor.java b/Mage.Sets/src/mage/cards/m/MagebaneArmor.java index fb1a6fdd0db..a34fa10a68d 100644 --- a/Mage.Sets/src/mage/cards/m/MagebaneArmor.java +++ b/Mage.Sets/src/mage/cards/m/MagebaneArmor.java @@ -33,7 +33,7 @@ public final class MagebaneArmor extends CardImpl { // Equipped creature gets +2/+4 and loses flying. this.addAbility(new MagebaneArmorAbility()); // Prevent all noncombat damage that would be dealt to equipped creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MagebaneArmorPreventionEffect())); + this.addAbility(new SimpleStaticAbility(new MagebaneArmorPreventionEffect())); // Equip {2} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2))); } diff --git a/Mage.Sets/src/mage/cards/m/MagetasBoon.java b/Mage.Sets/src/mage/cards/m/MagetasBoon.java index f2ca51046c8..b01f730615d 100644 --- a/Mage.Sets/src/mage/cards/m/MagetasBoon.java +++ b/Mage.Sets/src/mage/cards/m/MagetasBoon.java @@ -37,7 +37,7 @@ public final class MagetasBoon extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield))); } private MagetasBoon(final MagetasBoon card) { diff --git a/Mage.Sets/src/mage/cards/m/MaggotTherapy.java b/Mage.Sets/src/mage/cards/m/MaggotTherapy.java index 4d811b7ec61..9677e02c239 100644 --- a/Mage.Sets/src/mage/cards/m/MaggotTherapy.java +++ b/Mage.Sets/src/mage/cards/m/MaggotTherapy.java @@ -34,7 +34,7 @@ public final class MaggotTherapy extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/-2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, -2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, -2, Duration.WhileOnBattlefield))); } private MaggotTherapy(final MaggotTherapy card) { diff --git a/Mage.Sets/src/mage/cards/m/MagistratesVeto.java b/Mage.Sets/src/mage/cards/m/MagistratesVeto.java index 8c4f10c71fd..4721eff8cf1 100644 --- a/Mage.Sets/src/mage/cards/m/MagistratesVeto.java +++ b/Mage.Sets/src/mage/cards/m/MagistratesVeto.java @@ -32,7 +32,7 @@ public final class MagistratesVeto extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}"); // White creatures and blue creatures can't block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAllEffect(filter, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CantBlockAllEffect(filter, Duration.WhileOnBattlefield))); } private MagistratesVeto(final MagistratesVeto card) { diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheFuture.java b/Mage.Sets/src/mage/cards/m/MagusOfTheFuture.java index a5988407338..3bf98804eb0 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheFuture.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheFuture.java @@ -26,10 +26,10 @@ public final class MagusOfTheFuture extends CardImpl { this.toughness = new MageInt(3); // Play with the top card of your library revealed. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithTheTopCardRevealedEffect())); + this.addAbility(new SimpleStaticAbility(new PlayWithTheTopCardRevealedEffect())); // You may play lands and cast spells from the top of your library. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayFromTopOfLibraryEffect())); + this.addAbility(new SimpleStaticAbility(new PlayFromTopOfLibraryEffect())); } private MagusOfTheFuture(final MagusOfTheFuture card) { diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheMoat.java b/Mage.Sets/src/mage/cards/m/MagusOfTheMoat.java index 96f070e81a3..6e866b4810a 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheMoat.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheMoat.java @@ -36,7 +36,7 @@ public final class MagusOfTheMoat extends CardImpl { this.toughness = new MageInt(3); // Creatures without flying can't attack. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAllEffect(Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new CantAttackAllEffect(Duration.WhileOnBattlefield, filter))); } private MagusOfTheMoat(final MagusOfTheMoat card) { diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheTabernacle.java b/Mage.Sets/src/mage/cards/m/MagusOfTheTabernacle.java index 5982f92390e..cc13ad4f745 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheTabernacle.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheTabernacle.java @@ -36,7 +36,7 @@ public final class MagusOfTheTabernacle extends CardImpl { // All creatures have "At the beginning of your upkeep, sacrifice this creature unless you pay {1}." Ability abilityToGain = new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new GenericManaCost(1))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(abilityToGain, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE, rule))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(abilityToGain, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE, rule))); } private MagusOfTheTabernacle(final MagusOfTheTabernacle card) { diff --git a/Mage.Sets/src/mage/cards/m/MaintenanceHangar.java b/Mage.Sets/src/mage/cards/m/MaintenanceHangar.java index 82d67cbcc0e..3a8db07a23d 100644 --- a/Mage.Sets/src/mage/cards/m/MaintenanceHangar.java +++ b/Mage.Sets/src/mage/cards/m/MaintenanceHangar.java @@ -42,7 +42,7 @@ public final class MaintenanceHangar extends CardImpl { // Starship creatures you control and starship creatures in your graveyard have Repair 6. Effect effect = new GainAbilityControlledEffect(new RepairAbility(6), Duration.WhileOnBattlefield, filterPermanent); effect.setText("Starship creatures you control"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); ability.addEffect(new MaintenanceHangarEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MairsilThePretender.java b/Mage.Sets/src/mage/cards/m/MairsilThePretender.java index 598d0d6af34..1df506dee92 100644 --- a/Mage.Sets/src/mage/cards/m/MairsilThePretender.java +++ b/Mage.Sets/src/mage/cards/m/MairsilThePretender.java @@ -45,7 +45,7 @@ public final class MairsilThePretender extends CardImpl { // Mairsil, the Pretender has all activated abilities of all cards you own in exile with cage counters on them. // You may activate each of those abilities only once each turn. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new MairsilThePretenderGainAbilitiesEffect()); + Ability ability = new SimpleStaticAbility(new MairsilThePretenderGainAbilitiesEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MakeshiftMannequin.java b/Mage.Sets/src/mage/cards/m/MakeshiftMannequin.java index d152ee8a24e..a075c356e47 100644 --- a/Mage.Sets/src/mage/cards/m/MakeshiftMannequin.java +++ b/Mage.Sets/src/mage/cards/m/MakeshiftMannequin.java @@ -88,7 +88,7 @@ class MakeshiftMannequinEffect extends OneShotEffect { if (permanent != null) { ContinuousEffect gainedEffect = new MakeshiftMannequinGainAbilityEffect(); // Bug #6885 Fixed when owner/controller leaves the game the effect still applies - SimpleStaticAbility gainAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, gainedEffect); + SimpleStaticAbility gainAbility = new SimpleStaticAbility(gainedEffect); gainAbility.setSourceId(cardId); gainAbility.getTargets().add(source.getTargets().get(0)); game.addEffect(gainedEffect, gainAbility); diff --git a/Mage.Sets/src/mage/cards/m/Malfunction.java b/Mage.Sets/src/mage/cards/m/Malfunction.java index 43e5099ab11..923defaf62e 100644 --- a/Mage.Sets/src/mage/cards/m/Malfunction.java +++ b/Mage.Sets/src/mage/cards/m/Malfunction.java @@ -38,7 +38,7 @@ public final class Malfunction extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect("permanent"))); // Enchanted permanent doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect("permanent"))); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect("permanent"))); } private Malfunction(final Malfunction card) { diff --git a/Mage.Sets/src/mage/cards/m/MaliciousIntent.java b/Mage.Sets/src/mage/cards/m/MaliciousIntent.java index eea51f29b1a..e2242f02218 100644 --- a/Mage.Sets/src/mage/cards/m/MaliciousIntent.java +++ b/Mage.Sets/src/mage/cards/m/MaliciousIntent.java @@ -38,7 +38,7 @@ public final class MaliciousIntent extends CardImpl { // Enchanted creature has "{tap}: Target creature can't block this turn." Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBlockTargetEffect(Duration.EndOfTurn), new TapSourceCost()); gainedAbility.addTarget(new TargetCreaturePermanent()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); } private MaliciousIntent(final MaliciousIntent card) { diff --git a/Mage.Sets/src/mage/cards/m/Malignus.java b/Mage.Sets/src/mage/cards/m/Malignus.java index 989d779bb39..a0d51a95248 100644 --- a/Mage.Sets/src/mage/cards/m/Malignus.java +++ b/Mage.Sets/src/mage/cards/m/Malignus.java @@ -38,7 +38,7 @@ public final class Malignus extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetBasePowerToughnessSourceEffect(new HighestLifeTotalAmongOpponentsCount()))); // Damage that would be dealt by Malignus can't be prevented. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MalignusEffect())); + this.addAbility(new SimpleStaticAbility(new MalignusEffect())); } private Malignus(final Malignus card) { diff --git a/Mage.Sets/src/mage/cards/m/ManaChains.java b/Mage.Sets/src/mage/cards/m/ManaChains.java index 11c4436bd55..1d6718dedbc 100644 --- a/Mage.Sets/src/mage/cards/m/ManaChains.java +++ b/Mage.Sets/src/mage/cards/m/ManaChains.java @@ -36,7 +36,7 @@ public final class ManaChains extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "Cumulative upkeep {1}." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect( new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}")), AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/m/ManaMatrix.java b/Mage.Sets/src/mage/cards/m/ManaMatrix.java index a3dbe0516bb..5b08594ac58 100644 --- a/Mage.Sets/src/mage/cards/m/ManaMatrix.java +++ b/Mage.Sets/src/mage/cards/m/ManaMatrix.java @@ -30,7 +30,7 @@ public final class ManaMatrix extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{6}"); // Instant and enchantment spells you cast cost up to {2} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 2, true))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 2, true))); } private ManaMatrix(final ManaMatrix card) { diff --git a/Mage.Sets/src/mage/cards/m/ManaMaze.java b/Mage.Sets/src/mage/cards/m/ManaMaze.java index e7d85a34037..a9c2a44584f 100644 --- a/Mage.Sets/src/mage/cards/m/ManaMaze.java +++ b/Mage.Sets/src/mage/cards/m/ManaMaze.java @@ -26,7 +26,7 @@ public final class ManaMaze extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); // Players can't cast spells that share a color with the spell most recently cast this turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ManaMazeEffect()), new LastSpellCastWatcher()); + this.addAbility(new SimpleStaticAbility(new ManaMazeEffect()), new LastSpellCastWatcher()); } private ManaMaze(final ManaMaze card) { diff --git a/Mage.Sets/src/mage/cards/m/ManaVault.java b/Mage.Sets/src/mage/cards/m/ManaVault.java index 358589941d4..007f4fbbf10 100644 --- a/Mage.Sets/src/mage/cards/m/ManaVault.java +++ b/Mage.Sets/src/mage/cards/m/ManaVault.java @@ -28,7 +28,7 @@ public final class ManaVault extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // Mana Vault doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // At the beginning of your upkeep, you may pay {4}. If you do, untap Mana Vault. this.addAbility(new BeginningOfUpkeepTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/m/ManaclesOfDecay.java b/Mage.Sets/src/mage/cards/m/ManaclesOfDecay.java index 1e755df1264..09b8265f03e 100644 --- a/Mage.Sets/src/mage/cards/m/ManaclesOfDecay.java +++ b/Mage.Sets/src/mage/cards/m/ManaclesOfDecay.java @@ -35,7 +35,7 @@ public final class ManaclesOfDecay extends CardImpl { this.addAbility(ability); // Enchanted creature can't attack. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantAttackAttachedEffect(AttachmentType.AURA))); // {B}: Enchanted creature gets -1/-1 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-1, -1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B))); // {R}: Enchanted creature can't block this turn. diff --git a/Mage.Sets/src/mage/cards/m/ManaweftSliver.java b/Mage.Sets/src/mage/cards/m/ManaweftSliver.java index d6aaf85fc59..65acada1c50 100644 --- a/Mage.Sets/src/mage/cards/m/ManaweftSliver.java +++ b/Mage.Sets/src/mage/cards/m/ManaweftSliver.java @@ -30,7 +30,7 @@ public final class ManaweftSliver extends CardImpl { this.toughness = new MageInt(1); // Sliver creatures you control have "{T}: Add one mana of any color." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect( new AnyColorManaAbility(), Duration.WhileOnBattlefield, filter diff --git a/Mage.Sets/src/mage/cards/m/ManiacalRage.java b/Mage.Sets/src/mage/cards/m/ManiacalRage.java index 4cfb9309ba5..22a5d7d53e5 100644 --- a/Mage.Sets/src/mage/cards/m/ManiacalRage.java +++ b/Mage.Sets/src/mage/cards/m/ManiacalRage.java @@ -31,7 +31,7 @@ public final class ManiacalRage extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2 and can't block. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); ability.addEffect(new CantBlockAttachedEffect(AttachmentType.AURA).setText("and can't block")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/ManorGargoyle.java b/Mage.Sets/src/mage/cards/m/ManorGargoyle.java index f0101955cb8..98c9c9c83e4 100644 --- a/Mage.Sets/src/mage/cards/m/ManorGargoyle.java +++ b/Mage.Sets/src/mage/cards/m/ManorGargoyle.java @@ -64,7 +64,7 @@ public final class ManorGargoyle extends CardImpl { gainEffect.setDependedToType(DependencyType.LooseDefenderEffect); ConditionalContinuousEffect effect = new ConditionalContinuousEffect(gainEffect, HasDefenderCondition.instance, rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // {1}: Until end of turn, Manor Gargoyle loses defender and gains flying. ContinuousEffect effect2 = new LoseAbilitySourceEffect(DefenderAbility.getInstance(), Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/cards/m/ManrikiGusari.java b/Mage.Sets/src/mage/cards/m/ManrikiGusari.java index 36b3710e969..8bb16afc199 100644 --- a/Mage.Sets/src/mage/cards/m/ManrikiGusari.java +++ b/Mage.Sets/src/mage/cards/m/ManrikiGusari.java @@ -33,10 +33,10 @@ public final class ManrikiGusari extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+2 and has "{tap}: Destroy target Equipment." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 2))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 2))); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); gainedAbility.addTarget(new TargetPermanent(filter)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.EQUIPMENT))); // Equip {1} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(1))); } diff --git a/Mage.Sets/src/mage/cards/m/MantaRay.java b/Mage.Sets/src/mage/cards/m/MantaRay.java index 31053378689..58c7bb45bbc 100644 --- a/Mage.Sets/src/mage/cards/m/MantaRay.java +++ b/Mage.Sets/src/mage/cards/m/MantaRay.java @@ -37,7 +37,7 @@ public final class MantaRay extends CardImpl { this.toughness = new MageInt(3); // Manta Ray can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); // Manta Ray can't be blocked except by blue creatures. this.addAbility(new SimpleEvasionAbility(new CantBeBlockedByCreaturesSourceEffect(filter, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/m/MantellianSavrip.java b/Mage.Sets/src/mage/cards/m/MantellianSavrip.java index 5dc2fb9e627..409db7ccc02 100644 --- a/Mage.Sets/src/mage/cards/m/MantellianSavrip.java +++ b/Mage.Sets/src/mage/cards/m/MantellianSavrip.java @@ -32,7 +32,7 @@ public final class MantellianSavrip extends CardImpl { this.addAbility(new MonstrosityAbility("{5}{G}{G}", 2)); // Creatures with power less than Mantellian Savrip's power can't block it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MantellianSavripRestrictionEffect())); + this.addAbility(new SimpleStaticAbility(new MantellianSavripRestrictionEffect())); } diff --git a/Mage.Sets/src/mage/cards/m/MaralenOfTheMornsong.java b/Mage.Sets/src/mage/cards/m/MaralenOfTheMornsong.java index 88590c5ece5..ef4c28d7eb8 100644 --- a/Mage.Sets/src/mage/cards/m/MaralenOfTheMornsong.java +++ b/Mage.Sets/src/mage/cards/m/MaralenOfTheMornsong.java @@ -32,7 +32,7 @@ public final class MaralenOfTheMornsong extends CardImpl { this.toughness = new MageInt(3); // Players can't draw cards. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MaralenOfTheMornsongEffect())); + this.addAbility(new SimpleStaticAbility(new MaralenOfTheMornsongEffect())); // At the beginning of each player's draw step, that player loses 3 life, searches their library for a card, puts it into their hand, then shuffles their library. this.addAbility(new BeginningOfDrawTriggeredAbility(TargetController.EACH_PLAYER, new MaralenOfTheMornsongEffect2(), false)); diff --git a/Mage.Sets/src/mage/cards/m/MarangRiverProwler.java b/Mage.Sets/src/mage/cards/m/MarangRiverProwler.java index 05600c3f4a6..9abd9c27b6b 100644 --- a/Mage.Sets/src/mage/cards/m/MarangRiverProwler.java +++ b/Mage.Sets/src/mage/cards/m/MarangRiverProwler.java @@ -33,7 +33,7 @@ public final class MarangRiverProwler extends CardImpl { this.toughness = new MageInt(1); // Marang River Prowler can't block and can't be blocked. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockSourceEffect(Duration.WhileOnBattlefield)); + Ability ability = new SimpleStaticAbility(new CantBlockSourceEffect(Duration.WhileOnBattlefield)); Effect effect = new CantBeBlockedSourceEffect(); effect.setText("and can't be blocked"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/m/MaraudersAxe.java b/Mage.Sets/src/mage/cards/m/MaraudersAxe.java index 0d62e62dd0b..c13e28737e2 100644 --- a/Mage.Sets/src/mage/cards/m/MaraudersAxe.java +++ b/Mage.Sets/src/mage/cards/m/MaraudersAxe.java @@ -22,7 +22,7 @@ public final class MaraudersAxe extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 0))); // Equip {2} this.addAbility(new EquipAbility(2)); diff --git a/Mage.Sets/src/mage/cards/m/MaraudingBoneslasher.java b/Mage.Sets/src/mage/cards/m/MaraudingBoneslasher.java index 53b1f98a0bb..b271f505b61 100644 --- a/Mage.Sets/src/mage/cards/m/MaraudingBoneslasher.java +++ b/Mage.Sets/src/mage/cards/m/MaraudingBoneslasher.java @@ -35,7 +35,7 @@ public final class MaraudingBoneslasher extends CardImpl { this.toughness = new MageInt(3); // Marauding Boneslasher can't block unless you control another Zombie. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockUnlessYouControlSourceEffect(filter))); + this.addAbility(new SimpleStaticAbility(new CantBlockUnlessYouControlSourceEffect(filter))); } diff --git a/Mage.Sets/src/mage/cards/m/MaraudingKnight.java b/Mage.Sets/src/mage/cards/m/MaraudingKnight.java index 1f36f49624d..45ab826aaa6 100644 --- a/Mage.Sets/src/mage/cards/m/MaraudingKnight.java +++ b/Mage.Sets/src/mage/cards/m/MaraudingKnight.java @@ -38,7 +38,7 @@ public final class MaraudingKnight extends CardImpl { // Marauding Knight gets +1/+1 for each Plains your opponents control. PermanentsOnBattlefieldCount amount = new PermanentsOnBattlefieldCount(plainsFilter, 1); - SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield)); + SimpleStaticAbility ability = new SimpleStaticAbility(new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MaraudingMaulhorn.java b/Mage.Sets/src/mage/cards/m/MaraudingMaulhorn.java index 64f79cdbe71..7bbaea8ce60 100644 --- a/Mage.Sets/src/mage/cards/m/MaraudingMaulhorn.java +++ b/Mage.Sets/src/mage/cards/m/MaraudingMaulhorn.java @@ -38,7 +38,7 @@ public final class MaraudingMaulhorn extends CardImpl { new AttacksIfAbleSourceEffect(Duration.WhileOnBattlefield, true), new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.FEWER_THAN, 1)); effect.setText("{this} attacks each combat if able unless you control a creature named Advocate of the Beast"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private MaraudingMaulhorn(final MaraudingMaulhorn card) { diff --git a/Mage.Sets/src/mage/cards/m/MarchOfTheMachines.java b/Mage.Sets/src/mage/cards/m/MarchOfTheMachines.java index 7bf7233ac8b..6c22ed486b9 100644 --- a/Mage.Sets/src/mage/cards/m/MarchOfTheMachines.java +++ b/Mage.Sets/src/mage/cards/m/MarchOfTheMachines.java @@ -25,7 +25,7 @@ public final class MarchOfTheMachines extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}"); // Each noncreature artifact is an artifact creature with power and toughness each equal to its converted mana cost. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MarchOfTheMachinesEffect())); + this.addAbility(new SimpleStaticAbility(new MarchOfTheMachinesEffect())); } private MarchOfTheMachines(final MarchOfTheMachines card) { diff --git a/Mage.Sets/src/mage/cards/m/MarduRunemark.java b/Mage.Sets/src/mage/cards/m/MarduRunemark.java index 152abe3c1a3..f89367f59f3 100644 --- a/Mage.Sets/src/mage/cards/m/MarduRunemark.java +++ b/Mage.Sets/src/mage/cards/m/MarduRunemark.java @@ -49,7 +49,7 @@ public final class MarduRunemark extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // Enchanted creature has first strike as long as you control a white or black permanent. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA), diff --git a/Mage.Sets/src/mage/cards/m/MariTheKillingQuill.java b/Mage.Sets/src/mage/cards/m/MariTheKillingQuill.java index d96f26f8348..70f9e008ffc 100644 --- a/Mage.Sets/src/mage/cards/m/MariTheKillingQuill.java +++ b/Mage.Sets/src/mage/cards/m/MariTheKillingQuill.java @@ -64,7 +64,7 @@ public class MariTheKillingQuill extends CardImpl { // "Whenever this creature deals combat damage to a player, you may remove a hit counter from a card that player owns in exile. // If you do, draw a card and create two Treasure tokens." GainAbilityControlledEffect gainDeathTouchEffect = new GainAbilityControlledEffect(DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield, filter); - Ability mainAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, gainDeathTouchEffect); + Ability mainAbility = new SimpleStaticAbility(gainDeathTouchEffect); // NOTE: Optional part is handled inside the effect Ability dealsDamageAbility = new DealsCombatDamageToAPlayerTriggeredAbility(new MariTheKillingQuillDealsDamageEffect(), false, true); diff --git a/Mage.Sets/src/mage/cards/m/Marjhan.java b/Mage.Sets/src/mage/cards/m/Marjhan.java index e192ee914aa..3f92a5a1480 100644 --- a/Mage.Sets/src/mage/cards/m/Marjhan.java +++ b/Mage.Sets/src/mage/cards/m/Marjhan.java @@ -49,7 +49,7 @@ public final class Marjhan extends CardImpl { this.toughness = new MageInt(8); // Marjhan doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // {U}{U}, Sacrifice a creature: Untap Marjhan. Activate this ability only during your upkeep. Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, @@ -58,7 +58,7 @@ public final class Marjhan extends CardImpl { this.addAbility(ability); // Marjhan can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); // {U}{U}: Marjhan gets -1/-0 until end of turn and deals 1 damage to target attacking creature without flying. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{U}{U}")); diff --git a/Mage.Sets/src/mage/cards/m/MarkOfFury.java b/Mage.Sets/src/mage/cards/m/MarkOfFury.java index 4767497ef43..63f0742414e 100644 --- a/Mage.Sets/src/mage/cards/m/MarkOfFury.java +++ b/Mage.Sets/src/mage/cards/m/MarkOfFury.java @@ -38,7 +38,7 @@ public final class MarkOfFury extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA))); // At the beginning of the end step, return Mark of Fury to its owner's hand. this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new ReturnToHandSourceEffect(true), false)); } diff --git a/Mage.Sets/src/mage/cards/m/MarkOfSakiko.java b/Mage.Sets/src/mage/cards/m/MarkOfSakiko.java index e503f0fd5bc..851606bd38b 100644 --- a/Mage.Sets/src/mage/cards/m/MarkOfSakiko.java +++ b/Mage.Sets/src/mage/cards/m/MarkOfSakiko.java @@ -46,7 +46,7 @@ public final class MarkOfSakiko extends CardImpl { // Enchanted creature has "Whenever this creature deals combat damage to a player, add that much {G}. Until end of turn, you don't lose this mana as steps and phases end." Effect effect = new GainAbilityAttachedEffect(new MarkOfSakikoTriggeredAbility(), AttachmentType.AURA); effect.setText("Enchanted creature has \"Whenever this creature deals combat damage to a player, add that much {G}. Until end of turn, you don't lose this mana as steps and phases end.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/m/MarkOfTheOni.java b/Mage.Sets/src/mage/cards/m/MarkOfTheOni.java index cd6f2909d89..368ab8e5975 100644 --- a/Mage.Sets/src/mage/cards/m/MarkOfTheOni.java +++ b/Mage.Sets/src/mage/cards/m/MarkOfTheOni.java @@ -37,7 +37,7 @@ public final class MarkOfTheOni extends CardImpl { this.addAbility(ability); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); // At the beginning of the end step, if you control no Demons, sacrifice Mark of the Oni. this.addAbility(new BeginningOfEndStepTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/m/MarkOfTheVampire.java b/Mage.Sets/src/mage/cards/m/MarkOfTheVampire.java index 25951f46c22..2e7193304b3 100644 --- a/Mage.Sets/src/mage/cards/m/MarkOfTheVampire.java +++ b/Mage.Sets/src/mage/cards/m/MarkOfTheVampire.java @@ -37,7 +37,7 @@ public final class MarkOfTheVampire extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +2/+2 and has lifelink. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); + Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); ability.addEffect(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA).setText("and has lifelink")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MarkedByHonor.java b/Mage.Sets/src/mage/cards/m/MarkedByHonor.java index d01cdc7e9b4..30368268ef1 100644 --- a/Mage.Sets/src/mage/cards/m/MarkedByHonor.java +++ b/Mage.Sets/src/mage/cards/m/MarkedByHonor.java @@ -42,7 +42,7 @@ public final class MarkedByHonor extends CardImpl { // Enchanted creature gets +2/+2 and has vigilance. Effect effect = new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +2/+2"); - SimpleStaticAbility ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + SimpleStaticAbility ability2 = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA); effect.setText("and has vigilance"); ability2.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/m/MarkovCrusader.java b/Mage.Sets/src/mage/cards/m/MarkovCrusader.java index ecbdd0e46fe..a12b536b096 100644 --- a/Mage.Sets/src/mage/cards/m/MarkovCrusader.java +++ b/Mage.Sets/src/mage/cards/m/MarkovCrusader.java @@ -43,7 +43,7 @@ public final class MarkovCrusader extends CardImpl { // Markov Crusader has haste as long as you control another Vampire. Effect effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(HasteAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private MarkovCrusader(final MarkovCrusader card) { diff --git a/Mage.Sets/src/mage/cards/m/MarrowGnawer.java b/Mage.Sets/src/mage/cards/m/MarrowGnawer.java index 930733a9516..72a9404f973 100644 --- a/Mage.Sets/src/mage/cards/m/MarrowGnawer.java +++ b/Mage.Sets/src/mage/cards/m/MarrowGnawer.java @@ -42,7 +42,7 @@ public final class MarrowGnawer extends CardImpl { this.toughness = new MageInt(3); // All Rats have fear. (They can't be blocked except by artifact creatures and/or black creatures.) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(FearAbility.getInstance(), Duration.WhileOnBattlefield, filterFear))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(FearAbility.getInstance(), Duration.WhileOnBattlefield, filterFear))); // {T}, Sacrifice a Rat: create X 1/1 black Rat creature tokens, where X is the number of Rats you control. Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new RatToken(), xValue), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/m/MartyrsOfKorlis.java b/Mage.Sets/src/mage/cards/m/MartyrsOfKorlis.java index 5aaaad5e602..778e98731d7 100644 --- a/Mage.Sets/src/mage/cards/m/MartyrsOfKorlis.java +++ b/Mage.Sets/src/mage/cards/m/MartyrsOfKorlis.java @@ -38,7 +38,7 @@ public final class MartyrsOfKorlis extends CardImpl { SourceTappedCondition.UNTAPPED, null); effect.setText("{this} redirects artifact damage from controller as long as it's untapped"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private MartyrsOfKorlis(final MartyrsOfKorlis card) { diff --git a/Mage.Sets/src/mage/cards/m/MasakoTheHumorless.java b/Mage.Sets/src/mage/cards/m/MasakoTheHumorless.java index a1bc7b277ce..7b5c87f6cd7 100644 --- a/Mage.Sets/src/mage/cards/m/MasakoTheHumorless.java +++ b/Mage.Sets/src/mage/cards/m/MasakoTheHumorless.java @@ -31,7 +31,7 @@ public final class MasakoTheHumorless extends CardImpl { // Flash this.addAbility(FlashAbility.getInstance()); // Tapped creatures you control can block as though they were untapped. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BlockTappedEffect())); + this.addAbility(new SimpleStaticAbility(new BlockTappedEffect())); } private MasakoTheHumorless(final MasakoTheHumorless card) { diff --git a/Mage.Sets/src/mage/cards/m/MaskOfAvacyn.java b/Mage.Sets/src/mage/cards/m/MaskOfAvacyn.java index 1b30324fae6..11ffbdf0db5 100644 --- a/Mage.Sets/src/mage/cards/m/MaskOfAvacyn.java +++ b/Mage.Sets/src/mage/cards/m/MaskOfAvacyn.java @@ -24,7 +24,7 @@ public final class MaskOfAvacyn extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+2 and has hexproof. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 2)); + Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(1, 2)); Effect effect = new GainAbilityAttachedEffect(HexproofAbility.getInstance(), AttachmentType.EQUIPMENT); effect.setText("and has hexproof"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/m/MaskOfLawAndGrace.java b/Mage.Sets/src/mage/cards/m/MaskOfLawAndGrace.java index 80360c3817c..278d0c17c0c 100644 --- a/Mage.Sets/src/mage/cards/m/MaskOfLawAndGrace.java +++ b/Mage.Sets/src/mage/cards/m/MaskOfLawAndGrace.java @@ -37,7 +37,7 @@ public final class MaskOfLawAndGrace extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has protection from black and from red. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ProtectionAbility.from(ObjectColor.BLACK, ObjectColor.RED), + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ProtectionAbility.from(ObjectColor.BLACK, ObjectColor.RED), AttachmentType.AURA, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/m/MaskOfRiddles.java b/Mage.Sets/src/mage/cards/m/MaskOfRiddles.java index 61d5b75130c..51a0dfeea32 100644 --- a/Mage.Sets/src/mage/cards/m/MaskOfRiddles.java +++ b/Mage.Sets/src/mage/cards/m/MaskOfRiddles.java @@ -24,7 +24,7 @@ public final class MaskOfRiddles extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has fear. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FearAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FearAbility.getInstance(), AttachmentType.EQUIPMENT))); // Whenever equipped creature deals combat damage to a player, you may draw a card. this.addAbility(new DealsDamageToAPlayerAttachedTriggeredAbility(new DrawCardSourceControllerEffect(1), "equipped", true)); // Equip {2} diff --git a/Mage.Sets/src/mage/cards/m/MassHysteria.java b/Mage.Sets/src/mage/cards/m/MassHysteria.java index 278576bf93b..7c4053b00f4 100644 --- a/Mage.Sets/src/mage/cards/m/MassHysteria.java +++ b/Mage.Sets/src/mage/cards/m/MassHysteria.java @@ -21,7 +21,7 @@ public final class MassHysteria extends CardImpl { public MassHysteria(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{R}"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_CREATURES, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_CREATURES, false))); } private MassHysteria(final MassHysteria card) { diff --git a/Mage.Sets/src/mage/cards/m/MasterOfEtherium.java b/Mage.Sets/src/mage/cards/m/MasterOfEtherium.java index 6a11918fb11..20eb072c811 100644 --- a/Mage.Sets/src/mage/cards/m/MasterOfEtherium.java +++ b/Mage.Sets/src/mage/cards/m/MasterOfEtherium.java @@ -40,7 +40,7 @@ public final class MasterOfEtherium extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetBasePowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filterCounted)))); // Other artifact creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBoosted, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBoosted, true))); } private MasterOfEtherium(final MasterOfEtherium card) { diff --git a/Mage.Sets/src/mage/cards/m/MasterSplicer.java b/Mage.Sets/src/mage/cards/m/MasterSplicer.java index febf3da2cd0..b3708715386 100644 --- a/Mage.Sets/src/mage/cards/m/MasterSplicer.java +++ b/Mage.Sets/src/mage/cards/m/MasterSplicer.java @@ -33,7 +33,7 @@ public final class MasterSplicer extends CardImpl { this.toughness = new MageInt(1); this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new PhyrexianGolemToken()))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); } private MasterSplicer(final MasterSplicer card) { diff --git a/Mage.Sets/src/mage/cards/m/MaulSplicer.java b/Mage.Sets/src/mage/cards/m/MaulSplicer.java index 366ad87e8c1..e030f28d7b1 100644 --- a/Mage.Sets/src/mage/cards/m/MaulSplicer.java +++ b/Mage.Sets/src/mage/cards/m/MaulSplicer.java @@ -42,7 +42,7 @@ public final class MaulSplicer extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new PhyrexianGolemToken(), 2))); // Golem creatures you control have trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filter))); } private MaulSplicer(final MaulSplicer card) { diff --git a/Mage.Sets/src/mage/cards/m/MazeAbomination.java b/Mage.Sets/src/mage/cards/m/MazeAbomination.java index e3614764cf4..97f5ef9d54b 100644 --- a/Mage.Sets/src/mage/cards/m/MazeAbomination.java +++ b/Mage.Sets/src/mage/cards/m/MazeAbomination.java @@ -40,7 +40,7 @@ public final class MazeAbomination extends CardImpl { this.addAbility(DeathtouchAbility.getInstance()); // Multicolored creatures you control have deathtouch. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield, filter))); } diff --git a/Mage.Sets/src/mage/cards/m/MazeBehemoth.java b/Mage.Sets/src/mage/cards/m/MazeBehemoth.java index de6ad6fbd2b..9e6a66237f9 100644 --- a/Mage.Sets/src/mage/cards/m/MazeBehemoth.java +++ b/Mage.Sets/src/mage/cards/m/MazeBehemoth.java @@ -40,7 +40,7 @@ public final class MazeBehemoth extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Multicolored creatures you control have trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filter))); } diff --git a/Mage.Sets/src/mage/cards/m/MazeGlider.java b/Mage.Sets/src/mage/cards/m/MazeGlider.java index c4d274f40dd..79939f06648 100644 --- a/Mage.Sets/src/mage/cards/m/MazeGlider.java +++ b/Mage.Sets/src/mage/cards/m/MazeGlider.java @@ -40,7 +40,7 @@ public final class MazeGlider extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Multicolored creatures you control have flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, filter))); } diff --git a/Mage.Sets/src/mage/cards/m/MazeRusher.java b/Mage.Sets/src/mage/cards/m/MazeRusher.java index d00a3982500..2a854b3a01a 100644 --- a/Mage.Sets/src/mage/cards/m/MazeRusher.java +++ b/Mage.Sets/src/mage/cards/m/MazeRusher.java @@ -40,7 +40,7 @@ public final class MazeRusher extends CardImpl { this.addAbility(HasteAbility.getInstance()); // Multicolored creatures you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter))); } diff --git a/Mage.Sets/src/mage/cards/m/MazeSentinel.java b/Mage.Sets/src/mage/cards/m/MazeSentinel.java index bc1eb053e63..9525fe679ef 100644 --- a/Mage.Sets/src/mage/cards/m/MazeSentinel.java +++ b/Mage.Sets/src/mage/cards/m/MazeSentinel.java @@ -40,7 +40,7 @@ public final class MazeSentinel extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Multicolored creatures you control have vigilance. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filter))); } diff --git a/Mage.Sets/src/mage/cards/m/MazesMantle.java b/Mage.Sets/src/mage/cards/m/MazesMantle.java index 5d78e8a610a..3970420af8c 100644 --- a/Mage.Sets/src/mage/cards/m/MazesMantle.java +++ b/Mage.Sets/src/mage/cards/m/MazesMantle.java @@ -48,7 +48,7 @@ public class MazesMantle extends CardImpl { )); //Enchanted creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); } private MazesMantle(final MazesMantle card) { diff --git a/Mage.Sets/src/mage/cards/m/MeddlingMage.java b/Mage.Sets/src/mage/cards/m/MeddlingMage.java index f7780b329bc..d4bfe35fa66 100644 --- a/Mage.Sets/src/mage/cards/m/MeddlingMage.java +++ b/Mage.Sets/src/mage/cards/m/MeddlingMage.java @@ -35,7 +35,7 @@ public final class MeddlingMage extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseACardNameEffect(ChooseACardNameEffect.TypeOfName.NON_LAND_NAME))); // Spells with the chosen name can't be cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MeddlingMageReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new MeddlingMageReplacementEffect())); } private MeddlingMage(final MeddlingMage card) { diff --git a/Mage.Sets/src/mage/cards/m/MedomaiTheAgeless.java b/Mage.Sets/src/mage/cards/m/MedomaiTheAgeless.java index 208ce35dfe3..b93a0ed4114 100644 --- a/Mage.Sets/src/mage/cards/m/MedomaiTheAgeless.java +++ b/Mage.Sets/src/mage/cards/m/MedomaiTheAgeless.java @@ -38,7 +38,7 @@ public final class MedomaiTheAgeless extends CardImpl { // Medomai the Ageless can't attack during extra turns. Effect effect = new ConditionalRestrictionEffect(new CantAttackSourceEffect(Duration.WhileOnBattlefield), ExtraTurnCondition.instance); effect.setText("{this} can't attack during extra turns"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private MedomaiTheAgeless(final MedomaiTheAgeless card) { diff --git a/Mage.Sets/src/mage/cards/m/MegatronTyrant.java b/Mage.Sets/src/mage/cards/m/MegatronTyrant.java index 91ccb4d179f..967a92f1f22 100644 --- a/Mage.Sets/src/mage/cards/m/MegatronTyrant.java +++ b/Mage.Sets/src/mage/cards/m/MegatronTyrant.java @@ -38,7 +38,7 @@ public final class MegatronTyrant extends CardImpl { this.addAbility(new MoreThanMeetsTheEyeAbility(this, "{1}{R}{W}{B}")); // Your opponents can't cast spells during combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MegatronTyrantCantCastSpellsEffect())); + this.addAbility(new SimpleStaticAbility(new MegatronTyrantCantCastSpellsEffect())); // At the beginning of your postcombat main phase, you may convert Megatron. If you do, add {C} for each 1 life your opponents have lost this turn. TriggeredAbility trigger = new BeginningOfPostcombatMainTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/m/MeishinTheMindCage.java b/Mage.Sets/src/mage/cards/m/MeishinTheMindCage.java index 98887be80ee..2261a7e6a4b 100644 --- a/Mage.Sets/src/mage/cards/m/MeishinTheMindCage.java +++ b/Mage.Sets/src/mage/cards/m/MeishinTheMindCage.java @@ -26,7 +26,7 @@ public final class MeishinTheMindCage extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // All creatures get -X/-0, where X is the number of cards in your hand. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(new SignInversionDynamicValue(CardsInControllerHandCount.instance), StaticValue.get(0), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE, false, "All creatures get -X/-0, where X is the number of cards in your hand"))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(new SignInversionDynamicValue(CardsInControllerHandCount.instance), StaticValue.get(0), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE, false, "All creatures get -X/-0, where X is the number of cards in your hand"))); } private MeishinTheMindCage(final MeishinTheMindCage card) { diff --git a/Mage.Sets/src/mage/cards/m/Melancholy.java b/Mage.Sets/src/mage/cards/m/Melancholy.java index 52c170add89..aab5ec51763 100644 --- a/Mage.Sets/src/mage/cards/m/Melancholy.java +++ b/Mage.Sets/src/mage/cards/m/Melancholy.java @@ -37,7 +37,7 @@ public final class Melancholy extends CardImpl { // When Melancholy enters the battlefield, tap enchanted creature. this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); // At the beginning of your upkeep, sacrifice Melancholy unless you pay {B}. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{B}")) )); diff --git a/Mage.Sets/src/mage/cards/m/MelekIzzetParagon.java b/Mage.Sets/src/mage/cards/m/MelekIzzetParagon.java index 51395a1c26c..781464c7f1c 100644 --- a/Mage.Sets/src/mage/cards/m/MelekIzzetParagon.java +++ b/Mage.Sets/src/mage/cards/m/MelekIzzetParagon.java @@ -43,10 +43,10 @@ public final class MelekIzzetParagon extends CardImpl { this.toughness = new MageInt(4); // Play with the top card of your library revealed. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithTheTopCardRevealedEffect())); + this.addAbility(new SimpleStaticAbility(new PlayWithTheTopCardRevealedEffect())); // You may cast instant and sorcery spells from the top of your library. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayFromTopOfLibraryEffect(filter))); + this.addAbility(new SimpleStaticAbility(new PlayFromTopOfLibraryEffect(filter))); // Whenever you cast an instant or sorcery spell from your library, copy it. You may choose new targets for the copy. this.addAbility(new MelekIzzetParagonTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/m/MelekReforgedResearcher.java b/Mage.Sets/src/mage/cards/m/MelekReforgedResearcher.java index 6fde3c71897..abc9317c610 100644 --- a/Mage.Sets/src/mage/cards/m/MelekReforgedResearcher.java +++ b/Mage.Sets/src/mage/cards/m/MelekReforgedResearcher.java @@ -57,7 +57,7 @@ public final class MelekReforgedResearcher extends CardImpl { // The first instant or sorcery spell you cast each turn costs {3} less to cast. Effect effect = new SpellsCostReductionControllerEffect(filter, 3); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect), + this.addAbility(new SimpleStaticAbility(effect), new MelekReforgedResearcherWatcher()); } diff --git a/Mage.Sets/src/mage/cards/m/MeliraSylvokOutcast.java b/Mage.Sets/src/mage/cards/m/MeliraSylvokOutcast.java index 86c902f33c5..b2fae29c25f 100644 --- a/Mage.Sets/src/mage/cards/m/MeliraSylvokOutcast.java +++ b/Mage.Sets/src/mage/cards/m/MeliraSylvokOutcast.java @@ -33,13 +33,13 @@ public final class MeliraSylvokOutcast extends CardImpl { this.toughness = new MageInt(2); // You can't get poison counters. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MeliraSylvokOutcastEffect())); + this.addAbility(new SimpleStaticAbility(new MeliraSylvokOutcastEffect())); // Creatures you control can't have -1/-1 counters put on them. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MeliraSylvokOutcastEffect2())); + this.addAbility(new SimpleStaticAbility(new MeliraSylvokOutcastEffect2())); // Creatures your opponents control lose infect. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MeliraSylvokOutcastEffect3())); + this.addAbility(new SimpleStaticAbility(new MeliraSylvokOutcastEffect3())); } diff --git a/Mage.Sets/src/mage/cards/m/MelirasKeepers.java b/Mage.Sets/src/mage/cards/m/MelirasKeepers.java index 3f14992ba1b..9ad3be48776 100644 --- a/Mage.Sets/src/mage/cards/m/MelirasKeepers.java +++ b/Mage.Sets/src/mage/cards/m/MelirasKeepers.java @@ -26,7 +26,7 @@ public final class MelirasKeepers extends CardImpl { this.toughness = new MageInt(4); // Melira's Keepers can't have counters put on it - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantHaveCountersSourceEffect())); + this.addAbility(new SimpleStaticAbility(new CantHaveCountersSourceEffect())); } private MelirasKeepers(final MelirasKeepers card) { diff --git a/Mage.Sets/src/mage/cards/m/Melting.java b/Mage.Sets/src/mage/cards/m/Melting.java index 80ca0686085..d72ded8a51b 100644 --- a/Mage.Sets/src/mage/cards/m/Melting.java +++ b/Mage.Sets/src/mage/cards/m/Melting.java @@ -21,7 +21,7 @@ public final class Melting extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}"); // All lands are no longer snow. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MeltingEffect())); + this.addAbility(new SimpleStaticAbility(new MeltingEffect())); } private Melting(final Melting card) { diff --git a/Mage.Sets/src/mage/cards/m/MengHuoBarbarianKing.java b/Mage.Sets/src/mage/cards/m/MengHuoBarbarianKing.java index b2375fa4cf2..3661089c388 100644 --- a/Mage.Sets/src/mage/cards/m/MengHuoBarbarianKing.java +++ b/Mage.Sets/src/mage/cards/m/MengHuoBarbarianKing.java @@ -35,7 +35,7 @@ public final class MengHuoBarbarianKing extends CardImpl { this.toughness = new MageInt(4); // Other green creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterGreen, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterGreen, true))); } private MengHuoBarbarianKing(final MengHuoBarbarianKing card) { diff --git a/Mage.Sets/src/mage/cards/m/MephidrossVampire.java b/Mage.Sets/src/mage/cards/m/MephidrossVampire.java index 1bf077b9cfa..d803179525d 100644 --- a/Mage.Sets/src/mage/cards/m/MephidrossVampire.java +++ b/Mage.Sets/src/mage/cards/m/MephidrossVampire.java @@ -33,7 +33,7 @@ public final class MephidrossVampire extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Each creature you control is a Vampire in addition to its other creature types and has "Whenever this creature deals damage to a creature, put a +1/+1 counter on this creature." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MephidrossVampireEffect())); + this.addAbility(new SimpleStaticAbility(new MephidrossVampireEffect())); } diff --git a/Mage.Sets/src/mage/cards/m/MephiticOoze.java b/Mage.Sets/src/mage/cards/m/MephiticOoze.java index 9352a1052c3..3419261e220 100644 --- a/Mage.Sets/src/mage/cards/m/MephiticOoze.java +++ b/Mage.Sets/src/mage/cards/m/MephiticOoze.java @@ -31,7 +31,7 @@ public final class MephiticOoze extends CardImpl { // Mephitic Ooze gets +1/+0 for each artifact you control. Effect effect = new BoostSourceEffect(ArtifactYouControlCount.instance, StaticValue.get(0), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect).addHint(ArtifactYouControlHint.instance)); + this.addAbility(new SimpleStaticAbility(effect).addHint(ArtifactYouControlHint.instance)); // Whenever Mephitic Ooze deals combat damage to a creature, destroy that creature. The creature can't be regenerated. this.addAbility(new DealsCombatDamageToACreatureTriggeredAbility(new DestroyTargetEffect(true), false, true)); diff --git a/Mage.Sets/src/mage/cards/m/MercenaryInformer.java b/Mage.Sets/src/mage/cards/m/MercenaryInformer.java index bcdc06f5530..8293a54f2c2 100644 --- a/Mage.Sets/src/mage/cards/m/MercenaryInformer.java +++ b/Mage.Sets/src/mage/cards/m/MercenaryInformer.java @@ -47,7 +47,7 @@ public final class MercenaryInformer extends CardImpl { this.toughness = new MageInt(1); // Mercenary Informer can't be the target of black spells or abilities from black sources. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeTargetedSourceEffect(filterBlack, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CantBeTargetedSourceEffect(filterBlack, Duration.WhileOnBattlefield))); // {2}{W}: Put target nontoken Mercenary on the bottom of its owner's library. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(false), new ManaCostsImpl<>("{2}{W}")); diff --git a/Mage.Sets/src/mage/cards/m/MerchantShip.java b/Mage.Sets/src/mage/cards/m/MerchantShip.java index 238787f76dd..3bf67b2a234 100644 --- a/Mage.Sets/src/mage/cards/m/MerchantShip.java +++ b/Mage.Sets/src/mage/cards/m/MerchantShip.java @@ -30,7 +30,7 @@ public final class MerchantShip extends CardImpl { this.toughness = new MageInt(2); // Merchant Ship can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); // Whenever Merchant Ship attacks and isn't blocked, you gain 2 life. this.addAbility(new AttacksAndIsNotBlockedTriggeredAbility(new GainLifeEffect(2))); // When you control no Islands, sacrifice Merchant Ship. diff --git a/Mage.Sets/src/mage/cards/m/MerfolkMistbinder.java b/Mage.Sets/src/mage/cards/m/MerfolkMistbinder.java index 8ee8308a3c9..12cc8677fba 100644 --- a/Mage.Sets/src/mage/cards/m/MerfolkMistbinder.java +++ b/Mage.Sets/src/mage/cards/m/MerfolkMistbinder.java @@ -36,7 +36,7 @@ public final class MerfolkMistbinder extends CardImpl { this.toughness = new MageInt(2); // Other Merfolk you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); } private MerfolkMistbinder(final MerfolkMistbinder card) { diff --git a/Mage.Sets/src/mage/cards/m/MerfolkSovereign.java b/Mage.Sets/src/mage/cards/m/MerfolkSovereign.java index 188249c5bd5..dd6ded2f5f6 100644 --- a/Mage.Sets/src/mage/cards/m/MerfolkSovereign.java +++ b/Mage.Sets/src/mage/cards/m/MerfolkSovereign.java @@ -39,7 +39,7 @@ public final class MerfolkSovereign extends CardImpl { this.toughness = new MageInt(2); // Other Merfolk creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter1, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter1, true))); // {tap}: Target Merfolk creature can't be blocked this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/m/MeriekeRiBerit.java b/Mage.Sets/src/mage/cards/m/MeriekeRiBerit.java index 7bdc72cbd5d..346391f88f9 100644 --- a/Mage.Sets/src/mage/cards/m/MeriekeRiBerit.java +++ b/Mage.Sets/src/mage/cards/m/MeriekeRiBerit.java @@ -37,7 +37,7 @@ public final class MeriekeRiBerit extends CardImpl { this.toughness = new MageInt(1); // Merieke Ri Berit doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // {tap}: Gain control of target creature for as long as you control Merieke Ri Berit. When Merieke Ri Berit leaves the battlefield or becomes untapped, destroy that creature. It can't be regenerated. Ability ability = new SimpleActivatedAbility(new GainControlTargetEffect(Duration.WhileControlled), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/m/MerrowReejerey.java b/Mage.Sets/src/mage/cards/m/MerrowReejerey.java index c729be9312d..130b8a40d98 100644 --- a/Mage.Sets/src/mage/cards/m/MerrowReejerey.java +++ b/Mage.Sets/src/mage/cards/m/MerrowReejerey.java @@ -40,7 +40,7 @@ public final class MerrowReejerey extends CardImpl { this.toughness = new MageInt(2); // Other Merfolk creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter1, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter1, true))); // Whenever you cast a Merfolk spell, you may tap or untap target permanent. Ability ability = new SpellCastControllerTriggeredAbility(new MayTapOrUntapTargetEffect(), filter2, true); Target target = new TargetPermanent(); diff --git a/Mage.Sets/src/mage/cards/m/Merseine.java b/Mage.Sets/src/mage/cards/m/Merseine.java index 7e91ecb96d5..504e36fc3f1 100644 --- a/Mage.Sets/src/mage/cards/m/Merseine.java +++ b/Mage.Sets/src/mage/cards/m/Merseine.java @@ -47,7 +47,7 @@ public final class Merseine extends CardImpl { this.addAbility(new EntersBattlefieldAbility(effect)); // Enchanted creature doesn't untap during its controller's untap step if Merseine has a net counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousRuleModifyingEffect(new DontUntapInControllersUntapStepEnchantedEffect(), + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousRuleModifyingEffect(new DontUntapInControllersUntapStepEnchantedEffect(), new SourceHasCounterCondition(CounterType.NET)).setText("Enchanted creature doesn't untap during its controller's untap step if Merseine has a net counter on it"))); // Pay enchanted creature's mana cost: Remove a net counter from Merseine. Any player may activate this ability, but only if they control the enchanted creature. diff --git a/Mage.Sets/src/mage/cards/m/MetallicMimic.java b/Mage.Sets/src/mage/cards/m/MetallicMimic.java index c5f005afc92..f9041e595b1 100644 --- a/Mage.Sets/src/mage/cards/m/MetallicMimic.java +++ b/Mage.Sets/src/mage/cards/m/MetallicMimic.java @@ -37,10 +37,10 @@ public final class MetallicMimic extends CardImpl { // Metallic Mimic is the chosen type in addition to its other types. ability.addEffect(new EnterAttributeAddChosenSubtypeEffect()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AddChosenSubtypeEffect())); + this.addAbility(new SimpleStaticAbility(new AddChosenSubtypeEffect())); // Each other creature you control of the chosen type enters the battlefield with an additional +1/+1 counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MetallicMimicReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new MetallicMimicReplacementEffect())); } diff --git a/Mage.Sets/src/mage/cards/m/MetamorphicAlteration.java b/Mage.Sets/src/mage/cards/m/MetamorphicAlteration.java index 2d5c8df407e..35e5807c955 100644 --- a/Mage.Sets/src/mage/cards/m/MetamorphicAlteration.java +++ b/Mage.Sets/src/mage/cards/m/MetamorphicAlteration.java @@ -42,7 +42,7 @@ public final class MetamorphicAlteration extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseACreature())); // Enchanted creature is a copy of the chosen creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MetamorphicAlterationEffect())); + this.addAbility(new SimpleStaticAbility(new MetamorphicAlterationEffect())); } private MetamorphicAlteration(final MetamorphicAlteration card) { diff --git a/Mage.Sets/src/mage/cards/m/MetathranElite.java b/Mage.Sets/src/mage/cards/m/MetathranElite.java index 71c9c360655..ee1b819a504 100644 --- a/Mage.Sets/src/mage/cards/m/MetathranElite.java +++ b/Mage.Sets/src/mage/cards/m/MetathranElite.java @@ -32,7 +32,7 @@ public final class MetathranElite extends CardImpl { ConditionalRestrictionEffect effect = new ConditionalRestrictionEffect( new CantBeBlockedSourceEffect(), new EnchantedSourceCondition()); effect.setText(rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/m/MidnightCovenant.java b/Mage.Sets/src/mage/cards/m/MidnightCovenant.java index baa33f0275e..b98e1a84a0f 100644 --- a/Mage.Sets/src/mage/cards/m/MidnightCovenant.java +++ b/Mage.Sets/src/mage/cards/m/MidnightCovenant.java @@ -33,7 +33,7 @@ public final class MidnightCovenant extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature has "{B}: This creature gets +1/+1 until end of turn." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)), AttachmentType.AURA))); } private MidnightCovenant(final MidnightCovenant card) { diff --git a/Mage.Sets/src/mage/cards/m/MidnightEntourage.java b/Mage.Sets/src/mage/cards/m/MidnightEntourage.java index cd4a2409985..29f1031a942 100644 --- a/Mage.Sets/src/mage/cards/m/MidnightEntourage.java +++ b/Mage.Sets/src/mage/cards/m/MidnightEntourage.java @@ -36,7 +36,7 @@ public final class MidnightEntourage extends CardImpl { this.toughness = new MageInt(3); // Other Aetherborn you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); // Whenever Midnight Entourage or another Aetherborn you control dies, you draw a card and you lose 1 life. Ability ability = new DiesThisOrAnotherTriggeredAbility(new DrawCardSourceControllerEffect(1, true), false, filter); diff --git a/Mage.Sets/src/mage/cards/m/MightSliver.java b/Mage.Sets/src/mage/cards/m/MightSliver.java index 02e201f54ce..ba0912bb9f7 100644 --- a/Mage.Sets/src/mage/cards/m/MightSliver.java +++ b/Mage.Sets/src/mage/cards/m/MightSliver.java @@ -33,7 +33,7 @@ public final class MightSliver extends CardImpl { this.toughness = new MageInt(2); // All Sliver creatures get +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(2, 2, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(2, 2, Duration.WhileOnBattlefield, filter, false))); } private MightSliver(final MightSliver card) { diff --git a/Mage.Sets/src/mage/cards/m/MilitantInquisitor.java b/Mage.Sets/src/mage/cards/m/MilitantInquisitor.java index 45935bd45bb..3a342dad7b4 100644 --- a/Mage.Sets/src/mage/cards/m/MilitantInquisitor.java +++ b/Mage.Sets/src/mage/cards/m/MilitantInquisitor.java @@ -36,7 +36,7 @@ public final class MilitantInquisitor extends CardImpl { this.toughness = new MageInt(3); // Miltant Inquisitor gets +1/+0 for each Equipment you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), StaticValue.get(0), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), StaticValue.get(0), Duration.WhileOnBattlefield))); } private MilitantInquisitor(final MilitantInquisitor card) { diff --git a/Mage.Sets/src/mage/cards/m/MinaAndDennWildborn.java b/Mage.Sets/src/mage/cards/m/MinaAndDennWildborn.java index 976f7e0a66b..f907c1884e2 100644 --- a/Mage.Sets/src/mage/cards/m/MinaAndDennWildborn.java +++ b/Mage.Sets/src/mage/cards/m/MinaAndDennWildborn.java @@ -39,7 +39,7 @@ public final class MinaAndDennWildborn extends CardImpl { this.toughness = new MageInt(4); // You may play an additional land on each of your turns. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayAdditionalLandsControllerEffect(1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new PlayAdditionalLandsControllerEffect(1, Duration.WhileOnBattlefield))); // {R}{G}, Return a land you control to its owner's hand: Target creature gains trample until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}{G}")); diff --git a/Mage.Sets/src/mage/cards/m/MindControl.java b/Mage.Sets/src/mage/cards/m/MindControl.java index eb0eca3bc2a..9826ebc5135 100644 --- a/Mage.Sets/src/mage/cards/m/MindControl.java +++ b/Mage.Sets/src/mage/cards/m/MindControl.java @@ -35,7 +35,7 @@ public final class MindControl extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); } @@ -48,4 +48,3 @@ public final class MindControl extends CardImpl { return new MindControl(this); } } - diff --git a/Mage.Sets/src/mage/cards/m/MindHarness.java b/Mage.Sets/src/mage/cards/m/MindHarness.java index b9a73294e59..a9c354f0c41 100644 --- a/Mage.Sets/src/mage/cards/m/MindHarness.java +++ b/Mage.Sets/src/mage/cards/m/MindHarness.java @@ -49,7 +49,7 @@ public final class MindHarness extends CardImpl { this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}"))); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); } private MindHarness(final MindHarness card) { diff --git a/Mage.Sets/src/mage/cards/m/MindbenderSpores.java b/Mage.Sets/src/mage/cards/m/MindbenderSpores.java index 5285ec10bef..21bbaf9b217 100644 --- a/Mage.Sets/src/mage/cards/m/MindbenderSpores.java +++ b/Mage.Sets/src/mage/cards/m/MindbenderSpores.java @@ -44,7 +44,7 @@ public final class MindbenderSpores extends CardImpl { // and "At the beginning of your upkeep, remove a fungus counter from this creature." Ability ability = new BlocksCreatureTriggeredAbility(new AddCountersTargetEffect(CounterType.FUNGUS.createInstance(4))); - SimpleStaticAbility doesntUntapAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousRuleModifyingEffect( + SimpleStaticAbility doesntUntapAbility = new SimpleStaticAbility(new ConditionalContinuousRuleModifyingEffect( new DontUntapInControllersUntapStepSourceEffect(), new SourceHasCounterCondition(CounterType.FUNGUS)) .setText("{this} doesn't untap during your untap step if it has a fungus counter on it")); ability.addEffect(new GainAbilityTargetEffect(doesntUntapAbility, Duration.Custom) diff --git a/Mage.Sets/src/mage/cards/m/MindlashSliver.java b/Mage.Sets/src/mage/cards/m/MindlashSliver.java index 3b14b633026..aa4e1a1340d 100644 --- a/Mage.Sets/src/mage/cards/m/MindlashSliver.java +++ b/Mage.Sets/src/mage/cards/m/MindlashSliver.java @@ -39,7 +39,7 @@ public final class MindlashSliver extends CardImpl { // All Slivers have "{1}, Sacrifice this permanent: Each player discards a card." Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardEachPlayerEffect(),new GenericManaCost(1)); ability.addCost(new SacrificeSourceCost()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( ability, Duration.WhileOnBattlefield, filter, "All Slivers have \"{1}, Sacrifice this permanent: Each player discards a card.\""))); } diff --git a/Mage.Sets/src/mage/cards/m/MindlessNull.java b/Mage.Sets/src/mage/cards/m/MindlessNull.java index 15e2dd604e5..7072bdaff26 100644 --- a/Mage.Sets/src/mage/cards/m/MindlessNull.java +++ b/Mage.Sets/src/mage/cards/m/MindlessNull.java @@ -29,7 +29,7 @@ public final class MindlessNull extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockUnlessYouControlSourceEffect(filter))); + this.addAbility(new SimpleStaticAbility(new CantBlockUnlessYouControlSourceEffect(filter))); } private MindlessNull(final MindlessNull card) { diff --git a/Mage.Sets/src/mage/cards/m/MindlockOrb.java b/Mage.Sets/src/mage/cards/m/MindlockOrb.java index 043593aeb5f..d08980a85a6 100644 --- a/Mage.Sets/src/mage/cards/m/MindlockOrb.java +++ b/Mage.Sets/src/mage/cards/m/MindlockOrb.java @@ -26,7 +26,7 @@ public final class MindlockOrb extends CardImpl { // Players can't search libraries. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MindlockRuleModifyingEffect())); + this.addAbility(new SimpleStaticAbility(new MindlockRuleModifyingEffect())); } diff --git a/Mage.Sets/src/mage/cards/m/MindwrackLiege.java b/Mage.Sets/src/mage/cards/m/MindwrackLiege.java index 3dcdb086a48..30936273e72 100644 --- a/Mage.Sets/src/mage/cards/m/MindwrackLiege.java +++ b/Mage.Sets/src/mage/cards/m/MindwrackLiege.java @@ -48,10 +48,10 @@ public final class MindwrackLiege extends CardImpl { this.toughness = new MageInt(4); // Other blue creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); // Other red creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter2, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter2, true))); // {UR}{UR}{UR}{UR}: You may put a blue or red creature card from your hand onto the battlefield. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutCardFromHandOntoBattlefieldEffect(filter3), new ManaCostsImpl<>("{U/R}{U/R}{U/R}{U/R}"))); diff --git a/Mage.Sets/src/mage/cards/m/MineMineMine.java b/Mage.Sets/src/mage/cards/m/MineMineMine.java index ae286cf6275..12da0746793 100644 --- a/Mage.Sets/src/mage/cards/m/MineMineMine.java +++ b/Mage.Sets/src/mage/cards/m/MineMineMine.java @@ -40,10 +40,10 @@ public final class MineMineMine extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MaximumHandSizeControllerEffect(Integer.MAX_VALUE, Duration.WhileOnBattlefield, HandSizeModification.SET, TargetController.ANY) .setText("Players have no maximum hand size and don't lose the game for drawing from an empty library"))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MineMineMineDontLoseEffect())); + this.addAbility(new SimpleStaticAbility(new MineMineMineDontLoseEffect())); // Each player can't cast more than one spell each turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantCastMoreThanOneSpellEffect(TargetController.ANY))); + this.addAbility(new SimpleStaticAbility(new CantCastMoreThanOneSpellEffect(TargetController.ANY))); // When Mine, Mine, Mine leaves the battlefield, each player shuffles their hand and graveyard into their library. this.addAbility(new LeavesBattlefieldTriggeredAbility(new ShuffleHandGraveyardAllEffect(), false)); diff --git a/Mage.Sets/src/mage/cards/m/MinotaurTactician.java b/Mage.Sets/src/mage/cards/m/MinotaurTactician.java index ea22e8546f8..dc571ac9486 100644 --- a/Mage.Sets/src/mage/cards/m/MinotaurTactician.java +++ b/Mage.Sets/src/mage/cards/m/MinotaurTactician.java @@ -51,12 +51,12 @@ public final class MinotaurTactician extends CardImpl { // Minotaur Tactician gets +1/+1 as long as you control a white creature. Condition conditionWhite = new PermanentsOnTheBattlefieldCondition(filterWhite); Effect effectWhite = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), conditionWhite, ruleWhite); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effectWhite)); + this.addAbility(new SimpleStaticAbility(effectWhite)); // Minotaur Tactician gets +1/+1 as long as you control a blue creature. Condition conditionBlue = new PermanentsOnTheBattlefieldCondition(filterBlue); Effect effectBlue = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), conditionBlue, ruleBlue); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effectBlue)); + this.addAbility(new SimpleStaticAbility(effectBlue)); } private MinotaurTactician(final MinotaurTactician card) { diff --git a/Mage.Sets/src/mage/cards/m/MiragePhalanx.java b/Mage.Sets/src/mage/cards/m/MiragePhalanx.java index 5b958d7c16b..aa74aa821be 100644 --- a/Mage.Sets/src/mage/cards/m/MiragePhalanx.java +++ b/Mage.Sets/src/mage/cards/m/MiragePhalanx.java @@ -44,7 +44,7 @@ public class MiragePhalanx extends CardImpl { // except it has haste and loses soulbond. // Exile it at end of combat.” Ability ability = new BeginningOfCombatTriggeredAbility(new MiragePhalanxEffect()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(ability, ruleText))); + this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(ability, ruleText))); } private MiragePhalanx(final MiragePhalanx card) { diff --git a/Mage.Sets/src/mage/cards/m/MirarisWake.java b/Mage.Sets/src/mage/cards/m/MirarisWake.java index 2d41a642c9d..65dc7ed108d 100644 --- a/Mage.Sets/src/mage/cards/m/MirarisWake.java +++ b/Mage.Sets/src/mage/cards/m/MirarisWake.java @@ -24,7 +24,7 @@ public final class MirarisWake extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{G}{W}"); // Creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield))); // Whenever you tap a land for mana, add one mana of any type that land produced. AddManaOfAnyTypeProducedEffect effect = new AddManaOfAnyTypeProducedEffect(); diff --git a/Mage.Sets/src/mage/cards/m/MireKavu.java b/Mage.Sets/src/mage/cards/m/MireKavu.java index b596317b817..9f870af381d 100644 --- a/Mage.Sets/src/mage/cards/m/MireKavu.java +++ b/Mage.Sets/src/mage/cards/m/MireKavu.java @@ -31,7 +31,7 @@ public final class MireKavu extends CardImpl { this.toughness = new MageInt(2); // Mire Kavu gets +1/+1 as long as you control a Swamp. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceWhileControlsEffect(filter, 1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filter, 1, 1))); } private MireKavu(final MireKavu card) { diff --git a/Mage.Sets/src/mage/cards/m/MirriWeatherlightDuelist.java b/Mage.Sets/src/mage/cards/m/MirriWeatherlightDuelist.java index ec75b9288f6..352b57f7875 100644 --- a/Mage.Sets/src/mage/cards/m/MirriWeatherlightDuelist.java +++ b/Mage.Sets/src/mage/cards/m/MirriWeatherlightDuelist.java @@ -41,7 +41,7 @@ public final class MirriWeatherlightDuelist extends CardImpl { this.addAbility(new AttacksTriggeredAbility(new AddContinuousEffectToGame(new MirriWeatherlightDuelistBlockRestrictionEffect()), false)); // As long as Mirri, Weatherlight Duelist is tapped, no more than one creature can attack you each combat. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new ChangeMaxNumberThatCanAttackSourceEffect(1), SourceTappedCondition.TAPPED, "As long as {this} is tapped, no more than one creature can attack you each combat.")); this.addAbility(ability); @@ -100,4 +100,4 @@ class MirriWeatherlightDuelistBlockRestrictionEffect extends RestrictionEffect { } return true; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/m/MirrorGolem.java b/Mage.Sets/src/mage/cards/m/MirrorGolem.java index 0f172cc7318..731db559799 100644 --- a/Mage.Sets/src/mage/cards/m/MirrorGolem.java +++ b/Mage.Sets/src/mage/cards/m/MirrorGolem.java @@ -40,7 +40,7 @@ public final class MirrorGolem extends CardImpl { this.addAbility(ability); // Mirror Golem has protection from each of the exiled card's card types. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MirrorGolemEffect())); + this.addAbility(new SimpleStaticAbility(new MirrorGolemEffect())); } private MirrorGolem(final MirrorGolem card) { diff --git a/Mage.Sets/src/mage/cards/m/MistformWall.java b/Mage.Sets/src/mage/cards/m/MistformWall.java index adf3e40aa7e..d7c2110536e 100644 --- a/Mage.Sets/src/mage/cards/m/MistformWall.java +++ b/Mage.Sets/src/mage/cards/m/MistformWall.java @@ -33,7 +33,7 @@ public final class MistformWall extends CardImpl { this.toughness = new MageInt(4); // Mistform Wall has defender as long as it's a Wall. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilitySourceEffect(DefenderAbility.getInstance(), Duration.WhileOnBattlefield), new SourceHasSubtypeCondition(SubType.WALL), "{this} has defender as long as it's a Wall" diff --git a/Mage.Sets/src/mage/cards/m/MizzixOfTheIzmagnus.java b/Mage.Sets/src/mage/cards/m/MizzixOfTheIzmagnus.java index 6ff0f984bec..133c6724b9b 100644 --- a/Mage.Sets/src/mage/cards/m/MizzixOfTheIzmagnus.java +++ b/Mage.Sets/src/mage/cards/m/MizzixOfTheIzmagnus.java @@ -48,7 +48,7 @@ public final class MizzixOfTheIzmagnus extends CardImpl { ), filter, false)); // Instant and sorcery spells you cast cost {1} less to cast for each experience counter you have. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MizzixOfTheIzmagnusCostReductionEffect())); + this.addAbility(new SimpleStaticAbility(new MizzixOfTheIzmagnusCostReductionEffect())); } private MizzixOfTheIzmagnus(final MizzixOfTheIzmagnus card) { diff --git a/Mage.Sets/src/mage/cards/m/Moat.java b/Mage.Sets/src/mage/cards/m/Moat.java index 6263b56fe2b..4fedadb2da8 100644 --- a/Mage.Sets/src/mage/cards/m/Moat.java +++ b/Mage.Sets/src/mage/cards/m/Moat.java @@ -31,7 +31,7 @@ public final class Moat extends CardImpl { // Creatures without flying can't attack. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAllEffect(Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new CantAttackAllEffect(Duration.WhileOnBattlefield, filter))); } private Moat(final Moat card) { diff --git a/Mage.Sets/src/mage/cards/m/MobMentality.java b/Mage.Sets/src/mage/cards/m/MobMentality.java index d2cc8f0f697..676f89eab71 100644 --- a/Mage.Sets/src/mage/cards/m/MobMentality.java +++ b/Mage.Sets/src/mage/cards/m/MobMentality.java @@ -41,7 +41,7 @@ public final class MobMentality extends CardImpl { this.addAbility(ability); // Enchanted creature has trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA))); // Whenever all non-Wall creatures you control attack, enchanted creature gets +X/+0 until end of turn, where X is the number of attacking creatures. this.addAbility(new MobMentalityTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/m/Mobilization.java b/Mage.Sets/src/mage/cards/m/Mobilization.java index 65774b02edf..468af208f4a 100644 --- a/Mage.Sets/src/mage/cards/m/Mobilization.java +++ b/Mage.Sets/src/mage/cards/m/Mobilization.java @@ -32,7 +32,7 @@ public final class Mobilization extends CardImpl { public Mobilization(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SoldierToken(), 1), new ManaCostsImpl<>("{2}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/m/MoggConscripts.java b/Mage.Sets/src/mage/cards/m/MoggConscripts.java index 4d43f96772f..ee5b43c3917 100644 --- a/Mage.Sets/src/mage/cards/m/MoggConscripts.java +++ b/Mage.Sets/src/mage/cards/m/MoggConscripts.java @@ -29,7 +29,7 @@ public final class MoggConscripts extends CardImpl { this.toughness = new MageInt(2); // Mogg Conscripts can't attack unless you've cast a creature spell this turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MoggConscriptsEffect()), new PlayerCastCreatureWatcher()); + this.addAbility(new SimpleStaticAbility(new MoggConscriptsEffect()), new PlayerCastCreatureWatcher()); } private MoggConscripts(final MoggConscripts card) { diff --git a/Mage.Sets/src/mage/cards/m/MoggJailer.java b/Mage.Sets/src/mage/cards/m/MoggJailer.java index 7bc7b29fe23..455abd71cb0 100644 --- a/Mage.Sets/src/mage/cards/m/MoggJailer.java +++ b/Mage.Sets/src/mage/cards/m/MoggJailer.java @@ -37,7 +37,7 @@ public final class MoggJailer extends CardImpl { // Mogg Jailer can't attack if defending player controls an untapped creature with power 2 or less. Effect effect = new CantAttackIfDefenderControlsPermanent(filter); effect.setText("Mogg Jailer can't attack if defending player controls an untapped creature with power 2 or less."); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private MoggJailer(final MoggJailer card) { diff --git a/Mage.Sets/src/mage/cards/m/MoggSquad.java b/Mage.Sets/src/mage/cards/m/MoggSquad.java index 188a1176870..2eeaed0e6e7 100644 --- a/Mage.Sets/src/mage/cards/m/MoggSquad.java +++ b/Mage.Sets/src/mage/cards/m/MoggSquad.java @@ -39,7 +39,7 @@ public final class MoggSquad extends CardImpl { // Mogg Squad gets -1/-1 for each other creature on the battlefield. DynamicValue amount = new SignInversionDynamicValue(new PermanentsOnBattlefieldCount(filter)); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield)); + Ability ability = new SimpleStaticAbility(new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MoggToady.java b/Mage.Sets/src/mage/cards/m/MoggToady.java index 3a6371c12d5..5a7afdedee8 100644 --- a/Mage.Sets/src/mage/cards/m/MoggToady.java +++ b/Mage.Sets/src/mage/cards/m/MoggToady.java @@ -29,10 +29,10 @@ public final class MoggToady extends CardImpl { this.toughness = new MageInt(2); // Mogg Toady can't attack unless you control more creatures than defending player. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MoggToadyCantAttackEffect())); + this.addAbility(new SimpleStaticAbility(new MoggToadyCantAttackEffect())); // Mogg Toady can't block unless you control more creatures than attacking player. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MoggToadyCantBlockEffect())); + this.addAbility(new SimpleStaticAbility(new MoggToadyCantBlockEffect())); } private MoggToady(final MoggToady card) { diff --git a/Mage.Sets/src/mage/cards/m/MogissWarhound.java b/Mage.Sets/src/mage/cards/m/MogissWarhound.java index 91d04dc59f5..5240639d5bf 100644 --- a/Mage.Sets/src/mage/cards/m/MogissWarhound.java +++ b/Mage.Sets/src/mage/cards/m/MogissWarhound.java @@ -38,7 +38,7 @@ public final class MogissWarhound extends CardImpl { // Enchanted creature gets +2/+2 and attacks each turn if able. Effect effect = new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +2/+2"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new AttacksIfAbleAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.AURA); effect.setText("and attacks each combat if able"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/m/MoldervineCloak.java b/Mage.Sets/src/mage/cards/m/MoldervineCloak.java index 6681efbd7b4..0981f328a20 100644 --- a/Mage.Sets/src/mage/cards/m/MoldervineCloak.java +++ b/Mage.Sets/src/mage/cards/m/MoldervineCloak.java @@ -34,7 +34,7 @@ public final class MoldervineCloak extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +3/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); // Dredge 2 this.addAbility(new DredgeAbility(2)); } diff --git a/Mage.Sets/src/mage/cards/m/MoldgrafScavenger.java b/Mage.Sets/src/mage/cards/m/MoldgrafScavenger.java index 330d135460c..b6842794785 100644 --- a/Mage.Sets/src/mage/cards/m/MoldgrafScavenger.java +++ b/Mage.Sets/src/mage/cards/m/MoldgrafScavenger.java @@ -27,7 +27,7 @@ public final class MoldgrafScavenger extends CardImpl { this.toughness = new MageInt(4); // Delirium — Moldgraf Scavenger gets +3/+0 as long as there are four or more card types among cards in your graveyard. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(3, 0, Duration.WhileOnBattlefield), DeliriumCondition.instance, "Delirium — {this} gets +3/+0 as long as there are four or more card types among cards in your graveyard")) diff --git a/Mage.Sets/src/mage/cards/m/MoltingSnakeskin.java b/Mage.Sets/src/mage/cards/m/MoltingSnakeskin.java index 1afcbfd47c8..342a730e1de 100644 --- a/Mage.Sets/src/mage/cards/m/MoltingSnakeskin.java +++ b/Mage.Sets/src/mage/cards/m/MoltingSnakeskin.java @@ -41,7 +41,7 @@ public final class MoltingSnakeskin extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+0 and has "{2}{B}: Regenerate this creature." - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 0)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 0)); Effect effect = new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{B}")), AttachmentType.AURA); effect.setText("and has \"{2}{B}: Regenerate this creature.\""); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/m/Momentum.java b/Mage.Sets/src/mage/cards/m/Momentum.java index 98f197864d4..ce4010e725b 100644 --- a/Mage.Sets/src/mage/cards/m/Momentum.java +++ b/Mage.Sets/src/mage/cards/m/Momentum.java @@ -42,7 +42,7 @@ public final class Momentum extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.GROWTH.createInstance(), true), true)); // Enchanted creature gets +1/+1 for each growth counter on Momentum. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(new CountersSourceCount(CounterType.GROWTH), new CountersSourceCount(CounterType.GROWTH)))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(new CountersSourceCount(CounterType.GROWTH), new CountersSourceCount(CounterType.GROWTH)))); } private Momentum(final Momentum card) { diff --git a/Mage.Sets/src/mage/cards/m/MonasterySiege.java b/Mage.Sets/src/mage/cards/m/MonasterySiege.java index 31ad5df0908..ab0074437dd 100644 --- a/Mage.Sets/src/mage/cards/m/MonasterySiege.java +++ b/Mage.Sets/src/mage/cards/m/MonasterySiege.java @@ -41,7 +41,7 @@ public final class MonasterySiege extends CardImpl { "• Khans — At the beginning of your draw step, draw an additional card, then discard a card.")); // * Dragons - Spells your opponents cast that target you or a permanent you control cost {2} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MonasterySiegeCostIncreaseEffect())); + this.addAbility(new SimpleStaticAbility(new MonasterySiegeCostIncreaseEffect())); } private MonasterySiege(final MonasterySiege card) { diff --git a/Mage.Sets/src/mage/cards/m/MondrakGloryDominus.java b/Mage.Sets/src/mage/cards/m/MondrakGloryDominus.java index 73186cb514f..96851a099be 100644 --- a/Mage.Sets/src/mage/cards/m/MondrakGloryDominus.java +++ b/Mage.Sets/src/mage/cards/m/MondrakGloryDominus.java @@ -46,7 +46,7 @@ public final class MondrakGloryDominus extends CardImpl { this.toughness = new MageInt(4); // If an effect would create one or more tokens under your control, it creates twice that many of those tokens instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CreateTwiceThatManyTokensEffect())); + this.addAbility(new SimpleStaticAbility(new CreateTwiceThatManyTokensEffect())); // {1}{W/P}{W/P}, Sacrifice two other artifacts and/or creatures: Put an indestructible counter on Mondrak, Glory Dominus. Ability ability = new SimpleActivatedAbility( diff --git a/Mage.Sets/src/mage/cards/m/MonkeyMonkeyMonkey.java b/Mage.Sets/src/mage/cards/m/MonkeyMonkeyMonkey.java index 553c26ed393..488f47d4375 100644 --- a/Mage.Sets/src/mage/cards/m/MonkeyMonkeyMonkey.java +++ b/Mage.Sets/src/mage/cards/m/MonkeyMonkeyMonkey.java @@ -45,7 +45,7 @@ public final class MonkeyMonkeyMonkey extends CardImpl { // Monkey Monkey Monkey gets +1/+1 for each nonland permanent whose name begins with the chosen letter. MonkeyMonkeyMonkeyCount count = new MonkeyMonkeyMonkeyCount(); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/m/MoonsilverSpear.java b/Mage.Sets/src/mage/cards/m/MoonsilverSpear.java index 35f4424cd8e..4ae3a461a11 100644 --- a/Mage.Sets/src/mage/cards/m/MoonsilverSpear.java +++ b/Mage.Sets/src/mage/cards/m/MoonsilverSpear.java @@ -24,7 +24,7 @@ public final class MoonsilverSpear extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has first strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); // Whenever equipped creature attacks, create a 4/4 white Angel creature token with flying. this.addAbility(new AttacksAttachedTriggeredAbility(new CreateTokenEffect(new AngelToken()))); diff --git a/Mage.Sets/src/mage/cards/m/MoorlandDrifter.java b/Mage.Sets/src/mage/cards/m/MoorlandDrifter.java index 3ea588d0e4d..2ac12774623 100644 --- a/Mage.Sets/src/mage/cards/m/MoorlandDrifter.java +++ b/Mage.Sets/src/mage/cards/m/MoorlandDrifter.java @@ -28,7 +28,7 @@ public final class MoorlandDrifter extends CardImpl { // Delirium — Moorland Drifter has flying as long as there are four or more card types among cards in your graveyard. ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), DeliriumCondition.instance, "Delirium — Moorland Drifter has flying as long as there are four or more card types among cards in your graveyard."); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect).addHint(CardTypesInGraveyardHint.YOU)); + this.addAbility(new SimpleStaticAbility(effect).addHint(CardTypesInGraveyardHint.YOU)); } private MoorlandDrifter(final MoorlandDrifter card) { diff --git a/Mage.Sets/src/mage/cards/m/MortalObstinacy.java b/Mage.Sets/src/mage/cards/m/MortalObstinacy.java index b52929c1e9b..52a2565d93d 100644 --- a/Mage.Sets/src/mage/cards/m/MortalObstinacy.java +++ b/Mage.Sets/src/mage/cards/m/MortalObstinacy.java @@ -46,7 +46,7 @@ public final class MortalObstinacy extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1,1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1,1, Duration.WhileOnBattlefield))); // Whenever enchanted creature deals combat damage to a player, you may sacrifice Mortal Obstinacy. If you do, destroy target enchantment. this.addAbility(new MortalObstinacyAbility()); @@ -91,4 +91,3 @@ class MortalObstinacyAbility extends TriggeredAbilityImpl { return damageEvent.isCombatDamage() && damageMakingCreature != null && damageMakingCreature.getAttachments().contains(this.getSourceId()); } } - diff --git a/Mage.Sets/src/mage/cards/m/Mortarpod.java b/Mage.Sets/src/mage/cards/m/Mortarpod.java index 886cff471e4..2344a3902e7 100644 --- a/Mage.Sets/src/mage/cards/m/Mortarpod.java +++ b/Mage.Sets/src/mage/cards/m/Mortarpod.java @@ -36,7 +36,7 @@ public final class Mortarpod extends CardImpl { this.addAbility(new LivingWeaponAbility()); // Equipped creature gets +0/+1 and has "Sacrifice this creature: This creature deals 1 damage to any target." - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(0, 1)); + Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(0, 1)); SimpleActivatedAbility abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/m/MountainStronghold.java b/Mage.Sets/src/mage/cards/m/MountainStronghold.java index a02af4d88c8..96c206defe8 100644 --- a/Mage.Sets/src/mage/cards/m/MountainStronghold.java +++ b/Mage.Sets/src/mage/cards/m/MountainStronghold.java @@ -31,7 +31,7 @@ public final class MountainStronghold extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.LAND}, ""); // Red legendary creatures you control have "bands with other legendary creatures." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect( new BandsWithOtherAbility(SuperType.LEGENDARY), Duration.WhileOnBattlefield, filter) .withForceQuotes() )); diff --git a/Mage.Sets/src/mage/cards/m/Mourning.java b/Mage.Sets/src/mage/cards/m/Mourning.java index 51219e2464e..5e4b8de0111 100644 --- a/Mage.Sets/src/mage/cards/m/Mourning.java +++ b/Mage.Sets/src/mage/cards/m/Mourning.java @@ -34,7 +34,7 @@ public final class Mourning extends CardImpl { this.addAbility(ability); // Enchanted creature gets -2/-0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-2, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-2, 0))); // {B}: Return Mourning to its owner's hand. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{B}"))); diff --git a/Mage.Sets/src/mage/cards/m/MudbrawlerCohort.java b/Mage.Sets/src/mage/cards/m/MudbrawlerCohort.java index 43bbc351f89..a453cec7cf4 100644 --- a/Mage.Sets/src/mage/cards/m/MudbrawlerCohort.java +++ b/Mage.Sets/src/mage/cards/m/MudbrawlerCohort.java @@ -51,7 +51,7 @@ public final class MudbrawlerCohort extends CardImpl { // Mudbrawler Cohort gets +1/+1 as long as you control another red creature. Condition condition = new PermanentsOnTheBattlefieldCondition(filter); Effect effect = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), condition, rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private MudbrawlerCohort(final MudbrawlerCohort card) { diff --git a/Mage.Sets/src/mage/cards/m/MulDayaChannelers.java b/Mage.Sets/src/mage/cards/m/MulDayaChannelers.java index 6544b7ccbd7..2ad815a2701 100644 --- a/Mage.Sets/src/mage/cards/m/MulDayaChannelers.java +++ b/Mage.Sets/src/mage/cards/m/MulDayaChannelers.java @@ -38,18 +38,18 @@ public final class MulDayaChannelers extends CardImpl { this.toughness = new MageInt(2); // Play with the top card of your library revealed. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithTheTopCardRevealedEffect())); + this.addAbility(new SimpleStaticAbility(new PlayWithTheTopCardRevealedEffect())); // As long as the top card of your library is a creature card, Mul Daya Channelers gets +3/+3. ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostSourceEffect(3, 3, Duration.WhileOnBattlefield), new TopLibraryCardTypeCondition(CardType.CREATURE), rule1); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // As long as the top card of your library is a land card, Mul Daya Channelers has "T: Add two mana of any one color." SimpleManaAbility manaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(2), new TapSourceCost()); effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(manaAbility, Duration.WhileOnBattlefield), new TopLibraryCardTypeCondition(CardType.LAND), "As long as the top card of your library is a land card, Mul Daya Channelers has \"{T}: Add two mana of any one color.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/m/MuldrothaTheGravetide.java b/Mage.Sets/src/mage/cards/m/MuldrothaTheGravetide.java index 043ec2c4501..25a974f5b09 100644 --- a/Mage.Sets/src/mage/cards/m/MuldrothaTheGravetide.java +++ b/Mage.Sets/src/mage/cards/m/MuldrothaTheGravetide.java @@ -48,7 +48,7 @@ public final class MuldrothaTheGravetide extends CardImpl { this.toughness = new MageInt(6); // During each of your turns, you may play up to one permanent card of each permanent type from your graveyard. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MuldrothaTheGravetideCastFromGraveyardEffect()) + this.addAbility(new SimpleStaticAbility(new MuldrothaTheGravetideCastFromGraveyardEffect()) .setIdentifier(MageIdentifier.MuldrothaTheGravetideWatcher), new MuldrothaTheGravetideWatcher()); } diff --git a/Mage.Sets/src/mage/cards/m/MultanisHarmony.java b/Mage.Sets/src/mage/cards/m/MultanisHarmony.java index 42215041625..85a9ee70d94 100644 --- a/Mage.Sets/src/mage/cards/m/MultanisHarmony.java +++ b/Mage.Sets/src/mage/cards/m/MultanisHarmony.java @@ -37,7 +37,7 @@ public final class MultanisHarmony extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{T}: Add one mana of any color." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new AnyColorManaAbility(), + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(new AnyColorManaAbility(), AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{T}: Add one mana of any color.\""))); } diff --git a/Mage.Sets/src/mage/cards/m/MunghaWurm.java b/Mage.Sets/src/mage/cards/m/MunghaWurm.java index 809b7633093..a60da7bdb8c 100644 --- a/Mage.Sets/src/mage/cards/m/MunghaWurm.java +++ b/Mage.Sets/src/mage/cards/m/MunghaWurm.java @@ -32,7 +32,7 @@ public final class MunghaWurm extends CardImpl { this.toughness = new MageInt(5); // You can't untap more than one land during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MunghaWurmEffect())); + this.addAbility(new SimpleStaticAbility(new MunghaWurmEffect())); } private MunghaWurm(final MunghaWurm card) { diff --git a/Mage.Sets/src/mage/cards/m/MurderersAxe.java b/Mage.Sets/src/mage/cards/m/MurderersAxe.java index 8f38fd93707..5dc98fa364f 100644 --- a/Mage.Sets/src/mage/cards/m/MurderersAxe.java +++ b/Mage.Sets/src/mage/cards/m/MurderersAxe.java @@ -24,7 +24,7 @@ public final class MurderersAxe extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 2))); // Equip — Discard a card. this.addAbility(new EquipAbility(Outcome.AddAbility, new DiscardCardCost(), false)); diff --git a/Mage.Sets/src/mage/cards/m/MurkfiendLiege.java b/Mage.Sets/src/mage/cards/m/MurkfiendLiege.java index 27e6e1826dc..896124b7cb0 100644 --- a/Mage.Sets/src/mage/cards/m/MurkfiendLiege.java +++ b/Mage.Sets/src/mage/cards/m/MurkfiendLiege.java @@ -40,13 +40,13 @@ public final class MurkfiendLiege extends CardImpl { this.toughness = new MageInt(4); // Other green creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1,1, Duration.WhileOnBattlefield, filterGreen, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1,1, Duration.WhileOnBattlefield, filterGreen, true))); // Other blue creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1,1, Duration.WhileOnBattlefield, filterBlue, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1,1, Duration.WhileOnBattlefield, filterBlue, true))); // Untap all green and/or blue creatures you control during each other player's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new UntapAllDuringEachOtherPlayersUntapStepEffect(filter))); + this.addAbility(new SimpleStaticAbility(new UntapAllDuringEachOtherPlayersUntapStepEffect(filter))); } diff --git a/Mage.Sets/src/mage/cards/m/MuscleSliver.java b/Mage.Sets/src/mage/cards/m/MuscleSliver.java index 8872ba64f3b..c67f236ff09 100644 --- a/Mage.Sets/src/mage/cards/m/MuscleSliver.java +++ b/Mage.Sets/src/mage/cards/m/MuscleSliver.java @@ -32,7 +32,7 @@ public final class MuscleSliver extends CardImpl { this.toughness = new MageInt(1); // All Sliver creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); } private MuscleSliver(final MuscleSliver card) { diff --git a/Mage.Sets/src/mage/cards/m/Muzzle.java b/Mage.Sets/src/mage/cards/m/Muzzle.java index 2321caf2a6a..4be568b60ce 100644 --- a/Mage.Sets/src/mage/cards/m/Muzzle.java +++ b/Mage.Sets/src/mage/cards/m/Muzzle.java @@ -35,7 +35,7 @@ public final class Muzzle extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Prevent all damage that would be dealt by enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventAllDamageByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", false))); + this.addAbility(new SimpleStaticAbility(new PreventAllDamageByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", false))); } diff --git a/Mage.Sets/src/mage/cards/m/MycosynthFiend.java b/Mage.Sets/src/mage/cards/m/MycosynthFiend.java index e13007a36b0..525a97bfa7f 100644 --- a/Mage.Sets/src/mage/cards/m/MycosynthFiend.java +++ b/Mage.Sets/src/mage/cards/m/MycosynthFiend.java @@ -29,7 +29,7 @@ public final class MycosynthFiend extends CardImpl { this.toughness = new MageInt(2); DynamicValue value = OpponentsPoisonCountersCount.instance; - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(value, value, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(value, value, Duration.WhileOnBattlefield))); } private MycosynthFiend(final MycosynthFiend card) { diff --git a/Mage.Sets/src/mage/cards/m/MycosynthGolem.java b/Mage.Sets/src/mage/cards/m/MycosynthGolem.java index 233a5a05250..343f56d43a3 100644 --- a/Mage.Sets/src/mage/cards/m/MycosynthGolem.java +++ b/Mage.Sets/src/mage/cards/m/MycosynthGolem.java @@ -36,7 +36,7 @@ public final class MycosynthGolem extends CardImpl { this.addAbility(new AffinityForArtifactsAbility()); // Artifact creature spells you cast have affinity for artifacts. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledSpellsEffect(new AffinityForArtifactsAbility(), filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledSpellsEffect(new AffinityForArtifactsAbility(), filter))); } diff --git a/Mage.Sets/src/mage/cards/m/MycosynthLattice.java b/Mage.Sets/src/mage/cards/m/MycosynthLattice.java index 3b73e82ef3c..f9980c60f77 100644 --- a/Mage.Sets/src/mage/cards/m/MycosynthLattice.java +++ b/Mage.Sets/src/mage/cards/m/MycosynthLattice.java @@ -29,13 +29,13 @@ public final class MycosynthLattice extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{6}"); // All permanents are artifacts in addition to their other types. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PermanentsAreArtifactsEffect())); + this.addAbility(new SimpleStaticAbility(new PermanentsAreArtifactsEffect())); // All cards that aren't on the battlefield, spells, and permanents are colorless. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EverythingIsColorlessEffect())); + this.addAbility(new SimpleStaticAbility(new EverythingIsColorlessEffect())); // Players may spend mana as though it were mana of any color. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ManaCanBeSpentAsAnyColorEffect()); + Ability ability = new SimpleStaticAbility(new ManaCanBeSpentAsAnyColorEffect()); ability.addHint(new StaticHint("(XMage hint: You can use floating mana by clicking on the related symbol of the needed mana type in your mana pool player area.)")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MyojinOfCleansingFire.java b/Mage.Sets/src/mage/cards/m/MyojinOfCleansingFire.java index 5592bfee97b..4b726e19de2 100644 --- a/Mage.Sets/src/mage/cards/m/MyojinOfCleansingFire.java +++ b/Mage.Sets/src/mage/cards/m/MyojinOfCleansingFire.java @@ -50,7 +50,7 @@ public final class MyojinOfCleansingFire extends CardImpl { // Myojin of Cleansing Fire enters the battlefield with a divinity counter on it if you cast it from your hand. this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.DIVINITY.createInstance()), CastFromHandSourcePermanentCondition.instance, ""), "with a divinity counter on it if you cast it from your hand")); // Myojin of Cleansing Fire has indestructible as long as it has a divinity counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), new SourceHasCounterCondition(CounterType.DIVINITY), "{this} has indestructible as long as it has a divinity counter on it"))); // Remove a divinity counter from Myojin of Cleansing Fire: Destroy all other creatures. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyAllEffect(filter), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance()))); diff --git a/Mage.Sets/src/mage/cards/m/MyojinOfInfiniteRage.java b/Mage.Sets/src/mage/cards/m/MyojinOfInfiniteRage.java index 0d357802861..2e27b5c0ed7 100644 --- a/Mage.Sets/src/mage/cards/m/MyojinOfInfiniteRage.java +++ b/Mage.Sets/src/mage/cards/m/MyojinOfInfiniteRage.java @@ -44,7 +44,7 @@ public final class MyojinOfInfiniteRage extends CardImpl { // Myojin of Infinite Rage enters the battlefield with a divinity counter on it if you cast it from your hand. this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.DIVINITY.createInstance()), CastFromHandSourcePermanentCondition.instance, ""), "with a divinity counter on it if you cast it from your hand")); // Myojin of Infinite Rage has indestructible as long as it has a divinity counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), new SourceHasCounterCondition(CounterType.DIVINITY), "{this} has indestructible as long as it has a divinity counter on it"))); // Remove a divinity counter from Myojin of Infinite Rage: Destroy all lands. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyAllEffect(StaticFilters.FILTER_LANDS), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance()))); diff --git a/Mage.Sets/src/mage/cards/m/MyojinOfNightsReach.java b/Mage.Sets/src/mage/cards/m/MyojinOfNightsReach.java index 72d5f81c22e..3949c5c80c2 100644 --- a/Mage.Sets/src/mage/cards/m/MyojinOfNightsReach.java +++ b/Mage.Sets/src/mage/cards/m/MyojinOfNightsReach.java @@ -42,7 +42,7 @@ public final class MyojinOfNightsReach extends CardImpl { // Myojin of Night's Reach enters the battlefield with a divinity counter on it if you cast it from your hand. this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.DIVINITY.createInstance()), CastFromHandSourcePermanentCondition.instance, ""), "with a divinity counter on it if you cast it from your hand")); // Myojin of Night's Reach has indestructible as long as it has a divinity counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), new SourceHasCounterCondition(CounterType.DIVINITY), "{this} has indestructible as long as it has a divinity counter on it"))); // Remove a divinity counter from Myojin of Night's Reach: Each opponent discards their hand. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MyojinOfNightsReachEffect(), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance())); diff --git a/Mage.Sets/src/mage/cards/m/MyojinOfSeeingWinds.java b/Mage.Sets/src/mage/cards/m/MyojinOfSeeingWinds.java index 050b50bb2eb..15f45e0210d 100644 --- a/Mage.Sets/src/mage/cards/m/MyojinOfSeeingWinds.java +++ b/Mage.Sets/src/mage/cards/m/MyojinOfSeeingWinds.java @@ -47,7 +47,7 @@ public final class MyojinOfSeeingWinds extends CardImpl { // Myojin of Seeing Winds enters the battlefield with a divinity counter on it if you cast it from your hand. this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new AddCountersSourceEffect(CounterType.DIVINITY.createInstance()), CastFromHandSourcePermanentCondition.instance, ""), "with a divinity counter on it if you cast it from your hand")); // Myojin of Seeing Winds has indestructible as long as it has a divinity counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), new SourceHasCounterCondition(CounterType.DIVINITY), "{this} has indestructible as long as it has a divinity counter on it"))); // Remove a divinity counter from Myojin of Seeing Winds: Draw a card for each permanent you control. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(new PermanentsOnBattlefieldCount(filter)), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance())); diff --git a/Mage.Sets/src/mage/cards/m/MyrAdapter.java b/Mage.Sets/src/mage/cards/m/MyrAdapter.java index 4446cd9baca..74e1872e563 100644 --- a/Mage.Sets/src/mage/cards/m/MyrAdapter.java +++ b/Mage.Sets/src/mage/cards/m/MyrAdapter.java @@ -28,7 +28,7 @@ public final class MyrAdapter extends CardImpl { // Myr Adapter gets +1/+1 for each Equipment attached to it. EquipmentAttachedCount amount = new EquipmentAttachedCount(); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield))); } private MyrAdapter(final MyrAdapter card) { diff --git a/Mage.Sets/src/mage/cards/m/MyrMatrix.java b/Mage.Sets/src/mage/cards/m/MyrMatrix.java index d1d7b106a57..b51b04913d3 100644 --- a/Mage.Sets/src/mage/cards/m/MyrMatrix.java +++ b/Mage.Sets/src/mage/cards/m/MyrMatrix.java @@ -33,7 +33,7 @@ public final class MyrMatrix extends CardImpl { public MyrMatrix (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); this.addAbility(IndestructibleAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new MyrToken()), new GenericManaCost(5))); } diff --git a/Mage.Sets/src/mage/cards/m/MyrPrototype.java b/Mage.Sets/src/mage/cards/m/MyrPrototype.java index 876fe944317..068124baae6 100644 --- a/Mage.Sets/src/mage/cards/m/MyrPrototype.java +++ b/Mage.Sets/src/mage/cards/m/MyrPrototype.java @@ -36,7 +36,7 @@ public final class MyrPrototype extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()))); // Myr Prototype can't attack or block unless you pay {1} for each +1/+1 counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MyrPrototypeCantAttackUnlessYouPayEffect())); + this.addAbility(new SimpleStaticAbility(new MyrPrototypeCantAttackUnlessYouPayEffect())); } private MyrPrototype(final MyrPrototype card) { diff --git a/Mage.Sets/src/mage/cards/m/MyrWelder.java b/Mage.Sets/src/mage/cards/m/MyrWelder.java index 802256bcd18..c48b3c2bb69 100644 --- a/Mage.Sets/src/mage/cards/m/MyrWelder.java +++ b/Mage.Sets/src/mage/cards/m/MyrWelder.java @@ -37,7 +37,7 @@ public final class MyrWelder extends CardImpl { this.addAbility(ability.setAbilityWord(AbilityWord.IMPRINT)); // Myr Welder has all activated abilities of all cards exiled with it - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MyrWelderContinuousEffect())); + this.addAbility(new SimpleStaticAbility(new MyrWelderContinuousEffect())); } diff --git a/Mage.Sets/src/mage/cards/m/MysticMight.java b/Mage.Sets/src/mage/cards/m/MysticMight.java index c7de6548bc0..ad13a0a720e 100644 --- a/Mage.Sets/src/mage/cards/m/MysticMight.java +++ b/Mage.Sets/src/mage/cards/m/MysticMight.java @@ -45,7 +45,7 @@ public final class MysticMight extends CardImpl { // Enchanted land has "{tap}: Target creature gets +2/+2 until end of turn." Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new TapSourceCost()); gainAbility.addTarget(new TargetCreaturePermanent()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{T}: Target creature gets +2/+2 until end of turn.\""))); } diff --git a/Mage.Sets/src/mage/cards/m/MysticPenitent.java b/Mage.Sets/src/mage/cards/m/MysticPenitent.java index 37e88f8b6ac..76fd5d2b364 100644 --- a/Mage.Sets/src/mage/cards/m/MysticPenitent.java +++ b/Mage.Sets/src/mage/cards/m/MysticPenitent.java @@ -33,7 +33,7 @@ public final class MysticPenitent extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Threshold - As long as seven or more cards are in your graveyard, Mystic Penitent gets +1/+1 and has flying. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), ThresholdCondition.instance, "As long as seven or more cards are in your graveyard, {this} gets +1/+1" )); diff --git a/Mage.Sets/src/mage/cards/m/MysticRestraints.java b/Mage.Sets/src/mage/cards/m/MysticRestraints.java index 9ca463218d5..27da7a1efe6 100644 --- a/Mage.Sets/src/mage/cards/m/MysticRestraints.java +++ b/Mage.Sets/src/mage/cards/m/MysticRestraints.java @@ -38,7 +38,7 @@ public final class MysticRestraints extends CardImpl { // When Mystic Restraints enters the battlefield, tap enchanted creature. this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); } private MysticRestraints(final MysticRestraints card) { diff --git a/Mage.Sets/src/mage/cards/m/MysticVeil.java b/Mage.Sets/src/mage/cards/m/MysticVeil.java index ba4d6e2ae31..eb974ddf57c 100644 --- a/Mage.Sets/src/mage/cards/m/MysticVeil.java +++ b/Mage.Sets/src/mage/cards/m/MysticVeil.java @@ -42,7 +42,7 @@ public final class MysticVeil extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has shroud. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA))); } private MysticVeil(final MysticVeil card) { diff --git a/Mage.Sets/src/mage/cards/m/MythicProportions.java b/Mage.Sets/src/mage/cards/m/MythicProportions.java index 66e5dcdd8b3..d1365e6cb7e 100644 --- a/Mage.Sets/src/mage/cards/m/MythicProportions.java +++ b/Mage.Sets/src/mage/cards/m/MythicProportions.java @@ -38,7 +38,7 @@ public final class MythicProportions extends CardImpl { this.addAbility(ability); // Enchanted creature gets +8/+8 and has trample. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(8, 8)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(8, 8)); Effect effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA); effect.setText("and has trample"); ability.addEffect(effect);