From 39512d75ac1350fb427fcd16deadcaf1cc0626e0 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:18:19 -0500 Subject: [PATCH] refactor: SimpleStaticAbility default zone (before newline) --- Mage.Sets/src/mage/cards/a/AbzanKinGuard.java | 2 +- Mage.Sets/src/mage/cards/a/AbzanRunemark.java | 2 +- Mage.Sets/src/mage/cards/a/AccursedWitch.java | 2 +- Mage.Sets/src/mage/cards/a/AcidicSliver.java | 2 +- Mage.Sets/src/mage/cards/a/AeronautAdmiral.java | 2 +- Mage.Sets/src/mage/cards/a/AinokArtillerist.java | 2 +- Mage.Sets/src/mage/cards/a/AlabasterLeech.java | 2 +- Mage.Sets/src/mage/cards/a/AllosaurusShepherd.java | 2 +- Mage.Sets/src/mage/cards/a/AndraditeLeech.java | 2 +- Mage.Sets/src/mage/cards/a/AngrathsAmbusher.java | 2 +- Mage.Sets/src/mage/cards/a/ArcaneMelee.java | 2 +- Mage.Sets/src/mage/cards/a/ArtifactWard.java | 2 +- Mage.Sets/src/mage/cards/a/Asceticism.java | 2 +- Mage.Sets/src/mage/cards/b/BatteringSliver.java | 2 +- Mage.Sets/src/mage/cards/b/BattleBrawler.java | 2 +- Mage.Sets/src/mage/cards/b/BehindTheScenes.java | 2 +- Mage.Sets/src/mage/cards/b/BladeSliver.java | 2 +- Mage.Sets/src/mage/cards/b/BlindSpotGiant.java | 2 +- Mage.Sets/src/mage/cards/b/BloodCursedKnight.java | 2 +- Mage.Sets/src/mage/cards/b/BloodfireEnforcers.java | 4 ++-- Mage.Sets/src/mage/cards/b/BloodshedFever.java | 2 +- Mage.Sets/src/mage/cards/b/BonescytheSliver.java | 2 +- Mage.Sets/src/mage/cards/b/BonesplitterSliver.java | 2 +- Mage.Sets/src/mage/cards/b/BorealElemental.java | 2 +- Mage.Sets/src/mage/cards/b/Burrowing.java | 2 +- Mage.Sets/src/mage/cards/b/ButchersCleaver.java | 2 +- Mage.Sets/src/mage/cards/c/CallapheBelovedOfTheSea.java | 2 +- Mage.Sets/src/mage/cards/c/CamelliaTheSeedmiser.java | 2 +- Mage.Sets/src/mage/cards/c/ChampionOfTheFlame.java | 2 +- Mage.Sets/src/mage/cards/c/CloudKey.java | 2 +- Mage.Sets/src/mage/cards/c/ClutchOfUndeath.java | 2 +- Mage.Sets/src/mage/cards/c/ConcordantCrossroads.java | 2 +- Mage.Sets/src/mage/cards/c/ConstrictingSliver.java | 2 +- Mage.Sets/src/mage/cards/c/CorruptedZendikon.java | 2 +- Mage.Sets/src/mage/cards/c/CourtHomunculus.java | 4 ++-- Mage.Sets/src/mage/cards/c/CuratorsWard.java | 2 +- Mage.Sets/src/mage/cards/d/DarkheartSliver.java | 2 +- Mage.Sets/src/mage/cards/d/DarksteelMutation.java | 2 +- Mage.Sets/src/mage/cards/d/DarksteelPlate.java | 2 +- Mage.Sets/src/mage/cards/d/DeadeyePlunderers.java | 2 +- Mage.Sets/src/mage/cards/d/DeathcapCultivator.java | 2 +- Mage.Sets/src/mage/cards/d/DeepFreeze.java | 2 +- Mage.Sets/src/mage/cards/d/DementiaSliver.java | 2 +- Mage.Sets/src/mage/cards/d/DireWolves.java | 2 +- Mage.Sets/src/mage/cards/d/DivinityOfPride.java | 2 +- Mage.Sets/src/mage/cards/d/DonAndresTheRenegade.java | 2 +- Mage.Sets/src/mage/cards/d/DormantSliver.java | 4 ++-- Mage.Sets/src/mage/cards/d/DragonlordKolaghan.java | 2 +- Mage.Sets/src/mage/cards/d/DrillSkimmer.java | 2 +- Mage.Sets/src/mage/cards/d/DryadsFavor.java | 2 +- Mage.Sets/src/mage/cards/e/ElderwoodScion.java | 4 ++-- Mage.Sets/src/mage/cards/e/EmblemOfTheWarmind.java | 2 +- Mage.Sets/src/mage/cards/e/Entangler.java | 2 +- Mage.Sets/src/mage/cards/e/EtchedChampion.java | 2 +- Mage.Sets/src/mage/cards/e/Exploration.java | 2 +- Mage.Sets/src/mage/cards/f/FavorableDestiny.java | 4 ++-- Mage.Sets/src/mage/cards/f/FenStalker.java | 2 +- Mage.Sets/src/mage/cards/f/FowlPlay.java | 2 +- Mage.Sets/src/mage/cards/f/FreewindEquenaut.java | 2 +- Mage.Sets/src/mage/cards/f/FreneticSliver.java | 2 +- Mage.Sets/src/mage/cards/f/FurySliver.java | 2 +- Mage.Sets/src/mage/cards/g/GarnaTheBloodflame.java | 2 +- Mage.Sets/src/mage/cards/g/GateHound.java | 2 +- Mage.Sets/src/mage/cards/g/GeistFueledScarecrow.java | 2 +- Mage.Sets/src/mage/cards/g/GemhideSliver.java | 2 +- Mage.Sets/src/mage/cards/g/GhastlordOfFugue.java | 2 +- Mage.Sets/src/mage/cards/g/GnatMiser.java | 2 +- Mage.Sets/src/mage/cards/g/GohamDjinn.java | 2 +- Mage.Sets/src/mage/cards/g/GraniteGrip.java | 2 +- Mage.Sets/src/mage/cards/g/GunnerConscript.java | 2 +- Mage.Sets/src/mage/cards/h/HalamDjinn.java | 2 +- Mage.Sets/src/mage/cards/h/HammerOfPurphoros.java | 2 +- Mage.Sets/src/mage/cards/h/HazoretTheFervent.java | 2 +- Mage.Sets/src/mage/cards/h/HeadstrongBrute.java | 2 +- Mage.Sets/src/mage/cards/h/HeraldsHorn.java | 2 +- Mage.Sets/src/mage/cards/h/HeroicDefiance.java | 2 +- Mage.Sets/src/mage/cards/h/HibernationSliver.java | 2 +- Mage.Sets/src/mage/cards/h/HiddenPath.java | 2 +- Mage.Sets/src/mage/cards/h/HoldTheGates.java | 2 +- Mage.Sets/src/mage/cards/h/Humility.java | 2 +- Mage.Sets/src/mage/cards/i/ImperialLancer.java | 2 +- Mage.Sets/src/mage/cards/i/InBolassClutches.java | 2 +- Mage.Sets/src/mage/cards/i/IncendiaryOracle.java | 2 +- Mage.Sets/src/mage/cards/i/InnerSanctum.java | 2 +- Mage.Sets/src/mage/cards/i/InventorsApprentice.java | 2 +- Mage.Sets/src/mage/cards/i/Invisibility.java | 2 +- Mage.Sets/src/mage/cards/i/IriniSengir.java | 2 +- Mage.Sets/src/mage/cards/i/IvorytuskFortress.java | 2 +- Mage.Sets/src/mage/cards/j/JadeLeech.java | 2 +- Mage.Sets/src/mage/cards/j/JeskaiRunemark.java | 2 +- Mage.Sets/src/mage/cards/j/JhoirasFamiliar.java | 2 +- Mage.Sets/src/mage/cards/j/JinGitaxiasCoreAugur.java | 2 +- Mage.Sets/src/mage/cards/j/JoragaTreespeaker.java | 2 +- Mage.Sets/src/mage/cards/j/JorubaiMurkLurker.java | 2 +- Mage.Sets/src/mage/cards/j/JubilantSkybonder.java | 2 +- Mage.Sets/src/mage/cards/k/KavuRunner.java | 2 +- Mage.Sets/src/mage/cards/k/KessDissidentMage.java | 2 +- Mage.Sets/src/mage/cards/k/KessigDireSwine.java | 2 +- Mage.Sets/src/mage/cards/k/KirdApe.java | 2 +- Mage.Sets/src/mage/cards/k/KirdChieftain.java | 2 +- Mage.Sets/src/mage/cards/l/Lignify.java | 2 +- Mage.Sets/src/mage/cards/l/LoamLion.java | 2 +- Mage.Sets/src/mage/cards/l/LocustMiser.java | 2 +- Mage.Sets/src/mage/cards/l/LootExuberantExplorer.java | 2 +- Mage.Sets/src/mage/cards/l/LustForWar.java | 2 +- Mage.Sets/src/mage/cards/m/MaelstromWanderer.java | 2 +- Mage.Sets/src/mage/cards/m/MagmaSliver.java | 2 +- Mage.Sets/src/mage/cards/m/MarchesaTheBlackRose.java | 2 +- Mage.Sets/src/mage/cards/m/MarduRunemark.java | 2 +- Mage.Sets/src/mage/cards/m/MesmericSliver.java | 2 +- Mage.Sets/src/mage/cards/m/MinamoScrollkeeper.java | 2 +- Mage.Sets/src/mage/cards/m/MindwhipSliver.java | 2 +- Mage.Sets/src/mage/cards/m/MineMineMine.java | 2 +- Mage.Sets/src/mage/cards/m/MudTrooper.java | 2 +- Mage.Sets/src/mage/cards/m/MultaniYavimayasAvatar.java | 2 +- Mage.Sets/src/mage/cards/m/MyojinOfLifesWeb.java | 2 +- Mage.Sets/src/mage/cards/m/MyrGalvanizer.java | 2 +- Mage.Sets/src/mage/cards/n/NecroticSliver.java | 2 +- Mage.Sets/src/mage/cards/n/NemesisMask.java | 2 +- Mage.Sets/src/mage/cards/n/NimDevourer.java | 2 +- Mage.Sets/src/mage/cards/n/NimGrotesque.java | 2 +- Mage.Sets/src/mage/cards/n/NullProfusion.java | 2 +- Mage.Sets/src/mage/cards/p/ParadiseMantle.java | 2 +- Mage.Sets/src/mage/cards/p/PollenbrightWings.java | 2 +- Mage.Sets/src/mage/cards/p/PoulticeSliver.java | 2 +- Mage.Sets/src/mage/cards/p/PredatorySliver.java | 2 +- Mage.Sets/src/mage/cards/p/PristineAngel.java | 2 +- Mage.Sets/src/mage/cards/p/PrizedElephant.java | 2 +- Mage.Sets/src/mage/cards/p/ProwlersHelm.java | 2 +- Mage.Sets/src/mage/cards/p/PterodonKnight.java | 2 +- Mage.Sets/src/mage/cards/q/QuicksilverDagger.java | 2 +- Mage.Sets/src/mage/cards/q/QuilledSliver.java | 2 +- Mage.Sets/src/mage/cards/r/RadiantEssence.java | 2 +- Mage.Sets/src/mage/cards/r/RaffCapashenShipsMage.java | 2 +- Mage.Sets/src/mage/cards/r/Rageform.java | 2 +- Mage.Sets/src/mage/cards/r/RampagingCyclops.java | 2 +- Mage.Sets/src/mage/cards/r/RangeTrooper.java | 2 +- Mage.Sets/src/mage/cards/r/RatColony.java | 2 +- Mage.Sets/src/mage/cards/r/RegisaurAlpha.java | 2 +- Mage.Sets/src/mage/cards/r/RelicRunner.java | 2 +- Mage.Sets/src/mage/cards/r/Retaliation.java | 2 +- Mage.Sets/src/mage/cards/r/RiotTrooper.java | 2 +- Mage.Sets/src/mage/cards/r/RoshanHiddenMagister.java | 2 +- Mage.Sets/src/mage/cards/r/RubyLeech.java | 2 +- Mage.Sets/src/mage/cards/r/RuhamDjinn.java | 2 +- Mage.Sets/src/mage/cards/r/RuneTailKitsuneAscendant.java | 2 +- Mage.Sets/src/mage/cards/r/RustedRelic.java | 2 +- Mage.Sets/src/mage/cards/r/RuthlessCullblade.java | 2 +- Mage.Sets/src/mage/cards/s/SapphireLeech.java | 2 +- Mage.Sets/src/mage/cards/s/ScoriaCat.java | 2 +- Mage.Sets/src/mage/cards/s/ScreechingSliver.java | 2 +- Mage.Sets/src/mage/cards/s/SeaLegs.java | 2 +- Mage.Sets/src/mage/cards/s/SedgeSliver.java | 4 ++-- Mage.Sets/src/mage/cards/s/ShadowfaxLordOfHorses.java | 4 ++-- Mage.Sets/src/mage/cards/s/ShaperApprentice.java | 2 +- Mage.Sets/src/mage/cards/s/ShieldOfTheRealm.java | 2 +- Mage.Sets/src/mage/cards/s/ShieldingPlax.java | 2 +- Mage.Sets/src/mage/cards/s/Shimmer.java | 2 +- Mage.Sets/src/mage/cards/s/SidewinderSliver.java | 2 +- Mage.Sets/src/mage/cards/s/SkinInvasion.java | 2 +- Mage.Sets/src/mage/cards/s/SkittishKavu.java | 2 +- Mage.Sets/src/mage/cards/s/SkyriderTrainee.java | 2 +- Mage.Sets/src/mage/cards/s/SnakeCultInitiation.java | 2 +- Mage.Sets/src/mage/cards/s/SnowTrooper.java | 2 +- Mage.Sets/src/mage/cards/s/SpellbaneCentaur.java | 2 +- Mage.Sets/src/mage/cards/s/SpellwildOuphe.java | 4 ++-- Mage.Sets/src/mage/cards/s/SphereOfResistance.java | 2 +- Mage.Sets/src/mage/cards/s/SphinxOfNewPrahv.java | 2 +- Mage.Sets/src/mage/cards/s/SpidersilkArmor.java | 2 +- Mage.Sets/src/mage/cards/s/SpittingSliver.java | 2 +- Mage.Sets/src/mage/cards/s/SpurGrappler.java | 2 +- Mage.Sets/src/mage/cards/s/Squeeze.java | 2 +- Mage.Sets/src/mage/cards/s/SteelformSliver.java | 2 +- Mage.Sets/src/mage/cards/s/StennParanoidPartisan.java | 2 +- Mage.Sets/src/mage/cards/s/StrikingSliver.java | 2 +- Mage.Sets/src/mage/cards/s/SublimeArchangel.java | 2 +- Mage.Sets/src/mage/cards/s/SulamDjinn.java | 2 +- Mage.Sets/src/mage/cards/s/SultaiRunemark.java | 2 +- Mage.Sets/src/mage/cards/s/SummitApes.java | 2 +- Mage.Sets/src/mage/cards/s/Sunforger.java | 2 +- Mage.Sets/src/mage/cards/s/SurrakDragonclaw.java | 2 +- Mage.Sets/src/mage/cards/s/SynchronousSliver.java | 2 +- Mage.Sets/src/mage/cards/s/SyrElenoraTheDiscerning.java | 2 +- Mage.Sets/src/mage/cards/t/TalonsOfFalkenrath.java | 2 +- Mage.Sets/src/mage/cards/t/TeferisSentinel.java | 2 +- Mage.Sets/src/mage/cards/t/TelekineticSliver.java | 2 +- Mage.Sets/src/mage/cards/t/TemurRunemark.java | 2 +- Mage.Sets/src/mage/cards/t/TenaciousHunter.java | 2 +- Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java | 2 +- Mage.Sets/src/mage/cards/t/TheTwelfthDoctor.java | 2 +- Mage.Sets/src/mage/cards/t/ThorncasterSliver.java | 2 +- Mage.Sets/src/mage/cards/t/ThoughtDevourer.java | 2 +- Mage.Sets/src/mage/cards/t/ThoughtEater.java | 2 +- Mage.Sets/src/mage/cards/t/ThoughtNibbler.java | 2 +- Mage.Sets/src/mage/cards/t/ThresherLizard.java | 2 +- Mage.Sets/src/mage/cards/t/ThrunBreakerOfSilence.java | 2 +- Mage.Sets/src/mage/cards/t/ToxicIguanar.java | 2 +- Mage.Sets/src/mage/cards/t/TrueFaithCenser.java | 2 +- Mage.Sets/src/mage/cards/t/TrustedAdvisor.java | 2 +- Mage.Sets/src/mage/cards/u/UnquestionedAuthority.java | 2 +- Mage.Sets/src/mage/cards/u/UrzasIncubator.java | 2 +- Mage.Sets/src/mage/cards/v/VeiledSerpent.java | 2 +- Mage.Sets/src/mage/cards/v/VenomSliver.java | 2 +- Mage.Sets/src/mage/cards/v/VictualSliver.java | 2 +- Mage.Sets/src/mage/cards/v/VintaraSnapper.java | 2 +- Mage.Sets/src/mage/cards/v/VirulentSliver.java | 2 +- Mage.Sets/src/mage/cards/w/WalkingDream.java | 2 +- Mage.Sets/src/mage/cards/w/WardenOfTheBeyond.java | 2 +- Mage.Sets/src/mage/cards/w/WaywardSwordtooth.java | 2 +- Mage.Sets/src/mage/cards/w/WildMagicSorcerer.java | 2 +- Mage.Sets/src/mage/cards/z/ZanamDjinn.java | 2 +- Mage.Sets/src/mage/cards/z/ZaskSkitteringSwarmlord.java | 2 +- Mage.Sets/src/mage/cards/z/ZurgoHelmsmasher.java | 2 +- .../java/mage/game/permanent/token/KarnConstructToken.java | 2 +- .../src/main/java/mage/game/permanent/token/VrenRatToken.java | 2 +- 215 files changed, 223 insertions(+), 223 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AbzanKinGuard.java b/Mage.Sets/src/mage/cards/a/AbzanKinGuard.java index d7053db0f29..ab061e35028 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanKinGuard.java +++ b/Mage.Sets/src/mage/cards/a/AbzanKinGuard.java @@ -39,7 +39,7 @@ public final class AbzanKinGuard extends CardImpl { this.toughness = new MageInt(3); // Abzan Kin-Guard has lifelink as long as you control a white or black permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(LifelinkAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "{this} has lifelink as long as you control a white or black permanent"))); } diff --git a/Mage.Sets/src/mage/cards/a/AbzanRunemark.java b/Mage.Sets/src/mage/cards/a/AbzanRunemark.java index 8f487ce98cf..2d823765b78 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanRunemark.java +++ b/Mage.Sets/src/mage/cards/a/AbzanRunemark.java @@ -46,7 +46,7 @@ public final class AbzanRunemark extends CardImpl { // Enchanted creature gets +2/+2. this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // Enchanted creature has vigilance as long as you control a black or green permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA), new PermanentsOnTheBattlefieldCondition(filter), "Enchanted creature has vigilance as long as you control a black or green permanent"))); } diff --git a/Mage.Sets/src/mage/cards/a/AccursedWitch.java b/Mage.Sets/src/mage/cards/a/AccursedWitch.java index beb098a87d5..242b3f8c0df 100644 --- a/Mage.Sets/src/mage/cards/a/AccursedWitch.java +++ b/Mage.Sets/src/mage/cards/a/AccursedWitch.java @@ -33,7 +33,7 @@ public final class AccursedWitch extends CardImpl { this.secondSideCardClazz = mage.cards.i.InfectiousCurse.class; // Spells your opponents cast that target Accursed Witch cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostModificationThatTargetSourceEffect(-1, new FilterCard("Spells"), TargetController.OPPONENT)) ); diff --git a/Mage.Sets/src/mage/cards/a/AcidicSliver.java b/Mage.Sets/src/mage/cards/a/AcidicSliver.java index b808edb913f..1b99359297d 100644 --- a/Mage.Sets/src/mage/cards/a/AcidicSliver.java +++ b/Mage.Sets/src/mage/cards/a/AcidicSliver.java @@ -36,7 +36,7 @@ public final class AcidicSliver extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new SacrificeSourceCost()); ability.addCost(new GenericManaCost(2)); ability.addTarget(new TargetAnyTarget()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS, "All Slivers have \"{2}, Sacrifice this permanent: This permanent deals 2 damage to any target.\""))); diff --git a/Mage.Sets/src/mage/cards/a/AeronautAdmiral.java b/Mage.Sets/src/mage/cards/a/AeronautAdmiral.java index 8171e02e55b..82abecda782 100644 --- a/Mage.Sets/src/mage/cards/a/AeronautAdmiral.java +++ b/Mage.Sets/src/mage/cards/a/AeronautAdmiral.java @@ -38,7 +38,7 @@ public final class AeronautAdmiral extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Vehicles you control have flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, filter))); } diff --git a/Mage.Sets/src/mage/cards/a/AinokArtillerist.java b/Mage.Sets/src/mage/cards/a/AinokArtillerist.java index b7239737467..07214253ef1 100644 --- a/Mage.Sets/src/mage/cards/a/AinokArtillerist.java +++ b/Mage.Sets/src/mage/cards/a/AinokArtillerist.java @@ -29,7 +29,7 @@ public final class AinokArtillerist extends CardImpl { this.toughness = new MageInt(1); // Ainok Artillerist has reach 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(ReachAbility.getInstance()), new SourceHasCounterCondition(CounterType.P1P1),"{this} has reach as long as it has a +1/+1 counter on it"))); } diff --git a/Mage.Sets/src/mage/cards/a/AlabasterLeech.java b/Mage.Sets/src/mage/cards/a/AlabasterLeech.java index 72083ffa179..135a6b9126a 100644 --- a/Mage.Sets/src/mage/cards/a/AlabasterLeech.java +++ b/Mage.Sets/src/mage/cards/a/AlabasterLeech.java @@ -34,7 +34,7 @@ public final class AlabasterLeech extends CardImpl { this.toughness = new MageInt(3); // White spells you cast cost {W} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostIncreasingAllEffect(new ManaCostsImpl<>("{W}"), filter, TargetController.YOU))); } diff --git a/Mage.Sets/src/mage/cards/a/AllosaurusShepherd.java b/Mage.Sets/src/mage/cards/a/AllosaurusShepherd.java index 5e368fdcde3..3a4151d07c5 100644 --- a/Mage.Sets/src/mage/cards/a/AllosaurusShepherd.java +++ b/Mage.Sets/src/mage/cards/a/AllosaurusShepherd.java @@ -42,7 +42,7 @@ public class AllosaurusShepherd extends CardImpl { this.addAbility(new CantBeCounteredSourceAbility()); //Green spells you control can't be countered. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new CantBeCounteredControlledEffect(greenSpellsFilter, null, Duration.WhileOnBattlefield))); //4GG: Until end of turn, each Elf creature you control has base power and toughness 5/5 diff --git a/Mage.Sets/src/mage/cards/a/AndraditeLeech.java b/Mage.Sets/src/mage/cards/a/AndraditeLeech.java index a37f25cfbe1..97129468d68 100644 --- a/Mage.Sets/src/mage/cards/a/AndraditeLeech.java +++ b/Mage.Sets/src/mage/cards/a/AndraditeLeech.java @@ -33,7 +33,7 @@ public final class AndraditeLeech extends CardImpl { this.toughness = new MageInt(2); // Black spells you cast cost {B} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostIncreasingAllEffect(new ManaCostsImpl<>("{B}"), filter, TargetController.YOU))); // {B}: Andradite Leech gets +1/+1 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/a/AngrathsAmbusher.java b/Mage.Sets/src/mage/cards/a/AngrathsAmbusher.java index 4b2ca1e2ad4..3f4c4153853 100644 --- a/Mage.Sets/src/mage/cards/a/AngrathsAmbusher.java +++ b/Mage.Sets/src/mage/cards/a/AngrathsAmbusher.java @@ -37,7 +37,7 @@ public final class AngrathsAmbusher extends CardImpl { this.toughness = new MageInt(3); // Angrath's Ambusher gets +2/+0 as long as you control an Angrath planeswalker. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(2, 0, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "{this} gets +2/+0 as long as you control an Angrath planeswalker"))); diff --git a/Mage.Sets/src/mage/cards/a/ArcaneMelee.java b/Mage.Sets/src/mage/cards/a/ArcaneMelee.java index d0e0fd124a7..76368169416 100644 --- a/Mage.Sets/src/mage/cards/a/ArcaneMelee.java +++ b/Mage.Sets/src/mage/cards/a/ArcaneMelee.java @@ -19,7 +19,7 @@ public final class ArcaneMelee extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{U}"); // Instant and sorcery spells cost {2} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostReductionAllEffect(new FilterInstantOrSorceryCard("Instant and sorcery spells"), 2)) ); } diff --git a/Mage.Sets/src/mage/cards/a/ArtifactWard.java b/Mage.Sets/src/mage/cards/a/ArtifactWard.java index f072a17c41b..919dbc77724 100644 --- a/Mage.Sets/src/mage/cards/a/ArtifactWard.java +++ b/Mage.Sets/src/mage/cards/a/ArtifactWard.java @@ -33,7 +33,7 @@ public final class ArtifactWard extends CardImpl { // Enchanted creature can't be blocked by artifact creatures. // Prevent all damage that would be dealt to enchanted creature by artifact sources. // Enchanted creature can't be the target of abilities from artifact sources. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAttachedEffect(new ProtectionAbility(new FilterArtifactCard("artifacts")), AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/a/Asceticism.java b/Mage.Sets/src/mage/cards/a/Asceticism.java index bfaeb5c5c1d..2a8cadce8d1 100644 --- a/Mage.Sets/src/mage/cards/a/Asceticism.java +++ b/Mage.Sets/src/mage/cards/a/Asceticism.java @@ -26,7 +26,7 @@ public final class Asceticism extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{G}{G}"); // Creatures you control have hexproof. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES))); // {1}{G}: Regenerate target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{1}{G}")); diff --git a/Mage.Sets/src/mage/cards/b/BatteringSliver.java b/Mage.Sets/src/mage/cards/b/BatteringSliver.java index ac39923965a..0f2a4d0fd5e 100644 --- a/Mage.Sets/src/mage/cards/b/BatteringSliver.java +++ b/Mage.Sets/src/mage/cards/b/BatteringSliver.java @@ -29,7 +29,7 @@ public final class BatteringSliver extends CardImpl { this.toughness = new MageInt(4); // All Sliver creatures have trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect( TrampleAbility.getInstance(), Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/b/BattleBrawler.java b/Mage.Sets/src/mage/cards/b/BattleBrawler.java index 34c6e2bfd0b..c2cf6ab673d 100644 --- a/Mage.Sets/src/mage/cards/b/BattleBrawler.java +++ b/Mage.Sets/src/mage/cards/b/BattleBrawler.java @@ -41,7 +41,7 @@ public final class BattleBrawler extends CardImpl { this.toughness = new MageInt(2); // As long as you control a red or white permanent, Battle Brawler gets +1/+0 and has first strike. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(1,0, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "As long as you control a red or white permanent, {this} gets +1/+0")); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield), diff --git a/Mage.Sets/src/mage/cards/b/BehindTheScenes.java b/Mage.Sets/src/mage/cards/b/BehindTheScenes.java index fcb2ccf536e..4a679512fc1 100644 --- a/Mage.Sets/src/mage/cards/b/BehindTheScenes.java +++ b/Mage.Sets/src/mage/cards/b/BehindTheScenes.java @@ -25,7 +25,7 @@ public final class BehindTheScenes extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); // Creatures you control have skulk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(new SkulkAbility(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES))); // {4}{W}: Creatures you control get +1/+1 until end of turn. diff --git a/Mage.Sets/src/mage/cards/b/BladeSliver.java b/Mage.Sets/src/mage/cards/b/BladeSliver.java index 644d8fe77e9..aa2f92bdd92 100644 --- a/Mage.Sets/src/mage/cards/b/BladeSliver.java +++ b/Mage.Sets/src/mage/cards/b/BladeSliver.java @@ -27,7 +27,7 @@ public final class BladeSliver extends CardImpl { this.toughness = new MageInt(2); // All Sliver creatures get +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostAllEffect(1, 0, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS, false))); } diff --git a/Mage.Sets/src/mage/cards/b/BlindSpotGiant.java b/Mage.Sets/src/mage/cards/b/BlindSpotGiant.java index e040ce79069..d134c15a91b 100644 --- a/Mage.Sets/src/mage/cards/b/BlindSpotGiant.java +++ b/Mage.Sets/src/mage/cards/b/BlindSpotGiant.java @@ -35,7 +35,7 @@ public final class BlindSpotGiant extends CardImpl { this.toughness = new MageInt(3); // Blind-Spot Giant can't attack or block unless you control another Giant. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new CantAttackBlockUnlessConditionSourceEffect(new PermanentsOnTheBattlefieldCondition(filter)))); } diff --git a/Mage.Sets/src/mage/cards/b/BloodCursedKnight.java b/Mage.Sets/src/mage/cards/b/BloodCursedKnight.java index 3b49b69e033..dd231a8dc25 100644 --- a/Mage.Sets/src/mage/cards/b/BloodCursedKnight.java +++ b/Mage.Sets/src/mage/cards/b/BloodCursedKnight.java @@ -34,7 +34,7 @@ public final class BloodCursedKnight extends CardImpl { this.toughness = new MageInt(2); // As long as you control an enchantment, Blood-Cursed Knight gets +1/+1 and has lifelink. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleStaticAbility( new ConditionalContinuousEffect( new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(new FilterControlledEnchantmentPermanent()), rule1)); diff --git a/Mage.Sets/src/mage/cards/b/BloodfireEnforcers.java b/Mage.Sets/src/mage/cards/b/BloodfireEnforcers.java index 6cd71a597dd..cad369344c9 100644 --- a/Mage.Sets/src/mage/cards/b/BloodfireEnforcers.java +++ b/Mage.Sets/src/mage/cards/b/BloodfireEnforcers.java @@ -34,7 +34,7 @@ public final class BloodfireEnforcers extends CardImpl { this.toughness = new MageInt(2); // Bloodfire Enforcers has first strike and trample as long as an instant card and a sorcery card are in your graveyard. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield), new BloodfireEnforcersCondition(), "{this} has first strike")); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield), @@ -80,4 +80,4 @@ class BloodfireEnforcersCondition implements Condition { } return false; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/b/BloodshedFever.java b/Mage.Sets/src/mage/cards/b/BloodshedFever.java index 356671b375b..9d2e654e30d 100644 --- a/Mage.Sets/src/mage/cards/b/BloodshedFever.java +++ b/Mage.Sets/src/mage/cards/b/BloodshedFever.java @@ -31,7 +31,7 @@ public final class BloodshedFever extends CardImpl { this.addAbility(ability); // Enchanted creature attacks each turn if able. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new AttacksIfAbleAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/b/BonescytheSliver.java b/Mage.Sets/src/mage/cards/b/BonescytheSliver.java index fc222e32f03..52a7a00f659 100644 --- a/Mage.Sets/src/mage/cards/b/BonescytheSliver.java +++ b/Mage.Sets/src/mage/cards/b/BonescytheSliver.java @@ -28,7 +28,7 @@ public final class BonescytheSliver extends CardImpl { this.toughness = new MageInt(2); // Sliver creatures you control have double strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_SLIVERS))); } diff --git a/Mage.Sets/src/mage/cards/b/BonesplitterSliver.java b/Mage.Sets/src/mage/cards/b/BonesplitterSliver.java index 70c8ec855c0..acbbfdef7a8 100644 --- a/Mage.Sets/src/mage/cards/b/BonesplitterSliver.java +++ b/Mage.Sets/src/mage/cards/b/BonesplitterSliver.java @@ -26,7 +26,7 @@ public final class BonesplitterSliver extends CardImpl { this.toughness = new MageInt(2); // All Sliver creatures get +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostAllEffect(2, 0, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS, false))); } diff --git a/Mage.Sets/src/mage/cards/b/BorealElemental.java b/Mage.Sets/src/mage/cards/b/BorealElemental.java index df54bda0db4..a7880c186b6 100644 --- a/Mage.Sets/src/mage/cards/b/BorealElemental.java +++ b/Mage.Sets/src/mage/cards/b/BorealElemental.java @@ -30,7 +30,7 @@ public final class BorealElemental extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Spells your opponents cast that target Boreal Elemental cost {2} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostModificationThatTargetSourceEffect(2, new FilterCard("Spells"), TargetController.OPPONENT)) ); } diff --git a/Mage.Sets/src/mage/cards/b/Burrowing.java b/Mage.Sets/src/mage/cards/b/Burrowing.java index fcaa926c749..3a04f120252 100644 --- a/Mage.Sets/src/mage/cards/b/Burrowing.java +++ b/Mage.Sets/src/mage/cards/b/Burrowing.java @@ -34,7 +34,7 @@ public final class Burrowing extends CardImpl { this.addAbility(ability); // Enchanted creature has mountainwalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAttachedEffect(new MountainwalkAbility(), AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/b/ButchersCleaver.java b/Mage.Sets/src/mage/cards/b/ButchersCleaver.java index edfd66a7031..b1810ec51e0 100644 --- a/Mage.Sets/src/mage/cards/b/ButchersCleaver.java +++ b/Mage.Sets/src/mage/cards/b/ButchersCleaver.java @@ -30,7 +30,7 @@ public final class ButchersCleaver extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(3, 0))); // As long as equipped creature is a Human, it has lifelink. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.EQUIPMENT), new EquippedHasSubtypeCondition(SubType.HUMAN), staticText))); diff --git a/Mage.Sets/src/mage/cards/c/CallapheBelovedOfTheSea.java b/Mage.Sets/src/mage/cards/c/CallapheBelovedOfTheSea.java index 949f6307a60..2ed92de5796 100644 --- a/Mage.Sets/src/mage/cards/c/CallapheBelovedOfTheSea.java +++ b/Mage.Sets/src/mage/cards/c/CallapheBelovedOfTheSea.java @@ -46,7 +46,7 @@ public final class CallapheBelovedOfTheSea extends CardImpl { ).addHint(DevotionCount.U.getHint())); // Creatures and enchantments you control have "Spells your opponents cast that target this permanent cost {1} more to cast". - Ability gainAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, + Ability gainAbility = new SimpleStaticAbility( new SpellsCostModificationThatTargetSourceEffect(1, new FilterCard("Spells"), TargetController.OPPONENT) .withTargetName("this permanent") ); diff --git a/Mage.Sets/src/mage/cards/c/CamelliaTheSeedmiser.java b/Mage.Sets/src/mage/cards/c/CamelliaTheSeedmiser.java index 2be4743f90c..8bb75dd5273 100644 --- a/Mage.Sets/src/mage/cards/c/CamelliaTheSeedmiser.java +++ b/Mage.Sets/src/mage/cards/c/CamelliaTheSeedmiser.java @@ -56,7 +56,7 @@ public final class CamelliaTheSeedmiser extends CardImpl { this.addAbility(new MenaceAbility(false)); // Other Squirrels you control have menace. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,new GainAbilityControlledEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect( new MenaceAbility(false), Duration.WhileOnBattlefield, filterSquirrelCreatures, diff --git a/Mage.Sets/src/mage/cards/c/ChampionOfTheFlame.java b/Mage.Sets/src/mage/cards/c/ChampionOfTheFlame.java index 4e7562014c4..e92cc673d99 100644 --- a/Mage.Sets/src/mage/cards/c/ChampionOfTheFlame.java +++ b/Mage.Sets/src/mage/cards/c/ChampionOfTheFlame.java @@ -38,7 +38,7 @@ public final class ChampionOfTheFlame extends CardImpl { DynamicValue auraAmount = new AuraAttachedCount(2); DynamicValue equipAmount = new EquipmentAttachedCount(2); DynamicValue totalAmount = new AdditiveDynamicValue(auraAmount, equipAmount); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostSourceEffect(totalAmount, totalAmount, Duration.WhileOnBattlefield) .setText("{this} gets +2/+2 for each Aura and Equipment attached to it"))); } diff --git a/Mage.Sets/src/mage/cards/c/CloudKey.java b/Mage.Sets/src/mage/cards/c/CloudKey.java index 4e39cc8e0a9..7b12bd88f53 100644 --- a/Mage.Sets/src/mage/cards/c/CloudKey.java +++ b/Mage.Sets/src/mage/cards/c/CloudKey.java @@ -29,7 +29,7 @@ public final class CloudKey extends CardImpl { )); // Spells you cast of the chosen type cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostReductionAllOfChosenCardTypeEffect(new FilterCard("Spells you cast of the chosen type"), 1, true) )); } diff --git a/Mage.Sets/src/mage/cards/c/ClutchOfUndeath.java b/Mage.Sets/src/mage/cards/c/ClutchOfUndeath.java index a7f00563f31..d28b51b6e32 100644 --- a/Mage.Sets/src/mage/cards/c/ClutchOfUndeath.java +++ b/Mage.Sets/src/mage/cards/c/ClutchOfUndeath.java @@ -37,7 +37,7 @@ public final class ClutchOfUndeath extends CardImpl { this.addAbility(ability); // Enchanted creature gets +3/+3 as long as it's a Zombie. Otherwise, it gets -3/-3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect( new BoostEnchantedEffect(3, 3), new BoostEnchantedEffect(-3, -3), diff --git a/Mage.Sets/src/mage/cards/c/ConcordantCrossroads.java b/Mage.Sets/src/mage/cards/c/ConcordantCrossroads.java index 4904612301f..0f7aeb81e13 100644 --- a/Mage.Sets/src/mage/cards/c/ConcordantCrossroads.java +++ b/Mage.Sets/src/mage/cards/c/ConcordantCrossroads.java @@ -23,7 +23,7 @@ public final class ConcordantCrossroads extends CardImpl { this.supertype.add(SuperType.WORLD); // All creatures have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_CREATURES))); } diff --git a/Mage.Sets/src/mage/cards/c/ConstrictingSliver.java b/Mage.Sets/src/mage/cards/c/ConstrictingSliver.java index 69549944557..3632beaa28d 100644 --- a/Mage.Sets/src/mage/cards/c/ConstrictingSliver.java +++ b/Mage.Sets/src/mage/cards/c/ConstrictingSliver.java @@ -30,7 +30,7 @@ public final class ConstrictingSliver extends CardImpl { // until this creature leaves the battlefield." Ability ability = new EntersBattlefieldTriggeredAbility(new ExileUntilSourceLeavesEffect(), true); ability.addTarget(new TargetOpponentsCreaturePermanent()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(ability, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS) .setText("Sliver creatures you control have \"When this creature enters, " diff --git a/Mage.Sets/src/mage/cards/c/CorruptedZendikon.java b/Mage.Sets/src/mage/cards/c/CorruptedZendikon.java index b4c480648e0..268aaadfb2a 100644 --- a/Mage.Sets/src/mage/cards/c/CorruptedZendikon.java +++ b/Mage.Sets/src/mage/cards/c/CorruptedZendikon.java @@ -39,7 +39,7 @@ public final class CorruptedZendikon extends CardImpl { this.addAbility(ability); // Enchanted land is a 3/3 black Ooze creature. It's still a land. - Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, + Ability ability2 = new SimpleStaticAbility( new BecomesCreatureAttachedEffect(new CorruptedZendikonOozeToken(), "Enchanted land is a 3/3 black Ooze creature. It's still a land.", Duration.WhileOnBattlefield, BecomesCreatureAttachedEffect.LoseType.COLOR)); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/c/CourtHomunculus.java b/Mage.Sets/src/mage/cards/c/CourtHomunculus.java index 6d02aa9b1e3..37297403ee3 100644 --- a/Mage.Sets/src/mage/cards/c/CourtHomunculus.java +++ b/Mage.Sets/src/mage/cards/c/CourtHomunculus.java @@ -33,7 +33,7 @@ public final class CourtHomunculus extends CardImpl { this.toughness = new MageInt(1); // Court Homunculus gets +1/+1 as long as you control another artifact. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new ControlsAnotherArtifactCondition(), "{this} gets +1/+1 as long as you control another artifact"))); } @@ -60,4 +60,4 @@ class ControlsAnotherArtifactCondition implements Condition { } return false; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/c/CuratorsWard.java b/Mage.Sets/src/mage/cards/c/CuratorsWard.java index e603e81ae99..f77e6a62905 100644 --- a/Mage.Sets/src/mage/cards/c/CuratorsWard.java +++ b/Mage.Sets/src/mage/cards/c/CuratorsWard.java @@ -42,7 +42,7 @@ public final class CuratorsWard extends CardImpl { this.addAbility(ability); // Enchanted permanent has hexproof. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAttachedEffect(HexproofAbility.getInstance(), AttachmentType.AURA) .setText("Enchanted permanent has hexproof"))); diff --git a/Mage.Sets/src/mage/cards/d/DarkheartSliver.java b/Mage.Sets/src/mage/cards/d/DarkheartSliver.java index bb7d549cb99..57edcdb31cc 100644 --- a/Mage.Sets/src/mage/cards/d/DarkheartSliver.java +++ b/Mage.Sets/src/mage/cards/d/DarkheartSliver.java @@ -32,7 +32,7 @@ public final class DarkheartSliver extends CardImpl { // All Slivers have "Sacrifice this permanent: You gain 3 life." Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(3), new SacrificeSourceCost()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS, "All Slivers have \"Sacrifice this permanent: You gain 3 life.\""))); diff --git a/Mage.Sets/src/mage/cards/d/DarksteelMutation.java b/Mage.Sets/src/mage/cards/d/DarksteelMutation.java index e5caf70495f..cd96bcc936a 100644 --- a/Mage.Sets/src/mage/cards/d/DarksteelMutation.java +++ b/Mage.Sets/src/mage/cards/d/DarksteelMutation.java @@ -38,7 +38,7 @@ public final class DarksteelMutation extends CardImpl { this.addAbility(ability); // Enchanted creature is an Insect artifact creature with base power and toughness 0/1 and has indestructible, and it loses all other abilities, card types, and creature types. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BecomesCreatureAttachedEffect(new DarksteelMutationInsectToken(), "Enchanted creature is an Insect artifact creature with base power and toughness 0/1 and has indestructible, and it loses all other abilities, card types, and creature types.", Duration.WhileOnBattlefield, BecomesCreatureAttachedEffect.LoseType.ALL_BUT_COLOR))); diff --git a/Mage.Sets/src/mage/cards/d/DarksteelPlate.java b/Mage.Sets/src/mage/cards/d/DarksteelPlate.java index b9b3037ef20..a0d8ad72d28 100644 --- a/Mage.Sets/src/mage/cards/d/DarksteelPlate.java +++ b/Mage.Sets/src/mage/cards/d/DarksteelPlate.java @@ -25,7 +25,7 @@ public final class DarksteelPlate extends CardImpl { // Darksteel Plate is indestructible. this.addAbility(IndestructibleAbility.getInstance()); // Equipped creature is indestructible. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAttachedEffect(IndestructibleAbility.getInstance(), AttachmentType.EQUIPMENT, Duration.WhileOnBattlefield))); // Equip {2} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2), false)); diff --git a/Mage.Sets/src/mage/cards/d/DeadeyePlunderers.java b/Mage.Sets/src/mage/cards/d/DeadeyePlunderers.java index d8d088ed817..af9107d67c7 100644 --- a/Mage.Sets/src/mage/cards/d/DeadeyePlunderers.java +++ b/Mage.Sets/src/mage/cards/d/DeadeyePlunderers.java @@ -32,7 +32,7 @@ public final class DeadeyePlunderers extends CardImpl { this.toughness = new MageInt(3); // Deadeye Plunderers gets +1/+1 for each artifact you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostSourceEffect(ArtifactYouControlCount.instance, ArtifactYouControlCount.instance, Duration.WhileOnBattlefield) ).addHint(ArtifactYouControlHint.instance)); diff --git a/Mage.Sets/src/mage/cards/d/DeathcapCultivator.java b/Mage.Sets/src/mage/cards/d/DeathcapCultivator.java index 971decf4b27..490a2e1f369 100644 --- a/Mage.Sets/src/mage/cards/d/DeathcapCultivator.java +++ b/Mage.Sets/src/mage/cards/d/DeathcapCultivator.java @@ -35,7 +35,7 @@ public final class DeathcapCultivator extends CardImpl { this.addAbility(new GreenManaAbility()); // Delirium — Deathcap Cultivator has deathtouch as long as there are four or more card types among cards in your graveyard. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield), DeliriumCondition.instance, "Delirium — {this} has deathtouch as long as there are four or more card types among cards in your graveyard")) .addHint(CardTypesInGraveyardHint.YOU)); diff --git a/Mage.Sets/src/mage/cards/d/DeepFreeze.java b/Mage.Sets/src/mage/cards/d/DeepFreeze.java index 9ed5206e539..ac83433bf2a 100644 --- a/Mage.Sets/src/mage/cards/d/DeepFreeze.java +++ b/Mage.Sets/src/mage/cards/d/DeepFreeze.java @@ -40,7 +40,7 @@ public final class DeepFreeze extends CardImpl { this.addAbility(ability); // Enchanted creature has base power and toughness 0/4, has defender, loses all other abilities, and is a blue Wall in addition to its other colors and types. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BecomesCreatureAttachedEffect(new DeepFreezeToken(), "Enchanted creature has base power and toughness 0/4, has defender, loses all other abilities, and is a blue Wall in addition to its other colors and types", Duration.WhileOnBattlefield, BecomesCreatureAttachedEffect.LoseType.ABILITIES) diff --git a/Mage.Sets/src/mage/cards/d/DementiaSliver.java b/Mage.Sets/src/mage/cards/d/DementiaSliver.java index ea88b06ec96..92b47218904 100644 --- a/Mage.Sets/src/mage/cards/d/DementiaSliver.java +++ b/Mage.Sets/src/mage/cards/d/DementiaSliver.java @@ -43,7 +43,7 @@ public final class DementiaSliver extends CardImpl { gainedAbility.addEffect(new DementiaSliverEffect()); gainedAbility.addTarget(new TargetOpponent()); gainedAbility.addHint(MyTurnHint.instance); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(gainedAbility, Duration.WhileOnBattlefield, filter, "All Slivers have \"{T}: Choose a card name. " + "Target opponent reveals a card at random from their hand." diff --git a/Mage.Sets/src/mage/cards/d/DireWolves.java b/Mage.Sets/src/mage/cards/d/DireWolves.java index 487578976c3..71009710f21 100644 --- a/Mage.Sets/src/mage/cards/d/DireWolves.java +++ b/Mage.Sets/src/mage/cards/d/DireWolves.java @@ -36,7 +36,7 @@ public final class DireWolves extends CardImpl { this.toughness = new MageInt(2); // Dire Wolves has banding as long as you control a Plains. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(BandingAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), rule))); } diff --git a/Mage.Sets/src/mage/cards/d/DivinityOfPride.java b/Mage.Sets/src/mage/cards/d/DivinityOfPride.java index 759ede95b74..0ae9c4f5dc4 100644 --- a/Mage.Sets/src/mage/cards/d/DivinityOfPride.java +++ b/Mage.Sets/src/mage/cards/d/DivinityOfPride.java @@ -33,7 +33,7 @@ public final class DivinityOfPride extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // Divinity of Pride gets +4/+4 as long as you have 25 or more life. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(4, 4, Duration.WhileOnBattlefield), new LifeCompareCondition(TargetController.YOU, ComparisonType.OR_GREATER, 25), "{this} gets +4/+4 as long as you have 25 or more life"))); diff --git a/Mage.Sets/src/mage/cards/d/DonAndresTheRenegade.java b/Mage.Sets/src/mage/cards/d/DonAndresTheRenegade.java index e12b16301a5..3917a2f3232 100644 --- a/Mage.Sets/src/mage/cards/d/DonAndresTheRenegade.java +++ b/Mage.Sets/src/mage/cards/d/DonAndresTheRenegade.java @@ -61,7 +61,7 @@ public final class DonAndresTheRenegade extends CardImpl { this.toughness = new MageInt(3); // Each creature you control but don't own gets +2/+2, has menace and deathtouch, and is a Pirate in addition to its other types. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleStaticAbility( new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, creatureFilter, false) .setText("Each creature you control but don't own gets +2/+2")); ability.addEffect(new GainAbilityControlledEffect( diff --git a/Mage.Sets/src/mage/cards/d/DormantSliver.java b/Mage.Sets/src/mage/cards/d/DormantSliver.java index 90dc24d8d6e..8e8f06ff71b 100644 --- a/Mage.Sets/src/mage/cards/d/DormantSliver.java +++ b/Mage.Sets/src/mage/cards/d/DormantSliver.java @@ -35,11 +35,11 @@ public final class DormantSliver extends CardImpl { this.toughness = new MageInt(2); // All Sliver creatures have defender. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(DefenderAbility.getInstance(), Duration.WhileOnBattlefield, filter, "All Sliver creatures have defender."))); // All Slivers have "When this permanent enters the battlefield, draw a card." Ability ability2 = new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(ability2, Duration.WhileOnBattlefield, filter, "All Slivers have \"When this permanent enters the battlefield, draw a card.\""))); } diff --git a/Mage.Sets/src/mage/cards/d/DragonlordKolaghan.java b/Mage.Sets/src/mage/cards/d/DragonlordKolaghan.java index 8afcf1aeaeb..0667c65d0e0 100644 --- a/Mage.Sets/src/mage/cards/d/DragonlordKolaghan.java +++ b/Mage.Sets/src/mage/cards/d/DragonlordKolaghan.java @@ -42,7 +42,7 @@ public final class DragonlordKolaghan extends CardImpl { this.addAbility(HasteAbility.getInstance()); // Other creatures you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, true))); // Whenever an opponent casts a creature or planeswalker spell with the same name as a card in their graveyard, that player loses 10 life. diff --git a/Mage.Sets/src/mage/cards/d/DrillSkimmer.java b/Mage.Sets/src/mage/cards/d/DrillSkimmer.java index 33e5ad1ea45..bbd5065b0d8 100644 --- a/Mage.Sets/src/mage/cards/d/DrillSkimmer.java +++ b/Mage.Sets/src/mage/cards/d/DrillSkimmer.java @@ -43,7 +43,7 @@ public final class DrillSkimmer extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Drill-Skimmer has shroud as long as you control another artifact creature. Condition condition = new PermanentsOnTheBattlefieldCondition(filter); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield), condition, "{this} has shroud as long as you control another artifact creature."))); } diff --git a/Mage.Sets/src/mage/cards/d/DryadsFavor.java b/Mage.Sets/src/mage/cards/d/DryadsFavor.java index fd69235b629..16ff37620d7 100644 --- a/Mage.Sets/src/mage/cards/d/DryadsFavor.java +++ b/Mage.Sets/src/mage/cards/d/DryadsFavor.java @@ -37,7 +37,7 @@ public final class DryadsFavor extends CardImpl { this.addAbility(ability); // Enchanted creature has forestwalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAttachedEffect(new ForestwalkAbility(), AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/e/ElderwoodScion.java b/Mage.Sets/src/mage/cards/e/ElderwoodScion.java index 81f8c9f6725..cb639b9b6bc 100644 --- a/Mage.Sets/src/mage/cards/e/ElderwoodScion.java +++ b/Mage.Sets/src/mage/cards/e/ElderwoodScion.java @@ -34,12 +34,12 @@ public final class ElderwoodScion extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // Spells you cast that target Elderwood Scion cost {2} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostModificationThatTargetSourceEffect(-2, new FilterCard("Spells"), TargetController.YOU)) ); // Spells your opponents cast that target Elderwood Scion cost {2} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostModificationThatTargetSourceEffect(2, new FilterCard("Spells"), TargetController.OPPONENT)) ); } diff --git a/Mage.Sets/src/mage/cards/e/EmblemOfTheWarmind.java b/Mage.Sets/src/mage/cards/e/EmblemOfTheWarmind.java index 31512115262..1b6788e2ae4 100644 --- a/Mage.Sets/src/mage/cards/e/EmblemOfTheWarmind.java +++ b/Mage.Sets/src/mage/cards/e/EmblemOfTheWarmind.java @@ -37,7 +37,7 @@ public final class EmblemOfTheWarmind extends CardImpl { this.addAbility(ability); // Creatures you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES))); } diff --git a/Mage.Sets/src/mage/cards/e/Entangler.java b/Mage.Sets/src/mage/cards/e/Entangler.java index f17560fc8e9..304e8a9d7a4 100644 --- a/Mage.Sets/src/mage/cards/e/Entangler.java +++ b/Mage.Sets/src/mage/cards/e/Entangler.java @@ -39,7 +39,7 @@ public final class Entangler extends CardImpl { this.addAbility(ability); // Enchanted creature can block any number of creatures. - SimpleStaticAbility blockAbility = new SimpleStaticAbility(Zone.BATTLEFIELD,new CanBlockAdditionalCreatureEffect(0)); + SimpleStaticAbility blockAbility = new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect(0)); Effect effect = new GainAbilityAttachedEffect(blockAbility,AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("Enchanted creature can block any number of creatures."); this.addAbility(new SimpleStaticAbility(effect)); diff --git a/Mage.Sets/src/mage/cards/e/EtchedChampion.java b/Mage.Sets/src/mage/cards/e/EtchedChampion.java index 872ae670259..833324e81fb 100644 --- a/Mage.Sets/src/mage/cards/e/EtchedChampion.java +++ b/Mage.Sets/src/mage/cards/e/EtchedChampion.java @@ -44,7 +44,7 @@ public final class EtchedChampion extends CardImpl { // Metalcraft — Etched Champion has protection from all colors as long as you control three or more artifacts. ContinuousEffect effect = new GainAbilitySourceEffect(new ProtectionAbility(filter), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(effect, MetalcraftCondition.instance, ruleText)) .setAbilityWord(AbilityWord.METALCRAFT) .addHint(MetalcraftHint.instance) diff --git a/Mage.Sets/src/mage/cards/e/Exploration.java b/Mage.Sets/src/mage/cards/e/Exploration.java index 8d391953c28..454e62b8b25 100644 --- a/Mage.Sets/src/mage/cards/e/Exploration.java +++ b/Mage.Sets/src/mage/cards/e/Exploration.java @@ -21,7 +21,7 @@ public final class Exploration extends CardImpl { // You may play an additional land on each of your turns. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new PlayAdditionalLandsControllerEffect(1, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/f/FavorableDestiny.java b/Mage.Sets/src/mage/cards/f/FavorableDestiny.java index 08f319ec99b..4d7ae2dc84b 100644 --- a/Mage.Sets/src/mage/cards/f/FavorableDestiny.java +++ b/Mage.Sets/src/mage/cards/f/FavorableDestiny.java @@ -45,7 +45,7 @@ public final class FavorableDestiny extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+2 as long as it's white. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect( new BoostEnchantedEffect(1, 2), new EnchantedCreatureColorCondition(ObjectColor.WHITE), @@ -54,7 +54,7 @@ public final class FavorableDestiny extends CardImpl { )); // Enchanted creature has shroud as long as its controller controls another creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect( new GainAbilityAttachedEffect( ShroudAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/f/FenStalker.java b/Mage.Sets/src/mage/cards/f/FenStalker.java index 5a14921e8d5..2d3ba45ae02 100644 --- a/Mage.Sets/src/mage/cards/f/FenStalker.java +++ b/Mage.Sets/src/mage/cards/f/FenStalker.java @@ -37,7 +37,7 @@ public final class FenStalker extends CardImpl { this.toughness = new MageInt(2); // Fen Stalker has fear as long as you control no untapped lands. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(FearAbility.getInstance(), Duration.WhileOnBattlefield), new InvertCondition(new PermanentsOnTheBattlefieldCondition(filter)), "{this} has fear as long as you control no untapped lands"))); diff --git a/Mage.Sets/src/mage/cards/f/FowlPlay.java b/Mage.Sets/src/mage/cards/f/FowlPlay.java index f467e17b2e0..2e15ac854b7 100644 --- a/Mage.Sets/src/mage/cards/f/FowlPlay.java +++ b/Mage.Sets/src/mage/cards/f/FowlPlay.java @@ -32,7 +32,7 @@ public final class FowlPlay extends CardImpl { this.addAbility(ability); // Enchanted creature is a Bird with base power and toughness 1/1 and loses all abilities. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BecomesCreatureAttachedEffect(new CreatureToken(1, 1, "1/1 Bird creature", SubType.BIRD), "Enchanted creature is a Bird with base power and toughness 1/1 and loses all abilities", Duration.WhileOnBattlefield, BecomesCreatureAttachedEffect.LoseType.ABILITIES_SUBTYPE))); diff --git a/Mage.Sets/src/mage/cards/f/FreewindEquenaut.java b/Mage.Sets/src/mage/cards/f/FreewindEquenaut.java index dfe3408d158..f07d673d300 100644 --- a/Mage.Sets/src/mage/cards/f/FreewindEquenaut.java +++ b/Mage.Sets/src/mage/cards/f/FreewindEquenaut.java @@ -39,7 +39,7 @@ public final class FreewindEquenaut extends CardImpl { new DamageTargetEffect(2), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(new FilterAttackingOrBlockingCreature())); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect( new GainAbilitySourceEffect(ability, Duration.WhileOnBattlefield), new EnchantedSourceCondition(), diff --git a/Mage.Sets/src/mage/cards/f/FreneticSliver.java b/Mage.Sets/src/mage/cards/f/FreneticSliver.java index 6c0145073db..2425e96d0b4 100644 --- a/Mage.Sets/src/mage/cards/f/FreneticSliver.java +++ b/Mage.Sets/src/mage/cards/f/FreneticSliver.java @@ -35,7 +35,7 @@ public final class FreneticSliver extends CardImpl { this.toughness = new MageInt(2); // All Slivers have "{0}: If this permanent is on the battlefield, flip a coin. If you win the flip, exile this permanent and return it to the battlefield under its owner's control at the beginning of the next end step. If you lose the flip, sacrifice it." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect( new SimpleActivatedAbility( Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/f/FurySliver.java b/Mage.Sets/src/mage/cards/f/FurySliver.java index e29441344e9..3bbf5a9faeb 100644 --- a/Mage.Sets/src/mage/cards/f/FurySliver.java +++ b/Mage.Sets/src/mage/cards/f/FurySliver.java @@ -27,7 +27,7 @@ public final class FurySliver extends CardImpl { this.toughness = new MageInt(3); // All Sliver creatures have double strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS diff --git a/Mage.Sets/src/mage/cards/g/GarnaTheBloodflame.java b/Mage.Sets/src/mage/cards/g/GarnaTheBloodflame.java index 8abd58c7ec2..61d15644e49 100644 --- a/Mage.Sets/src/mage/cards/g/GarnaTheBloodflame.java +++ b/Mage.Sets/src/mage/cards/g/GarnaTheBloodflame.java @@ -51,7 +51,7 @@ public final class GarnaTheBloodflame extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new GarnaTheBloodflameEffect(), false), new GarnaTheBloodflameWatcher()); // Other creatures you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, true))); } diff --git a/Mage.Sets/src/mage/cards/g/GateHound.java b/Mage.Sets/src/mage/cards/g/GateHound.java index eb109bfea6b..dcc8bd2a0cd 100644 --- a/Mage.Sets/src/mage/cards/g/GateHound.java +++ b/Mage.Sets/src/mage/cards/g/GateHound.java @@ -29,7 +29,7 @@ public final class GateHound extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect( new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES), new EnchantedSourceCondition(), diff --git a/Mage.Sets/src/mage/cards/g/GeistFueledScarecrow.java b/Mage.Sets/src/mage/cards/g/GeistFueledScarecrow.java index c42407096f7..f51d72cc82a 100644 --- a/Mage.Sets/src/mage/cards/g/GeistFueledScarecrow.java +++ b/Mage.Sets/src/mage/cards/g/GeistFueledScarecrow.java @@ -31,7 +31,7 @@ public final class GeistFueledScarecrow extends CardImpl { this.toughness = new MageInt(4); // Creature spells you cast cost {1} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostIncreasingAllEffect(1, filter, TargetController.YOU))); } diff --git a/Mage.Sets/src/mage/cards/g/GemhideSliver.java b/Mage.Sets/src/mage/cards/g/GemhideSliver.java index 53b1ca71552..f6fca871942 100644 --- a/Mage.Sets/src/mage/cards/g/GemhideSliver.java +++ b/Mage.Sets/src/mage/cards/g/GemhideSliver.java @@ -32,7 +32,7 @@ public final class GemhideSliver extends CardImpl { // All Slivers have "{tap}: Add one mana of any color." Ability ability = new AnyColorManaAbility(); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, filter, "All Slivers have \"{T}: Add one mana of any color.\""))); diff --git a/Mage.Sets/src/mage/cards/g/GhastlordOfFugue.java b/Mage.Sets/src/mage/cards/g/GhastlordOfFugue.java index 046e21be57e..271c34aaa56 100644 --- a/Mage.Sets/src/mage/cards/g/GhastlordOfFugue.java +++ b/Mage.Sets/src/mage/cards/g/GhastlordOfFugue.java @@ -36,7 +36,7 @@ public final class GhastlordOfFugue extends CardImpl { this.toughness = new MageInt(4); // Ghastlord of Fugue can't be blocked. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new CantBeBlockedSourceEffect(Duration.WhileOnBattlefield))); // Whenever Ghastlord of Fugue deals combat damage to a player, diff --git a/Mage.Sets/src/mage/cards/g/GnatMiser.java b/Mage.Sets/src/mage/cards/g/GnatMiser.java index 8397fe023b2..c414d2bc172 100644 --- a/Mage.Sets/src/mage/cards/g/GnatMiser.java +++ b/Mage.Sets/src/mage/cards/g/GnatMiser.java @@ -36,7 +36,7 @@ public final class GnatMiser extends CardImpl { this.toughness = new MageInt(1); // Each opponent's maximum hand size is reduced by one. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new MaximumHandSizeControllerEffect(1, Duration.WhileOnBattlefield, HandSizeModification.REDUCE, TargetController.OPPONENT))); } diff --git a/Mage.Sets/src/mage/cards/g/GohamDjinn.java b/Mage.Sets/src/mage/cards/g/GohamDjinn.java index b17db40cdda..c07eb5efdf7 100644 --- a/Mage.Sets/src/mage/cards/g/GohamDjinn.java +++ b/Mage.Sets/src/mage/cards/g/GohamDjinn.java @@ -35,7 +35,7 @@ public final class GohamDjinn extends CardImpl { this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); // Goham Djinn gets -2/-2 as long as black is the most common color among all permanents or is tied for most common. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(-2, -2, Duration.WhileOnBattlefield), new MostCommonColorCondition(new ObjectColor(ObjectColor.BLACK)), "{this} gets -2/-2 as long as black is the most common color among all permanents or is tied for most common"))); diff --git a/Mage.Sets/src/mage/cards/g/GraniteGrip.java b/Mage.Sets/src/mage/cards/g/GraniteGrip.java index 2a8b91b6b4d..e0002ece174 100644 --- a/Mage.Sets/src/mage/cards/g/GraniteGrip.java +++ b/Mage.Sets/src/mage/cards/g/GraniteGrip.java @@ -39,7 +39,7 @@ public final class GraniteGrip extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +1/+0 for each Mountain you control. - SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, + SimpleStaticAbility ability = new SimpleStaticAbility( new BoostEnchantedEffect(new PermanentsOnBattlefieldCount(filter, 1), new PermanentsOnBattlefieldCount(filter, 0), Duration.WhileOnBattlefield)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GunnerConscript.java b/Mage.Sets/src/mage/cards/g/GunnerConscript.java index 46245e98259..ecc84b5ad1a 100644 --- a/Mage.Sets/src/mage/cards/g/GunnerConscript.java +++ b/Mage.Sets/src/mage/cards/g/GunnerConscript.java @@ -44,7 +44,7 @@ public final class GunnerConscript extends CardImpl { // Gunner Conscript gets +1/+1 for each Aura and Equipment attached to it. DynamicValue totalAmount = new AdditiveDynamicValue(new AuraAttachedCount(), new EquipmentAttachedCount()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostSourceEffect(totalAmount, totalAmount, Duration.WhileOnBattlefield) .setText("{this} gets +1/+1 for each Aura and Equipment attached to it"))); diff --git a/Mage.Sets/src/mage/cards/h/HalamDjinn.java b/Mage.Sets/src/mage/cards/h/HalamDjinn.java index 0c5de56456f..0357183ce58 100644 --- a/Mage.Sets/src/mage/cards/h/HalamDjinn.java +++ b/Mage.Sets/src/mage/cards/h/HalamDjinn.java @@ -33,7 +33,7 @@ public final class HalamDjinn extends CardImpl { this.addAbility(HasteAbility.getInstance()); // Halam Djinn gets -2/-2 as long as red is the most common color among all permanents or is tied for most common. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(-2, -2, Duration.WhileOnBattlefield), new MostCommonColorCondition(new ObjectColor(ObjectColor.RED)), "{this} gets -2/-2 as long as red is the most common color among all permanents or is tied for most common"))); diff --git a/Mage.Sets/src/mage/cards/h/HammerOfPurphoros.java b/Mage.Sets/src/mage/cards/h/HammerOfPurphoros.java index b0f0604b24f..157c1599be8 100644 --- a/Mage.Sets/src/mage/cards/h/HammerOfPurphoros.java +++ b/Mage.Sets/src/mage/cards/h/HammerOfPurphoros.java @@ -33,7 +33,7 @@ public final class HammerOfPurphoros extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // Creatures you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES))); // {2}{R}, {tap}, Sacrifice a land: Create a 3/3 colorless Golem enchantment artifact creature token. diff --git a/Mage.Sets/src/mage/cards/h/HazoretTheFervent.java b/Mage.Sets/src/mage/cards/h/HazoretTheFervent.java index 9529496e68b..e38ec8263b1 100644 --- a/Mage.Sets/src/mage/cards/h/HazoretTheFervent.java +++ b/Mage.Sets/src/mage/cards/h/HazoretTheFervent.java @@ -43,7 +43,7 @@ public final class HazoretTheFervent extends CardImpl { this.addAbility(HasteAbility.getInstance()); // Hazoret the Fervent can't attack or block unless you have one or fewer cards in hand. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new CantAttackBlockUnlessConditionSourceEffect(new CardsInHandCondition(ComparisonType.FEWER_THAN, 2)) .setText("{this} can't attack or block unless you have one or fewer cards in hand"))); diff --git a/Mage.Sets/src/mage/cards/h/HeadstrongBrute.java b/Mage.Sets/src/mage/cards/h/HeadstrongBrute.java index 9dedfc41b47..8e6999ed00a 100644 --- a/Mage.Sets/src/mage/cards/h/HeadstrongBrute.java +++ b/Mage.Sets/src/mage/cards/h/HeadstrongBrute.java @@ -43,7 +43,7 @@ public final class HeadstrongBrute extends CardImpl { this.addAbility(new CantBlockAbility()); // Headstrong Brute has menace as long as you control another Pirate. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(new MenaceAbility(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "{this} has menace as long as you control another Pirate"))); } diff --git a/Mage.Sets/src/mage/cards/h/HeraldsHorn.java b/Mage.Sets/src/mage/cards/h/HeraldsHorn.java index bb7e2bd994f..7b315343df5 100644 --- a/Mage.Sets/src/mage/cards/h/HeraldsHorn.java +++ b/Mage.Sets/src/mage/cards/h/HeraldsHorn.java @@ -32,7 +32,7 @@ public final class HeraldsHorn extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseCreatureTypeEffect(Outcome.BoostCreature))); // Creature spells you cast of the chosen type cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostReductionAllOfChosenSubtypeEffect(new FilterCreatureCard("Creature spells you cast of the chosen type"), 1, true))); // At the beginning of your upkeep, look at the top card of your library. If it's a creature card of the chosen type, you may reveal it and put it into your hand. diff --git a/Mage.Sets/src/mage/cards/h/HeroicDefiance.java b/Mage.Sets/src/mage/cards/h/HeroicDefiance.java index 7d4afa9be20..ad17dadc431 100644 --- a/Mage.Sets/src/mage/cards/h/HeroicDefiance.java +++ b/Mage.Sets/src/mage/cards/h/HeroicDefiance.java @@ -41,7 +41,7 @@ public final class HeroicDefiance extends CardImpl { this.addAbility(ability); // Enchanted creature gets +3/+3 unless it shares a color with the most common color among all permanents or a color tied for most common. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield), new HeroicDefianceCondition(), "Enchanted creature gets +3/+3 unless it shares a color with the most common color among all permanents or a color tied for most common"))); diff --git a/Mage.Sets/src/mage/cards/h/HibernationSliver.java b/Mage.Sets/src/mage/cards/h/HibernationSliver.java index d0251e6f0ec..51dc7c47493 100644 --- a/Mage.Sets/src/mage/cards/h/HibernationSliver.java +++ b/Mage.Sets/src/mage/cards/h/HibernationSliver.java @@ -35,7 +35,7 @@ public final class HibernationSliver extends CardImpl { Effect effect = new ReturnToHandSourceEffect(true); effect.setText("Return this permanent to its owner's hand"); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new PayLifeCost(2)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, new FilterPermanent(SubType.SLIVER, "All Slivers"), "All Slivers have \"Pay 2 life: Return this permanent to its owner's hand.\""))); } diff --git a/Mage.Sets/src/mage/cards/h/HiddenPath.java b/Mage.Sets/src/mage/cards/h/HiddenPath.java index a6ed2d465a4..734a973afd0 100644 --- a/Mage.Sets/src/mage/cards/h/HiddenPath.java +++ b/Mage.Sets/src/mage/cards/h/HiddenPath.java @@ -30,7 +30,7 @@ public final class HiddenPath extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{G}{G}{G}{G}"); // Green creatures have forestwalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(new ForestwalkAbility(false), Duration.WhileOnBattlefield, filter))); } diff --git a/Mage.Sets/src/mage/cards/h/HoldTheGates.java b/Mage.Sets/src/mage/cards/h/HoldTheGates.java index 7c0ec706f4e..b4ff9cf5c6e 100644 --- a/Mage.Sets/src/mage/cards/h/HoldTheGates.java +++ b/Mage.Sets/src/mage/cards/h/HoldTheGates.java @@ -26,7 +26,7 @@ public final class HoldTheGates extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); // Creatures you control get +0/+1 for each Gate you control and have vigilance. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleStaticAbility( new BoostControlledEffect(StaticValue.get(0), GateYouControlCount.instance, Duration.WhileOnBattlefield) ); ability.addEffect( diff --git a/Mage.Sets/src/mage/cards/h/Humility.java b/Mage.Sets/src/mage/cards/h/Humility.java index 9155997af9f..6973d894850 100644 --- a/Mage.Sets/src/mage/cards/h/Humility.java +++ b/Mage.Sets/src/mage/cards/h/Humility.java @@ -28,7 +28,7 @@ public final class Humility extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{W}"); // All creatures lose all abilities and have base power and toughness 1/1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new HumilityEffect(Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/i/ImperialLancer.java b/Mage.Sets/src/mage/cards/i/ImperialLancer.java index 76ba8858411..1ae2069dd78 100644 --- a/Mage.Sets/src/mage/cards/i/ImperialLancer.java +++ b/Mage.Sets/src/mage/cards/i/ImperialLancer.java @@ -37,7 +37,7 @@ public final class ImperialLancer extends CardImpl { this.toughness = new MageInt(1); // Imperial Lancer has double strike as long as you control a Dinosaur. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "{this} has double strike as long as you control a Dinosaur"))); } diff --git a/Mage.Sets/src/mage/cards/i/InBolassClutches.java b/Mage.Sets/src/mage/cards/i/InBolassClutches.java index 38fb6b8ceb4..ac4db25d507 100644 --- a/Mage.Sets/src/mage/cards/i/InBolassClutches.java +++ b/Mage.Sets/src/mage/cards/i/InBolassClutches.java @@ -42,7 +42,7 @@ public final class InBolassClutches extends CardImpl { this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect("permanent"))); // Enchanted permanent is legendary. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new AddCardSuperTypeAttachedEffect(SuperType.LEGENDARY, Duration.WhileOnBattlefield, AttachmentType.AURA) )); } diff --git a/Mage.Sets/src/mage/cards/i/IncendiaryOracle.java b/Mage.Sets/src/mage/cards/i/IncendiaryOracle.java index f70fc66c218..8279a536d1e 100644 --- a/Mage.Sets/src/mage/cards/i/IncendiaryOracle.java +++ b/Mage.Sets/src/mage/cards/i/IncendiaryOracle.java @@ -34,7 +34,7 @@ public final class IncendiaryOracle extends CardImpl { new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); // If a creature dealt damage by Incendiary Oracle this turn would die, exile it instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new DealtDamageToCreatureBySourceDies(this, Duration.WhileOnBattlefield)), new DamagedByWatcher(false)); } diff --git a/Mage.Sets/src/mage/cards/i/InnerSanctum.java b/Mage.Sets/src/mage/cards/i/InnerSanctum.java index 9738a5fdc74..96b48dd37c6 100644 --- a/Mage.Sets/src/mage/cards/i/InnerSanctum.java +++ b/Mage.Sets/src/mage/cards/i/InnerSanctum.java @@ -25,7 +25,7 @@ public final class InnerSanctum extends CardImpl { this.addAbility(new CumulativeUpkeepAbility(new PayLifeCost(2))); // Prevent all damage that would be dealt to creatures you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new PreventAllDamageToAllEffect(Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES_CONTROLLED) )); } diff --git a/Mage.Sets/src/mage/cards/i/InventorsApprentice.java b/Mage.Sets/src/mage/cards/i/InventorsApprentice.java index 1fc0769780f..9af2d756391 100644 --- a/Mage.Sets/src/mage/cards/i/InventorsApprentice.java +++ b/Mage.Sets/src/mage/cards/i/InventorsApprentice.java @@ -31,7 +31,7 @@ public final class InventorsApprentice extends CardImpl { this.toughness = new MageInt(2); // Inventor's Apprentice gets +1/+1 as long as you control an artifact. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(new FilterControlledArtifactPermanent()), rule))); } diff --git a/Mage.Sets/src/mage/cards/i/Invisibility.java b/Mage.Sets/src/mage/cards/i/Invisibility.java index 065019fdd3b..5cd1e387516 100644 --- a/Mage.Sets/src/mage/cards/i/Invisibility.java +++ b/Mage.Sets/src/mage/cards/i/Invisibility.java @@ -38,7 +38,7 @@ public final class Invisibility extends CardImpl { this.addAbility(ability); // Enchanted creature can't be blocked except by Walls. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new CantBeBlockedByCreaturesAttachedEffect(Duration.WhileOnBattlefield, filter, AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/i/IriniSengir.java b/Mage.Sets/src/mage/cards/i/IriniSengir.java index 02205e11dbc..e8a2d6854f6 100644 --- a/Mage.Sets/src/mage/cards/i/IriniSengir.java +++ b/Mage.Sets/src/mage/cards/i/IriniSengir.java @@ -34,7 +34,7 @@ public final class IriniSengir extends CardImpl { this.toughness = new MageInt(2); // Green enchantment spells and white enchantment spells cost {2} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostIncreasingAllEffect(2, filter, TargetController.ANY)) ); } diff --git a/Mage.Sets/src/mage/cards/i/IvorytuskFortress.java b/Mage.Sets/src/mage/cards/i/IvorytuskFortress.java index 070eaa78547..35eb2fb9d65 100644 --- a/Mage.Sets/src/mage/cards/i/IvorytuskFortress.java +++ b/Mage.Sets/src/mage/cards/i/IvorytuskFortress.java @@ -26,7 +26,7 @@ public final class IvorytuskFortress extends CardImpl { this.toughness = new MageInt(7); // Untap each creature you control with a +1/+1 counter on it during each other player's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new UntapAllDuringEachOtherPlayersUntapStepEffect(StaticFilters.FILTER_EACH_CONTROLLED_CREATURE_P1P1))); } diff --git a/Mage.Sets/src/mage/cards/j/JadeLeech.java b/Mage.Sets/src/mage/cards/j/JadeLeech.java index a9f638b1184..c0224708f18 100644 --- a/Mage.Sets/src/mage/cards/j/JadeLeech.java +++ b/Mage.Sets/src/mage/cards/j/JadeLeech.java @@ -34,7 +34,7 @@ public final class JadeLeech extends CardImpl { this.toughness = new MageInt(5); // Green spells you cast cost {G} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostIncreasingAllEffect(new ManaCostsImpl<>("{G}"), filter, TargetController.YOU))); } diff --git a/Mage.Sets/src/mage/cards/j/JeskaiRunemark.java b/Mage.Sets/src/mage/cards/j/JeskaiRunemark.java index 71e0f2475ef..8680fd898d1 100644 --- a/Mage.Sets/src/mage/cards/j/JeskaiRunemark.java +++ b/Mage.Sets/src/mage/cards/j/JeskaiRunemark.java @@ -51,7 +51,7 @@ public final class JeskaiRunemark extends CardImpl { // Enchanted creature gets +2/+2. this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // Enchanted creature has flying as long as you control a red or white permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA), new PermanentsOnTheBattlefieldCondition(filter), "Enchanted creature has flying as long as you control a red or white permanent"))); } diff --git a/Mage.Sets/src/mage/cards/j/JhoirasFamiliar.java b/Mage.Sets/src/mage/cards/j/JhoirasFamiliar.java index 262b18c722f..9d1c4a37870 100644 --- a/Mage.Sets/src/mage/cards/j/JhoirasFamiliar.java +++ b/Mage.Sets/src/mage/cards/j/JhoirasFamiliar.java @@ -30,7 +30,7 @@ public final class JhoirasFamiliar extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Historic spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostReductionControllerEffect(new FilterHistoricCard(), 1) .setText("Historic spells you cast cost {1} less to cast. (Artifacts, legendaries, and Sagas are historic.)"))); } diff --git a/Mage.Sets/src/mage/cards/j/JinGitaxiasCoreAugur.java b/Mage.Sets/src/mage/cards/j/JinGitaxiasCoreAugur.java index fa9c181f7ed..e1a52558e3b 100644 --- a/Mage.Sets/src/mage/cards/j/JinGitaxiasCoreAugur.java +++ b/Mage.Sets/src/mage/cards/j/JinGitaxiasCoreAugur.java @@ -35,7 +35,7 @@ public final class JinGitaxiasCoreAugur extends CardImpl { this.addAbility(new BeginningOfEndStepTriggeredAbility(new DrawCardSourceControllerEffect(7))); // Each opponent's maximum hand size is reduced by seven. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new MaximumHandSizeControllerEffect(7, Duration.WhileOnBattlefield, HandSizeModification.REDUCE, TargetController.OPPONENT))); } diff --git a/Mage.Sets/src/mage/cards/j/JoragaTreespeaker.java b/Mage.Sets/src/mage/cards/j/JoragaTreespeaker.java index 47e92d67f2d..77fc965e7f0 100644 --- a/Mage.Sets/src/mage/cards/j/JoragaTreespeaker.java +++ b/Mage.Sets/src/mage/cards/j/JoragaTreespeaker.java @@ -56,7 +56,7 @@ public final class JoragaTreespeaker extends LevelerCard { // 1/4 // Elves you control have "{T}: Add {G}{G}." Abilities abilities2 = new AbilitiesImpl<>(); - abilities2.add(new SimpleStaticAbility(Zone.BATTLEFIELD, + abilities2.add(new SimpleStaticAbility( new GainAbilityControlledEffect(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana(2), new TapSourceCost()), Duration.WhileOnBattlefield, filter))); diff --git a/Mage.Sets/src/mage/cards/j/JorubaiMurkLurker.java b/Mage.Sets/src/mage/cards/j/JorubaiMurkLurker.java index 539d0cc7f4a..4c1422b6558 100644 --- a/Mage.Sets/src/mage/cards/j/JorubaiMurkLurker.java +++ b/Mage.Sets/src/mage/cards/j/JorubaiMurkLurker.java @@ -43,7 +43,7 @@ public final class JorubaiMurkLurker extends CardImpl { this.toughness = new MageInt(3); // Jorubai Murk Lurker gets +1/+1 as long as you control a Swamp. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), rule))); diff --git a/Mage.Sets/src/mage/cards/j/JubilantSkybonder.java b/Mage.Sets/src/mage/cards/j/JubilantSkybonder.java index ee0d7622b27..185eb565b2d 100644 --- a/Mage.Sets/src/mage/cards/j/JubilantSkybonder.java +++ b/Mage.Sets/src/mage/cards/j/JubilantSkybonder.java @@ -41,7 +41,7 @@ public final class JubilantSkybonder extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Creatures you control with flying have "Spells your opponents cast that target this creature cost {2} more to cast." - Ability gainAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, + Ability gainAbility = new SimpleStaticAbility( new SpellsCostModificationThatTargetSourceEffect(2, new FilterCard("Spells"), TargetController.OPPONENT) .withTargetName("this creature") ); diff --git a/Mage.Sets/src/mage/cards/k/KavuRunner.java b/Mage.Sets/src/mage/cards/k/KavuRunner.java index 45c08991051..d1336ed8f34 100644 --- a/Mage.Sets/src/mage/cards/k/KavuRunner.java +++ b/Mage.Sets/src/mage/cards/k/KavuRunner.java @@ -42,7 +42,7 @@ public final class KavuRunner extends CardImpl { this.toughness = new MageInt(3); // Kavu Runner has haste as long as no opponent controls a white or blue creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield), new InvertCondition(new PermanentsOnTheBattlefieldCondition(filter, false)), "{this} has haste as long as no opponent controls a white or blue creature"))); diff --git a/Mage.Sets/src/mage/cards/k/KessDissidentMage.java b/Mage.Sets/src/mage/cards/k/KessDissidentMage.java index 985256280ea..64f349b7699 100644 --- a/Mage.Sets/src/mage/cards/k/KessDissidentMage.java +++ b/Mage.Sets/src/mage/cards/k/KessDissidentMage.java @@ -40,7 +40,7 @@ public final class KessDissidentMage extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // During each of your turns, you may cast an instant or sorcery card from your graveyard. If a card cast this way would be put into your graveyard this turn, exile it instead. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleStaticAbility( new KessDissidentMageCastFromGraveyardEffect()) .setIdentifier(MageIdentifier.KessDissidentMageWatcher); ability.addEffect(new KessDissidentMageReplacementEffect()); diff --git a/Mage.Sets/src/mage/cards/k/KessigDireSwine.java b/Mage.Sets/src/mage/cards/k/KessigDireSwine.java index f05a298d589..06cc7633207 100644 --- a/Mage.Sets/src/mage/cards/k/KessigDireSwine.java +++ b/Mage.Sets/src/mage/cards/k/KessigDireSwine.java @@ -29,7 +29,7 @@ public final class KessigDireSwine extends CardImpl { this.toughness = new MageInt(6); // Delirium — Kessig Dire Swine has trample as long as there are four or more card types among cards in your graveyard. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield), DeliriumCondition.instance, "Delirium — {this} has trample as long as there are four or more card types among cards in your graveyard")) .addHint(CardTypesInGraveyardHint.YOU)); diff --git a/Mage.Sets/src/mage/cards/k/KirdApe.java b/Mage.Sets/src/mage/cards/k/KirdApe.java index 9ffd0f3a738..e9e5695145e 100644 --- a/Mage.Sets/src/mage/cards/k/KirdApe.java +++ b/Mage.Sets/src/mage/cards/k/KirdApe.java @@ -37,7 +37,7 @@ public final class KirdApe extends CardImpl { this.toughness = new MageInt(1); // Kird Ape gets +1/+2 as long as you control a Forest. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(1, 2, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), rule))); } diff --git a/Mage.Sets/src/mage/cards/k/KirdChieftain.java b/Mage.Sets/src/mage/cards/k/KirdChieftain.java index 7886ed3990a..b6ea9a296dd 100644 --- a/Mage.Sets/src/mage/cards/k/KirdChieftain.java +++ b/Mage.Sets/src/mage/cards/k/KirdChieftain.java @@ -45,7 +45,7 @@ public final class KirdChieftain extends CardImpl { this.toughness = new MageInt(3); // Kird Chieftain gets +1/+1 as long as you control a Forest. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), rule))); diff --git a/Mage.Sets/src/mage/cards/l/Lignify.java b/Mage.Sets/src/mage/cards/l/Lignify.java index b30eedf74bc..1fba2f3fc4a 100644 --- a/Mage.Sets/src/mage/cards/l/Lignify.java +++ b/Mage.Sets/src/mage/cards/l/Lignify.java @@ -37,7 +37,7 @@ public final class Lignify extends CardImpl { this.addAbility(ability); // Enchanted creature is a Treefolk with base power and toughness 0/4 and loses all abilities. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BecomesCreatureAttachedEffect(new CreatureToken(0, 4, "0/4 Treefolk creature", SubType.TREEFOLK), "Enchanted creature is a Treefolk with base power and toughness 0/4 and loses all abilities", Duration.WhileOnBattlefield, BecomesCreatureAttachedEffect.LoseType.ABILITIES_SUBTYPE))); diff --git a/Mage.Sets/src/mage/cards/l/LoamLion.java b/Mage.Sets/src/mage/cards/l/LoamLion.java index 781b92911db..7c6ac7cf387 100644 --- a/Mage.Sets/src/mage/cards/l/LoamLion.java +++ b/Mage.Sets/src/mage/cards/l/LoamLion.java @@ -37,7 +37,7 @@ public final class LoamLion extends CardImpl { this.toughness = new MageInt(1); // Loam Lion gets +1/+2 as long as you control a Forest. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(1, 2, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), rule))); } diff --git a/Mage.Sets/src/mage/cards/l/LocustMiser.java b/Mage.Sets/src/mage/cards/l/LocustMiser.java index ccbeedba8d7..cdf51fdfe4a 100644 --- a/Mage.Sets/src/mage/cards/l/LocustMiser.java +++ b/Mage.Sets/src/mage/cards/l/LocustMiser.java @@ -36,7 +36,7 @@ public final class LocustMiser extends CardImpl { this.toughness = new MageInt(2); // Each opponent's maximum hand size is reduced by two. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new MaximumHandSizeControllerEffect(2, Duration.WhileOnBattlefield, HandSizeModification.REDUCE, TargetController.OPPONENT))); } diff --git a/Mage.Sets/src/mage/cards/l/LootExuberantExplorer.java b/Mage.Sets/src/mage/cards/l/LootExuberantExplorer.java index c87f1c9db44..93803d030d3 100644 --- a/Mage.Sets/src/mage/cards/l/LootExuberantExplorer.java +++ b/Mage.Sets/src/mage/cards/l/LootExuberantExplorer.java @@ -41,7 +41,7 @@ public final class LootExuberantExplorer extends CardImpl { this.toughness = new MageInt(4); // You may play an additional land on each of your turns. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new PlayAdditionalLandsControllerEffect(1, Duration.WhileOnBattlefield))); // {4}{G}{G}, {T}: Look at the top six cards of your library. You may reveal a creature card with mana value less than or equal to the number of lands you control from among them and put it onto the battlefield. Put the rest on the bottom in a random order. diff --git a/Mage.Sets/src/mage/cards/l/LustForWar.java b/Mage.Sets/src/mage/cards/l/LustForWar.java index afc7a796615..57bf92941f4 100644 --- a/Mage.Sets/src/mage/cards/l/LustForWar.java +++ b/Mage.Sets/src/mage/cards/l/LustForWar.java @@ -41,7 +41,7 @@ public final class LustForWar extends CardImpl { this.addAbility(new BecomesTappedAttachedTriggeredAbility(new DamageAttachedControllerEffect(3), "enchanted creature")); // Enchanted creature attacks each turn if able. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new AttacksIfAbleAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/m/MaelstromWanderer.java b/Mage.Sets/src/mage/cards/m/MaelstromWanderer.java index a9d65b8d37a..4f6b718a133 100644 --- a/Mage.Sets/src/mage/cards/m/MaelstromWanderer.java +++ b/Mage.Sets/src/mage/cards/m/MaelstromWanderer.java @@ -26,7 +26,7 @@ public final class MaelstromWanderer extends CardImpl { this.toughness = new MageInt(5); // Creatures you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_CONTROLLED_CREATURES, false))); // Cascade this.addAbility(new CascadeAbility(false)); diff --git a/Mage.Sets/src/mage/cards/m/MagmaSliver.java b/Mage.Sets/src/mage/cards/m/MagmaSliver.java index 33de3be8636..a66838798d0 100644 --- a/Mage.Sets/src/mage/cards/m/MagmaSliver.java +++ b/Mage.Sets/src/mage/cards/m/MagmaSliver.java @@ -49,7 +49,7 @@ public final class MagmaSliver extends CardImpl { StaticFilters.FILTER_PERMANENT_ALL_SLIVERS); effect.setText("All Slivers have \"{T}: Target Sliver creature gets +X/+0 until end of turn, " + "where X is the number of Slivers on the battlefield.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( effect)); } diff --git a/Mage.Sets/src/mage/cards/m/MarchesaTheBlackRose.java b/Mage.Sets/src/mage/cards/m/MarchesaTheBlackRose.java index f0891a7d7a5..e4358d79f2b 100644 --- a/Mage.Sets/src/mage/cards/m/MarchesaTheBlackRose.java +++ b/Mage.Sets/src/mage/cards/m/MarchesaTheBlackRose.java @@ -44,7 +44,7 @@ public final class MarchesaTheBlackRose extends CardImpl { this.addAbility(new DethroneAbility()); // Other creatures you control have dethrone. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(new DethroneAbility(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, true))); // Whenever a creature you control with a +1/+1 counter on it dies, return that card to the battlefield under your control at the beginning of the next end step. diff --git a/Mage.Sets/src/mage/cards/m/MarduRunemark.java b/Mage.Sets/src/mage/cards/m/MarduRunemark.java index f89367f59f3..0ef6bd27845 100644 --- a/Mage.Sets/src/mage/cards/m/MarduRunemark.java +++ b/Mage.Sets/src/mage/cards/m/MarduRunemark.java @@ -51,7 +51,7 @@ public final class MarduRunemark extends CardImpl { // Enchanted creature gets +2/+2. 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, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA), new PermanentsOnTheBattlefieldCondition(filter), "Enchanted creature has first strike as long as you control a white or black permanent"))); } diff --git a/Mage.Sets/src/mage/cards/m/MesmericSliver.java b/Mage.Sets/src/mage/cards/m/MesmericSliver.java index 8f3c781ca5d..c78b10f6ab4 100644 --- a/Mage.Sets/src/mage/cards/m/MesmericSliver.java +++ b/Mage.Sets/src/mage/cards/m/MesmericSliver.java @@ -37,7 +37,7 @@ public final class MesmericSliver extends CardImpl { // All Slivers have "When this permanent enters the battlefield, you may fateseal 1." Ability ability = new EntersBattlefieldTriggeredAbility(new FatesealEffect(1), true); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, filterSliver, "All Slivers have \"When this permanent enters the battlefield, you may fateseal 1.\" (To fateseal 1, its controller looks at the top card of an opponent's library, then they may put that card on the bottom of that library.)"))); } diff --git a/Mage.Sets/src/mage/cards/m/MinamoScrollkeeper.java b/Mage.Sets/src/mage/cards/m/MinamoScrollkeeper.java index 28c722a0d2a..221272df9ab 100644 --- a/Mage.Sets/src/mage/cards/m/MinamoScrollkeeper.java +++ b/Mage.Sets/src/mage/cards/m/MinamoScrollkeeper.java @@ -32,7 +32,7 @@ public final class MinamoScrollkeeper extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // Your maximum hand size is increased by one. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new MaximumHandSizeControllerEffect(1, Duration.WhileOnBattlefield, HandSizeModification.INCREASE))); } diff --git a/Mage.Sets/src/mage/cards/m/MindwhipSliver.java b/Mage.Sets/src/mage/cards/m/MindwhipSliver.java index 949d6c04942..fad7bd7ae03 100644 --- a/Mage.Sets/src/mage/cards/m/MindwhipSliver.java +++ b/Mage.Sets/src/mage/cards/m/MindwhipSliver.java @@ -39,7 +39,7 @@ public final class MindwhipSliver extends CardImpl { // All Slivers have "{2}, Sacrifice this permanent: Target player discards a card at random. Activate this ability only any time you could cast a sorcery." Ability gainedAbility = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1, true), new GenericManaCost(2)); gainedAbility.addCost(new SacrificeSourceCost()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(gainedAbility, Duration.WhileOnBattlefield, filter, "All Slivers have \"{2}, Sacrifice this permanent: Target player discards a card at random. Activate only as a sorcery.\""))); } diff --git a/Mage.Sets/src/mage/cards/m/MineMineMine.java b/Mage.Sets/src/mage/cards/m/MineMineMine.java index 12da0746793..ae23cbd8684 100644 --- a/Mage.Sets/src/mage/cards/m/MineMineMine.java +++ b/Mage.Sets/src/mage/cards/m/MineMineMine.java @@ -37,7 +37,7 @@ public final class MineMineMine extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new MineMineMineDrawEffect())); // Players have no maximum hand size and don't lose the game for drawing from an empty library. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( 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(new MineMineMineDontLoseEffect())); diff --git a/Mage.Sets/src/mage/cards/m/MudTrooper.java b/Mage.Sets/src/mage/cards/m/MudTrooper.java index 4c4be3360d0..6ba5f9c4b6c 100644 --- a/Mage.Sets/src/mage/cards/m/MudTrooper.java +++ b/Mage.Sets/src/mage/cards/m/MudTrooper.java @@ -41,7 +41,7 @@ public final class MudTrooper extends CardImpl { new BoostSourceEffect(1, 1, Duration.EndOfTurn) .setText("This creature gets +1/+1 until end of turn"), new GenericManaCost(2)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(ability, Duration.WhileOnBattlefield, filter, false) .withForceQuotes() )); diff --git a/Mage.Sets/src/mage/cards/m/MultaniYavimayasAvatar.java b/Mage.Sets/src/mage/cards/m/MultaniYavimayasAvatar.java index bf60fab27f7..dd824b2f204 100644 --- a/Mage.Sets/src/mage/cards/m/MultaniYavimayasAvatar.java +++ b/Mage.Sets/src/mage/cards/m/MultaniYavimayasAvatar.java @@ -47,7 +47,7 @@ public final class MultaniYavimayasAvatar extends CardImpl { PermanentsOnBattlefieldCount permanentsOnBattlefieldCount = new PermanentsOnBattlefieldCount(LANDS_YOU_CONTROL_FILTER); DynamicValue powerToughnessValue = new AdditiveDynamicValue(graveyardCount, permanentsOnBattlefieldCount); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostSourceEffect(powerToughnessValue, powerToughnessValue, Duration.WhileOnBattlefield) .setText("{this} gets +1/+1 for each land you control and each land card in your graveyard") )); diff --git a/Mage.Sets/src/mage/cards/m/MyojinOfLifesWeb.java b/Mage.Sets/src/mage/cards/m/MyojinOfLifesWeb.java index fc082b63635..6d96b0a8ab1 100644 --- a/Mage.Sets/src/mage/cards/m/MyojinOfLifesWeb.java +++ b/Mage.Sets/src/mage/cards/m/MyojinOfLifesWeb.java @@ -45,7 +45,7 @@ public final class MyojinOfLifesWeb extends CardImpl { // Myojin of Life's Web 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 Life's Web has indestructible as long as it has a divinity counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + 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 Life's Web: Put any number of creature cards from your hand onto the battlefield. diff --git a/Mage.Sets/src/mage/cards/m/MyrGalvanizer.java b/Mage.Sets/src/mage/cards/m/MyrGalvanizer.java index 7fcc336f4fb..b2a2e929471 100644 --- a/Mage.Sets/src/mage/cards/m/MyrGalvanizer.java +++ b/Mage.Sets/src/mage/cards/m/MyrGalvanizer.java @@ -35,7 +35,7 @@ public final class MyrGalvanizer extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); // Other Myr creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); // {1}, {T}: Untap each other Myr you control. diff --git a/Mage.Sets/src/mage/cards/n/NecroticSliver.java b/Mage.Sets/src/mage/cards/n/NecroticSliver.java index d14976817d7..ad78e73389d 100644 --- a/Mage.Sets/src/mage/cards/n/NecroticSliver.java +++ b/Mage.Sets/src/mage/cards/n/NecroticSliver.java @@ -36,7 +36,7 @@ public final class NecroticSliver extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); ability.addCost(new GenericManaCost(3)); ability.addTarget(new TargetPermanent()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS, "All Slivers have \"{3}, Sacrifice this permanent: Destroy target permanent.\""))); diff --git a/Mage.Sets/src/mage/cards/n/NemesisMask.java b/Mage.Sets/src/mage/cards/n/NemesisMask.java index ae28d24825d..3158de02e86 100644 --- a/Mage.Sets/src/mage/cards/n/NemesisMask.java +++ b/Mage.Sets/src/mage/cards/n/NemesisMask.java @@ -26,7 +26,7 @@ public final class NemesisMask extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // All creatures able to block equipped creature do so. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new MustBeBlockedByAllAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.EQUIPMENT))); // Equip {3} diff --git a/Mage.Sets/src/mage/cards/n/NimDevourer.java b/Mage.Sets/src/mage/cards/n/NimDevourer.java index 88256534f03..62146fa374c 100644 --- a/Mage.Sets/src/mage/cards/n/NimDevourer.java +++ b/Mage.Sets/src/mage/cards/n/NimDevourer.java @@ -31,7 +31,7 @@ public final class NimDevourer extends CardImpl { this.toughness = new MageInt(1); // Nim Devourer gets +1/+0 for each artifact you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostSourceEffect(ArtifactYouControlCount.instance, StaticValue.get(0), Duration.WhileOnBattlefield)) .addHint(ArtifactYouControlHint.instance) ); diff --git a/Mage.Sets/src/mage/cards/n/NimGrotesque.java b/Mage.Sets/src/mage/cards/n/NimGrotesque.java index e2ca99e5f4c..230cc4ef73c 100644 --- a/Mage.Sets/src/mage/cards/n/NimGrotesque.java +++ b/Mage.Sets/src/mage/cards/n/NimGrotesque.java @@ -28,7 +28,7 @@ public final class NimGrotesque extends CardImpl { this.toughness = new MageInt(6); // Nim Grotesque gets +1/+0 for each artifact you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostSourceEffect(ArtifactYouControlCount.instance, StaticValue.get(0), Duration.WhileOnBattlefield)) .addHint(ArtifactYouControlHint.instance) ); diff --git a/Mage.Sets/src/mage/cards/n/NullProfusion.java b/Mage.Sets/src/mage/cards/n/NullProfusion.java index 67dc0a9641e..355d1315c45 100644 --- a/Mage.Sets/src/mage/cards/n/NullProfusion.java +++ b/Mage.Sets/src/mage/cards/n/NullProfusion.java @@ -33,7 +33,7 @@ public final class NullProfusion extends CardImpl { new DrawCardSourceControllerEffect(1))); // Your maximum hand size is two. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new MaximumHandSizeControllerEffect( StaticValue.get(2), Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/p/ParadiseMantle.java b/Mage.Sets/src/mage/cards/p/ParadiseMantle.java index 6e594a40e97..aeaa22683f3 100644 --- a/Mage.Sets/src/mage/cards/p/ParadiseMantle.java +++ b/Mage.Sets/src/mage/cards/p/ParadiseMantle.java @@ -28,7 +28,7 @@ public final class ParadiseMantle extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has "{T}: Add one mana of any color." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAttachedEffect(new AnyColorManaAbility(new TapSourceCost()), AttachmentType.EQUIPMENT, Duration.WhileOnBattlefield))); // Equip {1} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1), false)); diff --git a/Mage.Sets/src/mage/cards/p/PollenbrightWings.java b/Mage.Sets/src/mage/cards/p/PollenbrightWings.java index 228c56e88cb..28e5da7f320 100644 --- a/Mage.Sets/src/mage/cards/p/PollenbrightWings.java +++ b/Mage.Sets/src/mage/cards/p/PollenbrightWings.java @@ -45,7 +45,7 @@ public final class PollenbrightWings extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield))); // Whenever enchanted creature deals combat damage to a player, create that many 1/1 green Saproling creature tokens. this.addAbility(new PollenbrightWingsAbility()); diff --git a/Mage.Sets/src/mage/cards/p/PoulticeSliver.java b/Mage.Sets/src/mage/cards/p/PoulticeSliver.java index b1a3629dffc..a723abbee14 100644 --- a/Mage.Sets/src/mage/cards/p/PoulticeSliver.java +++ b/Mage.Sets/src/mage/cards/p/PoulticeSliver.java @@ -37,7 +37,7 @@ public final class PoulticeSliver extends CardImpl { ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ALL_SLIVERS)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS, "All Slivers have \"{2}, {T}: Regenerate target Sliver.\""))); diff --git a/Mage.Sets/src/mage/cards/p/PredatorySliver.java b/Mage.Sets/src/mage/cards/p/PredatorySliver.java index d642c6e97ff..94d7cee9e40 100644 --- a/Mage.Sets/src/mage/cards/p/PredatorySliver.java +++ b/Mage.Sets/src/mage/cards/p/PredatorySliver.java @@ -27,7 +27,7 @@ public final class PredatorySliver extends CardImpl { this.toughness = new MageInt(1); // Sliver creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostControlledEffect(1, 1, Duration.WhileInGraveyard, StaticFilters.FILTER_PERMANENT_SLIVERS))); } diff --git a/Mage.Sets/src/mage/cards/p/PristineAngel.java b/Mage.Sets/src/mage/cards/p/PristineAngel.java index 51ac8ae3a7f..5e997d5d86c 100644 --- a/Mage.Sets/src/mage/cards/p/PristineAngel.java +++ b/Mage.Sets/src/mage/cards/p/PristineAngel.java @@ -51,7 +51,7 @@ public final class PristineAngel extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // As long as Pristine Angel is untapped, it has protection from artifacts and from all colors. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect( new GainAbilitySourceEffect(new ProtectionAbility(filter), Duration.WhileOnBattlefield), SourceTappedCondition.UNTAPPED, diff --git a/Mage.Sets/src/mage/cards/p/PrizedElephant.java b/Mage.Sets/src/mage/cards/p/PrizedElephant.java index 8c3ad3f8fcd..f1dbf3af72f 100644 --- a/Mage.Sets/src/mage/cards/p/PrizedElephant.java +++ b/Mage.Sets/src/mage/cards/p/PrizedElephant.java @@ -42,7 +42,7 @@ public final class PrizedElephant extends CardImpl { this.toughness = new MageInt(3); // Prized Elephant gets +1/+1 as long as you control a Forest. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), rule))); diff --git a/Mage.Sets/src/mage/cards/p/ProwlersHelm.java b/Mage.Sets/src/mage/cards/p/ProwlersHelm.java index 4cf7e1c14e8..49bc7c97b14 100644 --- a/Mage.Sets/src/mage/cards/p/ProwlersHelm.java +++ b/Mage.Sets/src/mage/cards/p/ProwlersHelm.java @@ -28,7 +28,7 @@ public final class ProwlersHelm extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature can't be blocked except by Walls. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new CantBeBlockedByCreaturesAttachedEffect(Duration.WhileOnBattlefield, filter, AttachmentType.EQUIPMENT))); // Equip {2} diff --git a/Mage.Sets/src/mage/cards/p/PterodonKnight.java b/Mage.Sets/src/mage/cards/p/PterodonKnight.java index 7b185240136..228ddb04169 100644 --- a/Mage.Sets/src/mage/cards/p/PterodonKnight.java +++ b/Mage.Sets/src/mage/cards/p/PterodonKnight.java @@ -37,7 +37,7 @@ public final class PterodonKnight extends CardImpl { this.toughness = new MageInt(3); // Pterodon Knight has flying as long as you control a Dinosaur. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "{this} has flying as long as you control a Dinosaur"))); } diff --git a/Mage.Sets/src/mage/cards/q/QuicksilverDagger.java b/Mage.Sets/src/mage/cards/q/QuicksilverDagger.java index 2a18f339195..69b83129fa1 100644 --- a/Mage.Sets/src/mage/cards/q/QuicksilverDagger.java +++ b/Mage.Sets/src/mage/cards/q/QuicksilverDagger.java @@ -44,7 +44,7 @@ public final class QuicksilverDagger extends CardImpl { Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); gainAbility.addTarget(new TargetPlayerOrPlaneswalker()); gainAbility.addEffect(new DrawCardSourceControllerEffect(1)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{T}: This creature deals 1 damage to target player or planeswalker. You draw a card.\"") )); diff --git a/Mage.Sets/src/mage/cards/q/QuilledSliver.java b/Mage.Sets/src/mage/cards/q/QuilledSliver.java index 61f23451f6c..82cc91da7a6 100644 --- a/Mage.Sets/src/mage/cards/q/QuilledSliver.java +++ b/Mage.Sets/src/mage/cards/q/QuilledSliver.java @@ -39,7 +39,7 @@ public final class QuilledSliver extends CardImpl { // All Slivers have "{tap}: This permanent deals 1 damage to target attacking or blocking creature." Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, filter, "All Slivers have \"{T}: This permanent deals 1 damage to target attacking or blocking creature.\""))); diff --git a/Mage.Sets/src/mage/cards/r/RadiantEssence.java b/Mage.Sets/src/mage/cards/r/RadiantEssence.java index dc3b2f1846f..51bf2d3c13c 100644 --- a/Mage.Sets/src/mage/cards/r/RadiantEssence.java +++ b/Mage.Sets/src/mage/cards/r/RadiantEssence.java @@ -36,7 +36,7 @@ public final class RadiantEssence extends CardImpl { this.toughness = new MageInt(3); // Radiant Essence gets +1/+2 as long as an opponent controls a black permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(1, 2, Duration.WhileOnBattlefield), new OpponentControlsPermanentCondition(filter), "{this} gets +1/+2 as long as an opponent controls a black permanent"))); diff --git a/Mage.Sets/src/mage/cards/r/RaffCapashenShipsMage.java b/Mage.Sets/src/mage/cards/r/RaffCapashenShipsMage.java index 846eb81f859..429b65d64e0 100644 --- a/Mage.Sets/src/mage/cards/r/RaffCapashenShipsMage.java +++ b/Mage.Sets/src/mage/cards/r/RaffCapashenShipsMage.java @@ -45,7 +45,7 @@ public final class RaffCapashenShipsMage extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // You may cast historic spells as though they had flash. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter, false) .setText("You may cast historic spells as though they had flash. (Artifacts, legendaries, and Sagas are historic.)"))); } diff --git a/Mage.Sets/src/mage/cards/r/Rageform.java b/Mage.Sets/src/mage/cards/r/Rageform.java index e5e8f5bd89a..b35dd7c8546 100644 --- a/Mage.Sets/src/mage/cards/r/Rageform.java +++ b/Mage.Sets/src/mage/cards/r/Rageform.java @@ -27,7 +27,7 @@ public final class Rageform extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new BecomesAuraAttachToManifestSourceEffect())); // Enchanted creature has double strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAttachedEffect(DoubleStrikeAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/r/RampagingCyclops.java b/Mage.Sets/src/mage/cards/r/RampagingCyclops.java index e74e37ab86c..a715a3591aa 100644 --- a/Mage.Sets/src/mage/cards/r/RampagingCyclops.java +++ b/Mage.Sets/src/mage/cards/r/RampagingCyclops.java @@ -32,7 +32,7 @@ public final class RampagingCyclops extends CardImpl { this.toughness = new MageInt(4); // Rampaging Cyclops gets -2/-0 as long as two or more creatures are blocking it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect( new BoostSourceEffect(-2, 0, Duration.WhileOnBattlefield), RampagingCyclopsCondition.instance, diff --git a/Mage.Sets/src/mage/cards/r/RangeTrooper.java b/Mage.Sets/src/mage/cards/r/RangeTrooper.java index fcf16b4dca6..2ab5d352f21 100644 --- a/Mage.Sets/src/mage/cards/r/RangeTrooper.java +++ b/Mage.Sets/src/mage/cards/r/RangeTrooper.java @@ -43,7 +43,7 @@ public final class RangeTrooper extends CardImpl { // Trooper creatures you control have "When this creature enters that battlefield, you may exile target creature. Return that creature to the battlefield at the beginning of the next end step." Ability ability = new EntersBattlefieldTriggeredAbility(new RangeTrooperEffect(), true); ability.addTarget(new TargetCreaturePermanent()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(ability, Duration.WhileOnBattlefield, filter, false))); } diff --git a/Mage.Sets/src/mage/cards/r/RatColony.java b/Mage.Sets/src/mage/cards/r/RatColony.java index 619c6a21391..7a339ac92dc 100644 --- a/Mage.Sets/src/mage/cards/r/RatColony.java +++ b/Mage.Sets/src/mage/cards/r/RatColony.java @@ -38,7 +38,7 @@ public final class RatColony extends CardImpl { this.toughness = new MageInt(1); // Rat Colony gets +1/+0 for each other Rat you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), StaticValue.get(0), Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/r/RegisaurAlpha.java b/Mage.Sets/src/mage/cards/r/RegisaurAlpha.java index b06cbab4260..8fe80bae341 100644 --- a/Mage.Sets/src/mage/cards/r/RegisaurAlpha.java +++ b/Mage.Sets/src/mage/cards/r/RegisaurAlpha.java @@ -39,7 +39,7 @@ public final class RegisaurAlpha extends CardImpl { this.toughness = new MageInt(4); // Other Dinosaurs you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter, true))); // When Regisaur Alpha enters the battlefield, create a 3/3 green Dinosaur creature token with trample. diff --git a/Mage.Sets/src/mage/cards/r/RelicRunner.java b/Mage.Sets/src/mage/cards/r/RelicRunner.java index ac63de39ef5..4f836100f0f 100644 --- a/Mage.Sets/src/mage/cards/r/RelicRunner.java +++ b/Mage.Sets/src/mage/cards/r/RelicRunner.java @@ -35,7 +35,7 @@ public final class RelicRunner extends CardImpl { this.toughness = new MageInt(1); // Relic Runner can't be blocked if you've cast an historic spell this turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect( new GainAbilitySourceEffect(new CantBeBlockedSourceAbility(), Duration.WhileOnBattlefield), new CastHistoricSpellThisTurnCondition(), diff --git a/Mage.Sets/src/mage/cards/r/Retaliation.java b/Mage.Sets/src/mage/cards/r/Retaliation.java index 16253cc2b83..a8febe2d5c5 100644 --- a/Mage.Sets/src/mage/cards/r/Retaliation.java +++ b/Mage.Sets/src/mage/cards/r/Retaliation.java @@ -32,7 +32,7 @@ public final class Retaliation extends CardImpl { Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES); effect.setText("Creatures you control have \"Whenever this creature becomes blocked by a creature, " + "this creature gets +1/+1 until end of turn.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( effect)); } diff --git a/Mage.Sets/src/mage/cards/r/RiotTrooper.java b/Mage.Sets/src/mage/cards/r/RiotTrooper.java index fa6173f7666..0b7e7cfa73c 100644 --- a/Mage.Sets/src/mage/cards/r/RiotTrooper.java +++ b/Mage.Sets/src/mage/cards/r/RiotTrooper.java @@ -33,7 +33,7 @@ public final class RiotTrooper extends CardImpl { this.toughness = new MageInt(2); // Each trooper creature you control can block an additional creature each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new CanBlockAdditionalCreatureAllEffect(1, filter, Duration.WhileOnBattlefield) .setText("Each trooper creature you control can block an additional creature each combat"))); } diff --git a/Mage.Sets/src/mage/cards/r/RoshanHiddenMagister.java b/Mage.Sets/src/mage/cards/r/RoshanHiddenMagister.java index cd75a3282b6..fe2fc50bff4 100644 --- a/Mage.Sets/src/mage/cards/r/RoshanHiddenMagister.java +++ b/Mage.Sets/src/mage/cards/r/RoshanHiddenMagister.java @@ -51,7 +51,7 @@ public final class RoshanHiddenMagister extends CardImpl { ))); // Face-down creatures you control have menace. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,new GainAbilityControlledEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect( new MenaceAbility(false), Duration.WhileOnBattlefield, filter diff --git a/Mage.Sets/src/mage/cards/r/RubyLeech.java b/Mage.Sets/src/mage/cards/r/RubyLeech.java index 868ba44d266..f9b92e03a38 100644 --- a/Mage.Sets/src/mage/cards/r/RubyLeech.java +++ b/Mage.Sets/src/mage/cards/r/RubyLeech.java @@ -37,7 +37,7 @@ public final class RubyLeech extends CardImpl { // First strike this.addAbility(FirstStrikeAbility.getInstance()); // Red spells you cast cost {R} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostIncreasingAllEffect(new ManaCostsImpl<>("{R}"), filter, TargetController.YOU))); } diff --git a/Mage.Sets/src/mage/cards/r/RuhamDjinn.java b/Mage.Sets/src/mage/cards/r/RuhamDjinn.java index d38709bddde..5cd2a9322ce 100644 --- a/Mage.Sets/src/mage/cards/r/RuhamDjinn.java +++ b/Mage.Sets/src/mage/cards/r/RuhamDjinn.java @@ -34,7 +34,7 @@ public final class RuhamDjinn extends CardImpl { // // Ruham Djinn gets -2/-2 as long as white is the most common color among all permanents or is tied for most common. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(-2, -2, Duration.WhileOnBattlefield), new MostCommonColorCondition(new ObjectColor(ObjectColor.WHITE)), "{this} gets -2/-2 as long as white is the most common color among all permanents or is tied for most common"))); diff --git a/Mage.Sets/src/mage/cards/r/RuneTailKitsuneAscendant.java b/Mage.Sets/src/mage/cards/r/RuneTailKitsuneAscendant.java index 658cb7288fd..d077b26c783 100644 --- a/Mage.Sets/src/mage/cards/r/RuneTailKitsuneAscendant.java +++ b/Mage.Sets/src/mage/cards/r/RuneTailKitsuneAscendant.java @@ -87,7 +87,7 @@ class RuneTailEssence extends TokenImpl { color.setWhite(true); // Prevent all damage that would be dealt to creatures you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new PreventAllDamageToAllEffect(Duration.WhileOnBattlefield, StaticFilters.FILTER_CONTROLLED_CREATURES))); } diff --git a/Mage.Sets/src/mage/cards/r/RustedRelic.java b/Mage.Sets/src/mage/cards/r/RustedRelic.java index 17689395611..506c9ef6b90 100644 --- a/Mage.Sets/src/mage/cards/r/RustedRelic.java +++ b/Mage.Sets/src/mage/cards/r/RustedRelic.java @@ -22,7 +22,7 @@ public final class RustedRelic extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // Metalcraft — Rusted Relic is a 5/5 Golem artifact creature as long as you control three or more artifacts. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect( new BecomesCreatureSourceEffect(new RustedRelicToken(), CardType.ARTIFACT, Duration.WhileOnBattlefield), MetalcraftCondition.instance, diff --git a/Mage.Sets/src/mage/cards/r/RuthlessCullblade.java b/Mage.Sets/src/mage/cards/r/RuthlessCullblade.java index f7d387b3961..236fa52925e 100644 --- a/Mage.Sets/src/mage/cards/r/RuthlessCullblade.java +++ b/Mage.Sets/src/mage/cards/r/RuthlessCullblade.java @@ -26,7 +26,7 @@ public final class RuthlessCullblade extends CardImpl { this.toughness = new MageInt(1); // Ruthless Cullblade gets +2/+1 as long as an opponent has 10 or less life. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(2, 1, Duration.WhileOnBattlefield), new LifeCompareCondition(TargetController.OPPONENT, ComparisonType.OR_LESS, 10), "{this} gets +2/+1 as long as an opponent has 10 or less life."))); diff --git a/Mage.Sets/src/mage/cards/s/SapphireLeech.java b/Mage.Sets/src/mage/cards/s/SapphireLeech.java index 68dc78d5fc1..1f0315835f9 100644 --- a/Mage.Sets/src/mage/cards/s/SapphireLeech.java +++ b/Mage.Sets/src/mage/cards/s/SapphireLeech.java @@ -37,7 +37,7 @@ public final class SapphireLeech extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Blue spells you cast cost {U} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostIncreasingAllEffect(new ManaCostsImpl<>("{U}"), filter, TargetController.YOU))); } diff --git a/Mage.Sets/src/mage/cards/s/ScoriaCat.java b/Mage.Sets/src/mage/cards/s/ScoriaCat.java index d590cc447cd..4e6701030e1 100644 --- a/Mage.Sets/src/mage/cards/s/ScoriaCat.java +++ b/Mage.Sets/src/mage/cards/s/ScoriaCat.java @@ -36,7 +36,7 @@ public final class ScoriaCat extends CardImpl { this.toughness = new MageInt(3); // Scoria Cat gets +3/+3 as long as you control no untapped lands. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(3, 3, Duration.WhileOnBattlefield), new InvertCondition(new PermanentsOnTheBattlefieldCondition(filter)), "{this} gets +3/+3 as long as you control no untapped lands"))); diff --git a/Mage.Sets/src/mage/cards/s/ScreechingSliver.java b/Mage.Sets/src/mage/cards/s/ScreechingSliver.java index 9839b851990..2c6f5f63abb 100644 --- a/Mage.Sets/src/mage/cards/s/ScreechingSliver.java +++ b/Mage.Sets/src/mage/cards/s/ScreechingSliver.java @@ -35,7 +35,7 @@ public final class ScreechingSliver extends CardImpl { SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetPlayer()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, allSliversFilter, "All Slivers have \"{T}: Target player mills a card.\""))); } diff --git a/Mage.Sets/src/mage/cards/s/SeaLegs.java b/Mage.Sets/src/mage/cards/s/SeaLegs.java index 69ae710badb..35170cfaa76 100644 --- a/Mage.Sets/src/mage/cards/s/SeaLegs.java +++ b/Mage.Sets/src/mage/cards/s/SeaLegs.java @@ -41,7 +41,7 @@ public final class SeaLegs extends CardImpl { this.addAbility(ability); // Enchanted creature gets +0/+2 as long as it's a Pirate. Otherwise, it gets -2/-0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect( new BoostEnchantedEffect(0, 2), new BoostEnchantedEffect(-2, -0), diff --git a/Mage.Sets/src/mage/cards/s/SedgeSliver.java b/Mage.Sets/src/mage/cards/s/SedgeSliver.java index c70007555ba..81336897609 100644 --- a/Mage.Sets/src/mage/cards/s/SedgeSliver.java +++ b/Mage.Sets/src/mage/cards/s/SedgeSliver.java @@ -39,12 +39,12 @@ public final class SedgeSliver extends CardImpl { // All Sliver creatures have "This creature gets +1/+1 as long as you control a Swamp." Ability boost = new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filterSwamp, 1, 1)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(boost, Duration.WhileOnBattlefield, filter, "All Sliver creatures have \"This creature gets +1/+1 as long as you control a Swamp.\""))); // All Slivers have "{B}: Regenerate this permanent." Ability regenerate = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(regenerate, Duration.WhileOnBattlefield, filterSlivers, "All Slivers have \"{B}: Regenerate this permanent.\""))); } diff --git a/Mage.Sets/src/mage/cards/s/ShadowfaxLordOfHorses.java b/Mage.Sets/src/mage/cards/s/ShadowfaxLordOfHorses.java index d978a28a417..5eeb03f8b0a 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowfaxLordOfHorses.java +++ b/Mage.Sets/src/mage/cards/s/ShadowfaxLordOfHorses.java @@ -37,7 +37,7 @@ public final class ShadowfaxLordOfHorses extends CardImpl { this.toughness = new MageInt(4); // Horses you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter))); // Whenever Shadowfax, Lord of Horses attacks, you may put a creature card @@ -106,4 +106,4 @@ class ShadowfaxLordOfHorsesEffect extends OneShotEffect { return true; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/ShaperApprentice.java b/Mage.Sets/src/mage/cards/s/ShaperApprentice.java index ba0c0cde1cc..c8ff0ec5076 100644 --- a/Mage.Sets/src/mage/cards/s/ShaperApprentice.java +++ b/Mage.Sets/src/mage/cards/s/ShaperApprentice.java @@ -39,7 +39,7 @@ public final class ShaperApprentice extends CardImpl { this.toughness = new MageInt(1); // Shaper Apprentice has flying as long as you control another Merfolk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "{this} has flying as long as you control another Merfolk"))); } diff --git a/Mage.Sets/src/mage/cards/s/ShieldOfTheRealm.java b/Mage.Sets/src/mage/cards/s/ShieldOfTheRealm.java index 1e9c8b9edf1..ca1ad61c5e0 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldOfTheRealm.java +++ b/Mage.Sets/src/mage/cards/s/ShieldOfTheRealm.java @@ -27,7 +27,7 @@ public final class ShieldOfTheRealm extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // If a source would deal damage to equipped creature, prevent 2 of that damage. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new PreventDamageToAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.EQUIPMENT, 2, false))); // Equip {1} this.addAbility(new EquipAbility(Outcome.PreventDamage, new GenericManaCost(1), false)); diff --git a/Mage.Sets/src/mage/cards/s/ShieldingPlax.java b/Mage.Sets/src/mage/cards/s/ShieldingPlax.java index 1e7901cf1eb..4451f48e4ab 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldingPlax.java +++ b/Mage.Sets/src/mage/cards/s/ShieldingPlax.java @@ -46,7 +46,7 @@ public final class ShieldingPlax extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); // Enchanted creature can't be the target of spells or abilities your opponents control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new CantBeTargetedAttachedEffect(filter, Duration.WhileOnBattlefield, AttachmentType.AURA, TargetController.OPPONENT))); } diff --git a/Mage.Sets/src/mage/cards/s/Shimmer.java b/Mage.Sets/src/mage/cards/s/Shimmer.java index 9f2eb552b8b..d26f5439d57 100644 --- a/Mage.Sets/src/mage/cards/s/Shimmer.java +++ b/Mage.Sets/src/mage/cards/s/Shimmer.java @@ -28,7 +28,7 @@ public final class Shimmer extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseLandTypeEffect(Outcome.Detriment))); // Each land of the chosen type has phasing. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllOfChosenSubtypeEffect(PhasingAbility.getInstance(), Duration.WhileOnBattlefield, new FilterLandPermanent("Each land of the chosen type")))); } diff --git a/Mage.Sets/src/mage/cards/s/SidewinderSliver.java b/Mage.Sets/src/mage/cards/s/SidewinderSliver.java index 2ffb7a4ff66..6d638725dbe 100644 --- a/Mage.Sets/src/mage/cards/s/SidewinderSliver.java +++ b/Mage.Sets/src/mage/cards/s/SidewinderSliver.java @@ -34,7 +34,7 @@ public final class SidewinderSliver extends CardImpl { this.toughness = new MageInt(1); // All Sliver creatures have flanking. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(new FlankingAbility(), Duration.WhileOnBattlefield, filter, false) .setText("all Sliver creatures have flanking") )); diff --git a/Mage.Sets/src/mage/cards/s/SkinInvasion.java b/Mage.Sets/src/mage/cards/s/SkinInvasion.java index ea4a8eb81d7..418c9d540bc 100644 --- a/Mage.Sets/src/mage/cards/s/SkinInvasion.java +++ b/Mage.Sets/src/mage/cards/s/SkinInvasion.java @@ -44,7 +44,7 @@ public final class SkinInvasion extends CardImpl { this.addAbility(ability); // Enchanted creature attacks each combat if able. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new AttacksIfAbleAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.AURA))); // When enchanted creature dies, return Skin Invasion to the battlefield transformed under your control. diff --git a/Mage.Sets/src/mage/cards/s/SkittishKavu.java b/Mage.Sets/src/mage/cards/s/SkittishKavu.java index 86d2e590e2e..de150f7b51d 100644 --- a/Mage.Sets/src/mage/cards/s/SkittishKavu.java +++ b/Mage.Sets/src/mage/cards/s/SkittishKavu.java @@ -41,7 +41,7 @@ public final class SkittishKavu extends CardImpl { this.toughness = new MageInt(1); // Skittish Kavu gets +1/+1 as long as no opponent controls a white or blue creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new InvertCondition(new PermanentsOnTheBattlefieldCondition(filter, false)), "{this} gets +1/+1 as long as no opponent controls a white or blue creature"))); diff --git a/Mage.Sets/src/mage/cards/s/SkyriderTrainee.java b/Mage.Sets/src/mage/cards/s/SkyriderTrainee.java index ccccd64d333..ba0e4c1ea16 100644 --- a/Mage.Sets/src/mage/cards/s/SkyriderTrainee.java +++ b/Mage.Sets/src/mage/cards/s/SkyriderTrainee.java @@ -29,7 +29,7 @@ public final class SkyriderTrainee extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect( new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield), new EnchantedSourceCondition(), diff --git a/Mage.Sets/src/mage/cards/s/SnakeCultInitiation.java b/Mage.Sets/src/mage/cards/s/SnakeCultInitiation.java index 1bceefd48b1..64a9f444c6e 100644 --- a/Mage.Sets/src/mage/cards/s/SnakeCultInitiation.java +++ b/Mage.Sets/src/mage/cards/s/SnakeCultInitiation.java @@ -36,7 +36,7 @@ public final class SnakeCultInitiation extends CardImpl { this.addAbility(ability); // Enchanted creature has poisonous 3. this.addAbility( - new SimpleStaticAbility(Zone.BATTLEFIELD, + new SimpleStaticAbility( new GainAbilityAttachedEffect(new PoisonousAbility(3), AttachmentType.AURA) .setText("Enchanted creature has poisonous 3. " + "(Whenever it deals combat damage to a player, that player gets three poison counters. " + diff --git a/Mage.Sets/src/mage/cards/s/SnowTrooper.java b/Mage.Sets/src/mage/cards/s/SnowTrooper.java index 540d5560d3f..d3698354e28 100644 --- a/Mage.Sets/src/mage/cards/s/SnowTrooper.java +++ b/Mage.Sets/src/mage/cards/s/SnowTrooper.java @@ -28,7 +28,7 @@ public final class SnowTrooper extends CardImpl { this.toughness = new MageInt(2); // Trooper creatures you control have firststrike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.TROOPER, "Trooper creatures"), false))); } diff --git a/Mage.Sets/src/mage/cards/s/SpellbaneCentaur.java b/Mage.Sets/src/mage/cards/s/SpellbaneCentaur.java index 9c0d8a73004..ba4643d18f8 100644 --- a/Mage.Sets/src/mage/cards/s/SpellbaneCentaur.java +++ b/Mage.Sets/src/mage/cards/s/SpellbaneCentaur.java @@ -36,7 +36,7 @@ public final class SpellbaneCentaur extends CardImpl { this.toughness = new MageInt(2); // Creatures you control can't be the targets of blue spells or abilities from blue sources. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new CantBeTargetedAllEffect(StaticFilters.FILTER_CONTROLLED_CREATURES, filter, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/s/SpellwildOuphe.java b/Mage.Sets/src/mage/cards/s/SpellwildOuphe.java index 7380d63032c..ad9e37e79f5 100644 --- a/Mage.Sets/src/mage/cards/s/SpellwildOuphe.java +++ b/Mage.Sets/src/mage/cards/s/SpellwildOuphe.java @@ -25,7 +25,7 @@ public final class SpellwildOuphe extends CardImpl { this.toughness = new MageInt(3); // Spells that target Spellwild Ouphe cost {2} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostModificationThatTargetSourceEffect(-2, new FilterCard("Spells"), TargetController.ANY)) ); } @@ -38,4 +38,4 @@ public final class SpellwildOuphe extends CardImpl { public SpellwildOuphe copy() { return new SpellwildOuphe(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/SphereOfResistance.java b/Mage.Sets/src/mage/cards/s/SphereOfResistance.java index 6f3f49be0c0..da01ea7f09d 100644 --- a/Mage.Sets/src/mage/cards/s/SphereOfResistance.java +++ b/Mage.Sets/src/mage/cards/s/SphereOfResistance.java @@ -20,7 +20,7 @@ public final class SphereOfResistance extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // Spells cost {1} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostIncreasingAllEffect(1, new FilterCard("Spells"), TargetController.ANY)) ); } diff --git a/Mage.Sets/src/mage/cards/s/SphinxOfNewPrahv.java b/Mage.Sets/src/mage/cards/s/SphinxOfNewPrahv.java index 102695ce817..45a81add37f 100644 --- a/Mage.Sets/src/mage/cards/s/SphinxOfNewPrahv.java +++ b/Mage.Sets/src/mage/cards/s/SphinxOfNewPrahv.java @@ -34,7 +34,7 @@ public final class SphinxOfNewPrahv extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Spells your opponents cast that target Sphinx of New Prahv cost {2} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostModificationThatTargetSourceEffect(2, new FilterCard("Spells"), TargetController.OPPONENT)) ); } diff --git a/Mage.Sets/src/mage/cards/s/SpidersilkArmor.java b/Mage.Sets/src/mage/cards/s/SpidersilkArmor.java index b5d5c3e23f5..6111c8b853d 100644 --- a/Mage.Sets/src/mage/cards/s/SpidersilkArmor.java +++ b/Mage.Sets/src/mage/cards/s/SpidersilkArmor.java @@ -25,7 +25,7 @@ public final class SpidersilkArmor extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{G}"); // Creatures you control get +0/+1 and have reach. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleStaticAbility( new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityControlledEffect(ReachAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES); diff --git a/Mage.Sets/src/mage/cards/s/SpittingSliver.java b/Mage.Sets/src/mage/cards/s/SpittingSliver.java index 30a6b9753d0..2136029ac9e 100644 --- a/Mage.Sets/src/mage/cards/s/SpittingSliver.java +++ b/Mage.Sets/src/mage/cards/s/SpittingSliver.java @@ -34,7 +34,7 @@ public final class SpittingSliver extends CardImpl { // All Sliver creatures have first strike. Ability gainedAbility = FirstStrikeAbility.getInstance(); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(gainedAbility, Duration.WhileOnBattlefield, filter, "All Sliver creatures have first strike."))); } diff --git a/Mage.Sets/src/mage/cards/s/SpurGrappler.java b/Mage.Sets/src/mage/cards/s/SpurGrappler.java index 64b056d522b..26a2fcabc95 100644 --- a/Mage.Sets/src/mage/cards/s/SpurGrappler.java +++ b/Mage.Sets/src/mage/cards/s/SpurGrappler.java @@ -36,7 +36,7 @@ public final class SpurGrappler extends CardImpl { this.toughness = new MageInt(1); // Spur Grappler gets +2/+1 as long as you control no untapped lands. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(2, 1, Duration.WhileOnBattlefield), new InvertCondition(new PermanentsOnTheBattlefieldCondition(filter)), "{this} gets +2/+1 as long as you control no untapped lands"))); diff --git a/Mage.Sets/src/mage/cards/s/Squeeze.java b/Mage.Sets/src/mage/cards/s/Squeeze.java index 998c8da36f8..0e7a3b043da 100644 --- a/Mage.Sets/src/mage/cards/s/Squeeze.java +++ b/Mage.Sets/src/mage/cards/s/Squeeze.java @@ -26,7 +26,7 @@ public final class Squeeze extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}"); // Sorcery spells cost {3} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostIncreasingAllEffect(3, filter, TargetController.ANY)) ); } diff --git a/Mage.Sets/src/mage/cards/s/SteelformSliver.java b/Mage.Sets/src/mage/cards/s/SteelformSliver.java index 8e639460ab5..25f99fa32b2 100644 --- a/Mage.Sets/src/mage/cards/s/SteelformSliver.java +++ b/Mage.Sets/src/mage/cards/s/SteelformSliver.java @@ -27,7 +27,7 @@ public final class SteelformSliver extends CardImpl { this.toughness = new MageInt(2); // Sliver creatures you control get +0/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_SLIVERS, false))); } diff --git a/Mage.Sets/src/mage/cards/s/StennParanoidPartisan.java b/Mage.Sets/src/mage/cards/s/StennParanoidPartisan.java index 4d6494bc2af..247164ee62b 100644 --- a/Mage.Sets/src/mage/cards/s/StennParanoidPartisan.java +++ b/Mage.Sets/src/mage/cards/s/StennParanoidPartisan.java @@ -42,7 +42,7 @@ public class StennParanoidPartisan extends CardImpl { )); // Spells you cast of the chosen type cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostReductionAllOfChosenCardTypeEffect(new FilterCard("Spells you cast of the chosen type"), 1, true) )); diff --git a/Mage.Sets/src/mage/cards/s/StrikingSliver.java b/Mage.Sets/src/mage/cards/s/StrikingSliver.java index 083e5e51fa5..5b1027db0f9 100644 --- a/Mage.Sets/src/mage/cards/s/StrikingSliver.java +++ b/Mage.Sets/src/mage/cards/s/StrikingSliver.java @@ -28,7 +28,7 @@ public final class StrikingSliver extends CardImpl { this.toughness = new MageInt(1); // Sliver creatures you control have first strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_SLIVERS))); } diff --git a/Mage.Sets/src/mage/cards/s/SublimeArchangel.java b/Mage.Sets/src/mage/cards/s/SublimeArchangel.java index c6ff6133e43..17baa75a078 100644 --- a/Mage.Sets/src/mage/cards/s/SublimeArchangel.java +++ b/Mage.Sets/src/mage/cards/s/SublimeArchangel.java @@ -33,7 +33,7 @@ public final class SublimeArchangel extends CardImpl { // Exalted this.addAbility(new ExaltedAbility()); // Other creatures you control have exalted. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(new ExaltedAbility(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, true))); } diff --git a/Mage.Sets/src/mage/cards/s/SulamDjinn.java b/Mage.Sets/src/mage/cards/s/SulamDjinn.java index 7d655cebc0f..bd102e2dc35 100644 --- a/Mage.Sets/src/mage/cards/s/SulamDjinn.java +++ b/Mage.Sets/src/mage/cards/s/SulamDjinn.java @@ -33,7 +33,7 @@ public final class SulamDjinn extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Sulam Djinn gets -2/-2 as long as green is the most common color among all permanents or is tied for most common. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(-2, -2, Duration.WhileOnBattlefield), new MostCommonColorCondition(new ObjectColor(ObjectColor.GREEN)), "{this} gets -2/-2 as long as green is the most common color among all permanents or is tied for most common"))); diff --git a/Mage.Sets/src/mage/cards/s/SultaiRunemark.java b/Mage.Sets/src/mage/cards/s/SultaiRunemark.java index 8c8fe881900..4a2415e96f6 100644 --- a/Mage.Sets/src/mage/cards/s/SultaiRunemark.java +++ b/Mage.Sets/src/mage/cards/s/SultaiRunemark.java @@ -51,7 +51,7 @@ public final class SultaiRunemark extends CardImpl { // Enchanted creature gets +2/+2. this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // Enchanted creature has deathtouch as long as you control a green or blue permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilityAttachedEffect(DeathtouchAbility.getInstance(), AttachmentType.AURA), new PermanentsOnTheBattlefieldCondition(filter), "Enchanted creature has deathtouch as long as you control a green or blue permanent"))); } diff --git a/Mage.Sets/src/mage/cards/s/SummitApes.java b/Mage.Sets/src/mage/cards/s/SummitApes.java index 63e0ddf5856..2e07e1e8ece 100644 --- a/Mage.Sets/src/mage/cards/s/SummitApes.java +++ b/Mage.Sets/src/mage/cards/s/SummitApes.java @@ -37,7 +37,7 @@ public final class SummitApes extends CardImpl { this.toughness = new MageInt(2); // As long as you control a Mountain, Summit Apes has menace. (It can't be blocked except by two or more creatures.) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(new MenaceAbility()), new PermanentsOnTheBattlefieldCondition(filter), rule))); } diff --git a/Mage.Sets/src/mage/cards/s/Sunforger.java b/Mage.Sets/src/mage/cards/s/Sunforger.java index cfc3ef41d61..02d07480951 100644 --- a/Mage.Sets/src/mage/cards/s/Sunforger.java +++ b/Mage.Sets/src/mage/cards/s/Sunforger.java @@ -44,7 +44,7 @@ public final class Sunforger extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +4/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostEquippedEffect(4, 0, Duration.WhileOnBattlefield))); // {R}{W}, Unattach Sunforger: Search your library for a red or white diff --git a/Mage.Sets/src/mage/cards/s/SurrakDragonclaw.java b/Mage.Sets/src/mage/cards/s/SurrakDragonclaw.java index 450ba30e121..e800d7898d1 100644 --- a/Mage.Sets/src/mage/cards/s/SurrakDragonclaw.java +++ b/Mage.Sets/src/mage/cards/s/SurrakDragonclaw.java @@ -50,7 +50,7 @@ public final class SurrakDragonclaw extends CardImpl { this.addAbility(new SimpleStaticAbility(new CantBeCounteredControlledEffect(filterTarget, null, Duration.WhileOnBattlefield))); // Other creatures you control have trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, true))); } diff --git a/Mage.Sets/src/mage/cards/s/SynchronousSliver.java b/Mage.Sets/src/mage/cards/s/SynchronousSliver.java index 22ca978d49f..fed42cf6770 100644 --- a/Mage.Sets/src/mage/cards/s/SynchronousSliver.java +++ b/Mage.Sets/src/mage/cards/s/SynchronousSliver.java @@ -29,7 +29,7 @@ public final class SynchronousSliver extends CardImpl { this.toughness = new MageInt(3); // All Sliver creatures have vigilance. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filter, "All Sliver creatures have vigilance."))); } diff --git a/Mage.Sets/src/mage/cards/s/SyrElenoraTheDiscerning.java b/Mage.Sets/src/mage/cards/s/SyrElenoraTheDiscerning.java index 087efb719c2..aa7cacedc07 100644 --- a/Mage.Sets/src/mage/cards/s/SyrElenoraTheDiscerning.java +++ b/Mage.Sets/src/mage/cards/s/SyrElenoraTheDiscerning.java @@ -37,7 +37,7 @@ public final class SyrElenoraTheDiscerning extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); // Spells your opponents cast that target Syr Elenora cost {2} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostModificationThatTargetSourceEffect(2, new FilterCard("Spells"), TargetController.OPPONENT)) ); } diff --git a/Mage.Sets/src/mage/cards/t/TalonsOfFalkenrath.java b/Mage.Sets/src/mage/cards/t/TalonsOfFalkenrath.java index 62a8d948180..cfc3fe2ff6c 100644 --- a/Mage.Sets/src/mage/cards/t/TalonsOfFalkenrath.java +++ b/Mage.Sets/src/mage/cards/t/TalonsOfFalkenrath.java @@ -39,7 +39,7 @@ public final class TalonsOfFalkenrath extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature has "{1}{R}: This creature gets +2/+0 until end of turn." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")), AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/t/TeferisSentinel.java b/Mage.Sets/src/mage/cards/t/TeferisSentinel.java index da3e3983fa5..0d10683d8ca 100644 --- a/Mage.Sets/src/mage/cards/t/TeferisSentinel.java +++ b/Mage.Sets/src/mage/cards/t/TeferisSentinel.java @@ -32,7 +32,7 @@ public final class TeferisSentinel extends CardImpl { FilterControlledPermanent filter = new FilterControlledPermanent(); filter.add(CardType.PLANESWALKER.getPredicate()); filter.add(SubType.TEFERI.getPredicate()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect( new BoostSourceEffect(4, 0, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), diff --git a/Mage.Sets/src/mage/cards/t/TelekineticSliver.java b/Mage.Sets/src/mage/cards/t/TelekineticSliver.java index f735e8eb122..ae8a0ed07d4 100644 --- a/Mage.Sets/src/mage/cards/t/TelekineticSliver.java +++ b/Mage.Sets/src/mage/cards/t/TelekineticSliver.java @@ -35,7 +35,7 @@ public final class TelekineticSliver extends CardImpl { // All Slivers have "{T}: Tap target permanent." Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetPermanent()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, filter, "All Slivers have \"{T}: Tap target permanent.\""))); } diff --git a/Mage.Sets/src/mage/cards/t/TemurRunemark.java b/Mage.Sets/src/mage/cards/t/TemurRunemark.java index 8a357973e2c..7b69dc269c1 100644 --- a/Mage.Sets/src/mage/cards/t/TemurRunemark.java +++ b/Mage.Sets/src/mage/cards/t/TemurRunemark.java @@ -51,7 +51,7 @@ public final class TemurRunemark extends CardImpl { // Enchanted creature gets +2/+2. this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // Enchanted creature has trample as long as you control a blue or red permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA), new PermanentsOnTheBattlefieldCondition(filter), "Enchanted creature has trample as long as you control a blue or red permanent"))); } diff --git a/Mage.Sets/src/mage/cards/t/TenaciousHunter.java b/Mage.Sets/src/mage/cards/t/TenaciousHunter.java index bf1e7677678..625646074c0 100644 --- a/Mage.Sets/src/mage/cards/t/TenaciousHunter.java +++ b/Mage.Sets/src/mage/cards/t/TenaciousHunter.java @@ -39,7 +39,7 @@ public final class TenaciousHunter extends CardImpl { this.toughness = new MageInt(4); // As long as a creature has a -1/-1 counter on it, Tenacious Hunter has vigilance and deathtouch. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(VigilanceAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter, false), "As long as a creature has a -1/-1 counter on it, {this} has vigilance")); diff --git a/Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java b/Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java index 483220680e4..ee74d061c54 100644 --- a/Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java +++ b/Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java @@ -51,7 +51,7 @@ public final class ThatWhichWasTaken extends CardImpl { // Each permanent with a divinity counter on it has indestructible. Effect effect = new GainAbilityAllEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield, filterIndestructible, false); effect.setText("Each permanent with a divinity counter on it has indestructible"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( effect)); } diff --git a/Mage.Sets/src/mage/cards/t/TheTwelfthDoctor.java b/Mage.Sets/src/mage/cards/t/TheTwelfthDoctor.java index 36407025bc4..cea349b3b7e 100644 --- a/Mage.Sets/src/mage/cards/t/TheTwelfthDoctor.java +++ b/Mage.Sets/src/mage/cards/t/TheTwelfthDoctor.java @@ -38,7 +38,7 @@ public final class TheTwelfthDoctor extends CardImpl { this.toughness = new MageInt(4); // The first spell you cast from anywhere other than your hand each turn has demonstrate. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new TheTwelfthDoctorGainDemonstrateEffect()), new TheTwelfthDoctorWatcher()); this.addAbility(new TheTwelfthDoctorCopyTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/t/ThorncasterSliver.java b/Mage.Sets/src/mage/cards/t/ThorncasterSliver.java index 569908848be..3473c35453d 100644 --- a/Mage.Sets/src/mage/cards/t/ThorncasterSliver.java +++ b/Mage.Sets/src/mage/cards/t/ThorncasterSliver.java @@ -33,7 +33,7 @@ public final class ThorncasterSliver extends CardImpl { // Sliver creatures you control have "Whenever this creature attacks, it deals 1 damage to any target." Ability ability = new AttacksTriggeredAbility(new DamageTargetEffect(1, "it"), false); ability.addTarget(new TargetAnyTarget()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(ability, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS) .setText("Sliver creatures you control have \"Whenever this creature attacks, it deals 1 damage to any target.\""))); diff --git a/Mage.Sets/src/mage/cards/t/ThoughtDevourer.java b/Mage.Sets/src/mage/cards/t/ThoughtDevourer.java index 4b162803320..c9e17e121c0 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtDevourer.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtDevourer.java @@ -31,7 +31,7 @@ public final class ThoughtDevourer extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Your maximum hand size is reduced by four. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new MaximumHandSizeControllerEffect(4, Duration.WhileOnBattlefield, HandSizeModification.REDUCE))); } diff --git a/Mage.Sets/src/mage/cards/t/ThoughtEater.java b/Mage.Sets/src/mage/cards/t/ThoughtEater.java index c1a187ea50d..dca9e9cf8e8 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtEater.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtEater.java @@ -31,7 +31,7 @@ public final class ThoughtEater extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Your maximum hand size is reduced by three. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new MaximumHandSizeControllerEffect(3, Duration.WhileOnBattlefield, HandSizeModification.REDUCE))); } diff --git a/Mage.Sets/src/mage/cards/t/ThoughtNibbler.java b/Mage.Sets/src/mage/cards/t/ThoughtNibbler.java index dbaca7dd6b0..b1c6ad6eea3 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtNibbler.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtNibbler.java @@ -31,7 +31,7 @@ public final class ThoughtNibbler extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Your maximum hand size is reduced by two. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new MaximumHandSizeControllerEffect(2, Duration.WhileOnBattlefield, HandSizeModification.REDUCE))); } diff --git a/Mage.Sets/src/mage/cards/t/ThresherLizard.java b/Mage.Sets/src/mage/cards/t/ThresherLizard.java index 598c6aef2d3..d992d173fff 100644 --- a/Mage.Sets/src/mage/cards/t/ThresherLizard.java +++ b/Mage.Sets/src/mage/cards/t/ThresherLizard.java @@ -28,7 +28,7 @@ public final class ThresherLizard extends CardImpl { this.toughness = new MageInt(2); // Thresher Lizard gets +1/+2 as long as you have one or fewer cards in hand. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect( new BoostSourceEffect(1, 2, Duration.WhileOnBattlefield), HeckbentCondition.instance, diff --git a/Mage.Sets/src/mage/cards/t/ThrunBreakerOfSilence.java b/Mage.Sets/src/mage/cards/t/ThrunBreakerOfSilence.java index 42da65135d9..9fce17a797b 100644 --- a/Mage.Sets/src/mage/cards/t/ThrunBreakerOfSilence.java +++ b/Mage.Sets/src/mage/cards/t/ThrunBreakerOfSilence.java @@ -44,7 +44,7 @@ public final class ThrunBreakerOfSilence extends CardImpl { // Thrun, Breaker of Silence can't be the target of nongreen spells your opponents control or abilities from nongreen sources your opponents control. this.addAbility(new SimpleStaticAbility(new ThrunBreakerOfSilenceEffect())); // As long as it's your turn, Thrun has indestructible. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), MyTurnCondition.instance, "During your turn, {this} has indestructible")) diff --git a/Mage.Sets/src/mage/cards/t/ToxicIguanar.java b/Mage.Sets/src/mage/cards/t/ToxicIguanar.java index 96c485f39b0..48cf77f1e1c 100644 --- a/Mage.Sets/src/mage/cards/t/ToxicIguanar.java +++ b/Mage.Sets/src/mage/cards/t/ToxicIguanar.java @@ -38,7 +38,7 @@ public final class ToxicIguanar extends CardImpl { this.toughness = new MageInt(1); // Toxic Iguanar has deathtouch as long as you control a green permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "{this} has deathtouch as long as you control a green permanent"))); } diff --git a/Mage.Sets/src/mage/cards/t/TrueFaithCenser.java b/Mage.Sets/src/mage/cards/t/TrueFaithCenser.java index fa6d474b188..2f3d6e1406f 100644 --- a/Mage.Sets/src/mage/cards/t/TrueFaithCenser.java +++ b/Mage.Sets/src/mage/cards/t/TrueFaithCenser.java @@ -37,7 +37,7 @@ public final class TrueFaithCenser extends CardImpl { this.addAbility(ability); // As long as equipped creature is a Human, it gets an additional +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostEquippedEffect(1, 0), new EquippedHasSubtypeCondition(SubType.HUMAN), staticText))); diff --git a/Mage.Sets/src/mage/cards/t/TrustedAdvisor.java b/Mage.Sets/src/mage/cards/t/TrustedAdvisor.java index bf978936665..f16831ad6c6 100644 --- a/Mage.Sets/src/mage/cards/t/TrustedAdvisor.java +++ b/Mage.Sets/src/mage/cards/t/TrustedAdvisor.java @@ -39,7 +39,7 @@ public final class TrustedAdvisor extends CardImpl { this.toughness = new MageInt(2); // Your maximum hand size is increased by two. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new MaximumHandSizeControllerEffect(2, Duration.WhileOnBattlefield, HandSizeModification.INCREASE))); // At the beginning of your upkeep, return a blue creature you control to its owner's hand. diff --git a/Mage.Sets/src/mage/cards/u/UnquestionedAuthority.java b/Mage.Sets/src/mage/cards/u/UnquestionedAuthority.java index 6ed6ff79295..25a8f5ba697 100644 --- a/Mage.Sets/src/mage/cards/u/UnquestionedAuthority.java +++ b/Mage.Sets/src/mage/cards/u/UnquestionedAuthority.java @@ -41,7 +41,7 @@ public final class UnquestionedAuthority extends CardImpl { // When Unquestioned Authority enters the battlefield, draw a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); // Enchanted creature has protection from creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAttachedEffect(new ProtectionAbility(StaticFilters.FILTER_PERMANENT_CREATURES), AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/u/UrzasIncubator.java b/Mage.Sets/src/mage/cards/u/UrzasIncubator.java index b0e85bbb522..6d7cd7b4c80 100644 --- a/Mage.Sets/src/mage/cards/u/UrzasIncubator.java +++ b/Mage.Sets/src/mage/cards/u/UrzasIncubator.java @@ -25,7 +25,7 @@ public final class UrzasIncubator extends CardImpl { // As Urza's Incubator enters the battlefield, choose a creature type. this.addAbility(new AsEntersBattlefieldAbility(new ChooseCreatureTypeEffect(Outcome.BoostCreature))); // Creature spells of the chosen type cost {2} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new SpellsCostReductionAllOfChosenSubtypeEffect(new FilterCreatureCard("creature spells of the chosen type"), 2))); } diff --git a/Mage.Sets/src/mage/cards/v/VeiledSerpent.java b/Mage.Sets/src/mage/cards/v/VeiledSerpent.java index e30338bdc53..42bf1e8af41 100644 --- a/Mage.Sets/src/mage/cards/v/VeiledSerpent.java +++ b/Mage.Sets/src/mage/cards/v/VeiledSerpent.java @@ -60,7 +60,7 @@ class VeiledSerpentToken extends TokenImpl { subtype.add(SubType.SERPENT); power = new MageInt(4); toughness = new MageInt(4); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new CantAttackUnlessDefenderControllsPermanent( new FilterLandPermanent(SubType.ISLAND, "an Island")))); } diff --git a/Mage.Sets/src/mage/cards/v/VenomSliver.java b/Mage.Sets/src/mage/cards/v/VenomSliver.java index 4ae8cbbf267..bc47c4daeb0 100644 --- a/Mage.Sets/src/mage/cards/v/VenomSliver.java +++ b/Mage.Sets/src/mage/cards/v/VenomSliver.java @@ -28,7 +28,7 @@ public final class VenomSliver extends CardImpl { this.toughness = new MageInt(1); // Sliver creatures you control have deathtouch. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityControlledEffect(DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_SLIVERS))); } diff --git a/Mage.Sets/src/mage/cards/v/VictualSliver.java b/Mage.Sets/src/mage/cards/v/VictualSliver.java index 84edf3f8f78..6c8c7860a8d 100644 --- a/Mage.Sets/src/mage/cards/v/VictualSliver.java +++ b/Mage.Sets/src/mage/cards/v/VictualSliver.java @@ -35,7 +35,7 @@ public final class VictualSliver extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(4), new SacrificeSourceCost()); ability.addCost(new GenericManaCost(2)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS, "All Slivers have \"{2}, Sacrifice this permanent: You gain 4 life.\""))); diff --git a/Mage.Sets/src/mage/cards/v/VintaraSnapper.java b/Mage.Sets/src/mage/cards/v/VintaraSnapper.java index 68ed24186a2..c2ecca33d88 100644 --- a/Mage.Sets/src/mage/cards/v/VintaraSnapper.java +++ b/Mage.Sets/src/mage/cards/v/VintaraSnapper.java @@ -37,7 +37,7 @@ public final class VintaraSnapper extends CardImpl { this.toughness = new MageInt(2); // Vintara Snapper has shroud as long as you control no untapped lands. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield), new InvertCondition(new PermanentsOnTheBattlefieldCondition(filter)), "{this} has shroud as long as you control no untapped lands"))); diff --git a/Mage.Sets/src/mage/cards/v/VirulentSliver.java b/Mage.Sets/src/mage/cards/v/VirulentSliver.java index 5f9b4deaf06..9a967744abc 100644 --- a/Mage.Sets/src/mage/cards/v/VirulentSliver.java +++ b/Mage.Sets/src/mage/cards/v/VirulentSliver.java @@ -32,7 +32,7 @@ public final class VirulentSliver extends CardImpl { this.toughness = new MageInt(1); // All Sliver creatures have poisonous 1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(new PoisonousAbility(1), Duration.WhileOnBattlefield, filter, "All Sliver creatures have poisonous 1. (Whenever a Sliver deals combat damage to a player, that player gets a poison counter.)"))); diff --git a/Mage.Sets/src/mage/cards/w/WalkingDream.java b/Mage.Sets/src/mage/cards/w/WalkingDream.java index 91053c7150b..334d35a5766 100644 --- a/Mage.Sets/src/mage/cards/w/WalkingDream.java +++ b/Mage.Sets/src/mage/cards/w/WalkingDream.java @@ -38,7 +38,7 @@ public final class WalkingDream extends CardImpl { // Walking Dream doesn't untap during your untap step if an opponent controls two or more creatures. ContinuousRuleModifyingEffect dontUntap = new DontUntapInControllersUntapStepSourceEffect(false, true); dontUntap.setText(rule); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleStaticAbility( new ConditionalContinuousRuleModifyingEffect( dontUntap, new OpponentControlsPermanentCondition( diff --git a/Mage.Sets/src/mage/cards/w/WardenOfTheBeyond.java b/Mage.Sets/src/mage/cards/w/WardenOfTheBeyond.java index 213b608cfea..a630c707c76 100644 --- a/Mage.Sets/src/mage/cards/w/WardenOfTheBeyond.java +++ b/Mage.Sets/src/mage/cards/w/WardenOfTheBeyond.java @@ -36,7 +36,7 @@ public final class WardenOfTheBeyond extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); // Warden of the Beyond gets +2/+2 as long as an opponent owns a card in exile. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(2,2,Duration.WhileOnBattlefield), OpponentOwnsCardInExileCondition.instance, "{this} gets +2/+2 as long as an opponent owns a card in exile"))); } diff --git a/Mage.Sets/src/mage/cards/w/WaywardSwordtooth.java b/Mage.Sets/src/mage/cards/w/WaywardSwordtooth.java index 1fd41897c59..7cd51e46651 100644 --- a/Mage.Sets/src/mage/cards/w/WaywardSwordtooth.java +++ b/Mage.Sets/src/mage/cards/w/WaywardSwordtooth.java @@ -32,7 +32,7 @@ public final class WaywardSwordtooth extends CardImpl { this.addAbility(new AscendAbility()); // You may play an additional land on each of your turns. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new PlayAdditionalLandsControllerEffect(1, Duration.WhileOnBattlefield))); // Wayward Sawtooth can't attack or block unless you have the city's blessing. diff --git a/Mage.Sets/src/mage/cards/w/WildMagicSorcerer.java b/Mage.Sets/src/mage/cards/w/WildMagicSorcerer.java index 897b3af4b51..f91d13843b2 100644 --- a/Mage.Sets/src/mage/cards/w/WildMagicSorcerer.java +++ b/Mage.Sets/src/mage/cards/w/WildMagicSorcerer.java @@ -34,7 +34,7 @@ public final class WildMagicSorcerer extends CardImpl { this.toughness = new MageInt(3); // The first spell you cast from exile each turn has cascade. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new WildMagicSorcererGainCascadeFirstSpellCastFromExileEffect()), new WildMagicSorcererWatcher()); } diff --git a/Mage.Sets/src/mage/cards/z/ZanamDjinn.java b/Mage.Sets/src/mage/cards/z/ZanamDjinn.java index bf258e57db8..a245c0d06e5 100644 --- a/Mage.Sets/src/mage/cards/z/ZanamDjinn.java +++ b/Mage.Sets/src/mage/cards/z/ZanamDjinn.java @@ -33,7 +33,7 @@ public final class ZanamDjinn extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Zanam Djinn gets -2/-2 as long as blue is the most common color among all permanents or is tied for most common. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new BoostSourceEffect(-2, -2, Duration.WhileOnBattlefield), new MostCommonColorCondition(new ObjectColor(ObjectColor.BLUE)), "{this} gets -2/-2 as long as blue is the most common color among all permanents or is tied for most common"))); diff --git a/Mage.Sets/src/mage/cards/z/ZaskSkitteringSwarmlord.java b/Mage.Sets/src/mage/cards/z/ZaskSkitteringSwarmlord.java index b213e2dac86..856abc25f6e 100644 --- a/Mage.Sets/src/mage/cards/z/ZaskSkitteringSwarmlord.java +++ b/Mage.Sets/src/mage/cards/z/ZaskSkitteringSwarmlord.java @@ -45,7 +45,7 @@ public final class ZaskSkitteringSwarmlord extends CardImpl { this.toughness = new MageInt(5); // You may play lands and cast Insect spells from your graveyard. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new PlayFromGraveyardControllerEffect(filter) )); diff --git a/Mage.Sets/src/mage/cards/z/ZurgoHelmsmasher.java b/Mage.Sets/src/mage/cards/z/ZurgoHelmsmasher.java index 8a2a1012570..9ca7ced514d 100644 --- a/Mage.Sets/src/mage/cards/z/ZurgoHelmsmasher.java +++ b/Mage.Sets/src/mage/cards/z/ZurgoHelmsmasher.java @@ -38,7 +38,7 @@ public final class ZurgoHelmsmasher extends CardImpl { this.addAbility(new AttacksEachCombatStaticAbility()); // Zurgo Helmsmasher has indestructible as long as it's your turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), MyTurnCondition.instance, "{this} has indestructible as long as it's your turn")) diff --git a/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java b/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java index 85105f34478..6b721307cf9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java @@ -22,7 +22,7 @@ public final class KarnConstructToken extends TokenImpl { power = new MageInt(0); toughness = new MageInt(0); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostSourceEffect(ArtifactYouControlCount.instance, ArtifactYouControlCount.instance, Duration.WhileOnBattlefield) .setText("This creature gets +1/+1 for each artifact you control") )); diff --git a/Mage/src/main/java/mage/game/permanent/token/VrenRatToken.java b/Mage/src/main/java/mage/game/permanent/token/VrenRatToken.java index 5876cdc1430..5925705fc98 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VrenRatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VrenRatToken.java @@ -31,7 +31,7 @@ public final class VrenRatToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), new PermanentsOnBattlefieldCount(filter), Duration.WhileOnBattlefield )