From 670acdb4a6e2ff2c54c6dfa9145c83033075c81d Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:09:41 -0500 Subject: [PATCH] refactor: SimpleStaticAbility default zone (cards A) --- Mage.Sets/src/mage/cards/a/ATST.java | 2 +- Mage.Sets/src/mage/cards/a/AbandonedSarcophagus.java | 2 +- Mage.Sets/src/mage/cards/a/Abduction.java | 2 +- Mage.Sets/src/mage/cards/a/Abundance.java | 2 +- Mage.Sets/src/mage/cards/a/AbundantGrowth.java | 2 +- Mage.Sets/src/mage/cards/a/AbyssalPersecutor.java | 2 +- Mage.Sets/src/mage/cards/a/AbzanFalconer.java | 2 +- Mage.Sets/src/mage/cards/a/AbzanRunemark.java | 2 +- Mage.Sets/src/mage/cards/a/AcesBaseballBat.java | 2 +- Mage.Sets/src/mage/cards/a/AdantoVanguard.java | 2 +- Mage.Sets/src/mage/cards/a/AdaptiveAutomaton.java | 5 ++--- Mage.Sets/src/mage/cards/a/AdmiralBeckettBrass.java | 2 +- Mage.Sets/src/mage/cards/a/AdrianaCaptainOfTheGuard.java | 2 +- Mage.Sets/src/mage/cards/a/AdventurersGuildhouse.java | 2 +- Mage.Sets/src/mage/cards/a/AegisOfTheGods.java | 2 +- Mage.Sets/src/mage/cards/a/AerialModification.java | 4 ++-- Mage.Sets/src/mage/cards/a/AeronautTinkerer.java | 2 +- Mage.Sets/src/mage/cards/a/AetherMeltdown.java | 2 +- Mage.Sets/src/mage/cards/a/AetherStorm.java | 2 +- Mage.Sets/src/mage/cards/a/AggressiveMining.java | 2 +- Mage.Sets/src/mage/cards/a/Agoraphobia.java | 2 +- Mage.Sets/src/mage/cards/a/AinokBondKin.java | 3 +-- Mage.Sets/src/mage/cards/a/AirBladder.java | 4 ++-- Mage.Sets/src/mage/cards/a/AkiriLineSlinger.java | 2 +- Mage.Sets/src/mage/cards/a/AkkiLavarunner.java | 2 +- Mage.Sets/src/mage/cards/a/AkkiUnderling.java | 2 +- Mage.Sets/src/mage/cards/a/AkromasDevoted.java | 2 +- Mage.Sets/src/mage/cards/a/AkromasMemorial.java | 2 +- Mage.Sets/src/mage/cards/a/AkronLegionnaire.java | 2 +- Mage.Sets/src/mage/cards/a/AlexisCloak.java | 2 +- Mage.Sets/src/mage/cards/a/AlhammarretHighArbiter.java | 2 +- Mage.Sets/src/mage/cards/a/AlhammarretsArchive.java | 4 ++-- Mage.Sets/src/mage/cards/a/AliFromCairo.java | 2 +- Mage.Sets/src/mage/cards/a/AlloyGolem.java | 2 +- Mage.Sets/src/mage/cards/a/AlmsCollector.java | 2 +- Mage.Sets/src/mage/cards/a/AlphaAuthority.java | 2 +- Mage.Sets/src/mage/cards/a/AlphaStatus.java | 2 +- Mage.Sets/src/mage/cards/a/AlpineMoon.java | 2 +- Mage.Sets/src/mage/cards/a/AltarGolem.java | 2 +- Mage.Sets/src/mage/cards/a/AlwaysWatching.java | 2 +- Mage.Sets/src/mage/cards/a/AmbushCommander.java | 2 +- Mage.Sets/src/mage/cards/a/AnHavvaConstable.java | 2 +- Mage.Sets/src/mage/cards/a/AnabaSpiritCrafter.java | 2 +- Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java | 2 +- Mage.Sets/src/mage/cards/a/AnakinSkywalker.java | 2 +- Mage.Sets/src/mage/cards/a/AncestralVengeance.java | 2 +- Mage.Sets/src/mage/cards/a/AngelOfInvention.java | 2 +- Mage.Sets/src/mage/cards/a/AngelOfJubilation.java | 2 +- Mage.Sets/src/mage/cards/a/AngelicArbiter.java | 4 ++-- Mage.Sets/src/mage/cards/a/AngelicDestiny.java | 2 +- Mage.Sets/src/mage/cards/a/AngelicGift.java | 2 +- Mage.Sets/src/mage/cards/a/AngelicOverseer.java | 2 +- Mage.Sets/src/mage/cards/a/AngelicShield.java | 2 +- Mage.Sets/src/mage/cards/a/AngelsTrumpet.java | 2 +- Mage.Sets/src/mage/cards/a/AngrathsMarauders.java | 2 +- Mage.Sets/src/mage/cards/a/AngryMob.java | 2 +- Mage.Sets/src/mage/cards/a/AnimalBoneyard.java | 2 +- Mage.Sets/src/mage/cards/a/AnimarSoulOfElements.java | 2 +- Mage.Sets/src/mage/cards/a/AnimateArtifact.java | 2 +- Mage.Sets/src/mage/cards/a/AnimateWall.java | 4 ++-- Mage.Sets/src/mage/cards/a/Annex.java | 2 +- Mage.Sets/src/mage/cards/a/AnointedProcession.java | 2 +- Mage.Sets/src/mage/cards/a/AnthemOfRakdos.java | 2 +- Mage.Sets/src/mage/cards/a/AntiMagicAura.java | 2 +- Mage.Sets/src/mage/cards/a/AnvilOfBogardan.java | 2 +- Mage.Sets/src/mage/cards/a/AqueousForm.java | 2 +- Mage.Sets/src/mage/cards/a/ArachnusWeb.java | 2 +- Mage.Sets/src/mage/cards/a/ArcadesSabboth.java | 2 +- Mage.Sets/src/mage/cards/a/ArcaneFlight.java | 2 +- Mage.Sets/src/mage/cards/a/ArcaneLaboratory.java | 2 +- Mage.Sets/src/mage/cards/a/ArcanumWings.java | 2 +- Mage.Sets/src/mage/cards/a/ArchangelOfStrife.java | 4 ++-- Mage.Sets/src/mage/cards/a/ArchangelOfTithes.java | 4 ++-- Mage.Sets/src/mage/cards/a/ArchonOfValorsReach.java | 2 +- Mage.Sets/src/mage/cards/a/ArcticAven.java | 2 +- Mage.Sets/src/mage/cards/a/ArdentRecruit.java | 2 +- Mage.Sets/src/mage/cards/a/ArgentumArmor.java | 2 +- Mage.Sets/src/mage/cards/a/ArmadilloCloak.java | 2 +- Mage.Sets/src/mage/cards/a/ArmamentMaster.java | 4 ++-- Mage.Sets/src/mage/cards/a/ArmamentOfNyx.java | 2 +- Mage.Sets/src/mage/cards/a/ArmorOfFaith.java | 2 +- Mage.Sets/src/mage/cards/a/ArmorOfThorns.java | 2 +- Mage.Sets/src/mage/cards/a/ArmorSliver.java | 2 +- Mage.Sets/src/mage/cards/a/ArmoredGalleon.java | 2 +- Mage.Sets/src/mage/cards/a/ArmoryGuard.java | 2 +- Mage.Sets/src/mage/cards/a/Arrest.java | 2 +- Mage.Sets/src/mage/cards/a/ArvadTheCursed.java | 2 +- Mage.Sets/src/mage/cards/a/AscendantEvincar.java | 4 ++-- Mage.Sets/src/mage/cards/a/AshenmoorCohort.java | 2 +- Mage.Sets/src/mage/cards/a/AshenmoorLiege.java | 4 ++-- Mage.Sets/src/mage/cards/a/AshesOfTheAbhorrent.java | 2 +- Mage.Sets/src/mage/cards/a/AshesOfTheFallen.java | 2 +- Mage.Sets/src/mage/cards/a/AshlingsPrerogative.java | 4 ++-- Mage.Sets/src/mage/cards/a/AshmouthBlade.java | 2 +- Mage.Sets/src/mage/cards/a/AspectOfGorgon.java | 2 +- Mage.Sets/src/mage/cards/a/AspectOfMongoose.java | 2 +- Mage.Sets/src/mage/cards/a/AudaciousInfiltrator.java | 2 +- Mage.Sets/src/mage/cards/a/AuraGnarlid.java | 4 ++-- Mage.Sets/src/mage/cards/a/AuraOfSilence.java | 4 ++-- Mage.Sets/src/mage/cards/a/AuramancersGuise.java | 2 +- Mage.Sets/src/mage/cards/a/Aurification.java | 4 ++-- Mage.Sets/src/mage/cards/a/AuriokGlaivemaster.java | 4 ++-- Mage.Sets/src/mage/cards/a/AuriokSteelshaper.java | 4 ++-- Mage.Sets/src/mage/cards/a/AvariceAmulet.java | 2 +- Mage.Sets/src/mage/cards/a/AvatarOfHope.java | 2 +- Mage.Sets/src/mage/cards/a/AvatarOfSlaughter.java | 2 +- Mage.Sets/src/mage/cards/a/AvenBrigadier.java | 4 ++-- Mage.Sets/src/mage/cards/a/AvenMindcensor.java | 2 +- Mage.Sets/src/mage/cards/a/AvenWindGuide.java | 2 +- Mage.Sets/src/mage/cards/a/AwakenTheAncient.java | 2 +- Mage.Sets/src/mage/cards/a/AysenHighway.java | 2 +- Mage.Sets/src/mage/cards/a/AzusaLostButSeeking.java | 2 +- 112 files changed, 130 insertions(+), 132 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/ATST.java b/Mage.Sets/src/mage/cards/a/ATST.java index 5eccb6aed7b..4f92f1e841d 100644 --- a/Mage.Sets/src/mage/cards/a/ATST.java +++ b/Mage.Sets/src/mage/cards/a/ATST.java @@ -33,7 +33,7 @@ public final class ATST extends CardImpl { this.toughness = new MageInt(3); // Trooper creatures you control get +3/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(3, 3, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(3, 3, Duration.WhileOnBattlefield, filter, false))); } diff --git a/Mage.Sets/src/mage/cards/a/AbandonedSarcophagus.java b/Mage.Sets/src/mage/cards/a/AbandonedSarcophagus.java index 362aaf135f2..a1508c004f1 100644 --- a/Mage.Sets/src/mage/cards/a/AbandonedSarcophagus.java +++ b/Mage.Sets/src/mage/cards/a/AbandonedSarcophagus.java @@ -40,7 +40,7 @@ public final class AbandonedSarcophagus extends CardImpl { this.addAbility(new SimpleStaticAbility(new PlayFromGraveyardControllerEffect(filter))); // If a card with cycling would be put into your graveyard from anywhere and it wasn't cycled, exile it instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AbandonedSarcophagusReplacementEffect()), new AbandonedSarcophagusWatcher()); + this.addAbility(new SimpleStaticAbility(new AbandonedSarcophagusReplacementEffect()), new AbandonedSarcophagusWatcher()); } diff --git a/Mage.Sets/src/mage/cards/a/Abduction.java b/Mage.Sets/src/mage/cards/a/Abduction.java index 2b4bc880bbf..b83b1f10a90 100644 --- a/Mage.Sets/src/mage/cards/a/Abduction.java +++ b/Mage.Sets/src/mage/cards/a/Abduction.java @@ -40,7 +40,7 @@ public final class Abduction extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new UntapAttachedEffect())); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); // When enchanted creature dies, return that card to the battlefield under its owner's control. this.addAbility(new DiesAttachedTriggeredAbility(new ReturnToBattlefieldUnderOwnerControlAttachedEffect(), "enchanted creature", false)); diff --git a/Mage.Sets/src/mage/cards/a/Abundance.java b/Mage.Sets/src/mage/cards/a/Abundance.java index 1b6545fb90c..1ce1fe50f0f 100644 --- a/Mage.Sets/src/mage/cards/a/Abundance.java +++ b/Mage.Sets/src/mage/cards/a/Abundance.java @@ -27,7 +27,7 @@ public final class Abundance extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}{G}"); // If you would draw a card, you may instead choose land or nonland and reveal cards from the top of your library until you reveal a card of the chosen kind. Put that card into your hand and put all other cards revealed this way on the bottom of your library in any order. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AbundanceReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new AbundanceReplacementEffect())); } private Abundance(final Abundance card) { diff --git a/Mage.Sets/src/mage/cards/a/AbundantGrowth.java b/Mage.Sets/src/mage/cards/a/AbundantGrowth.java index fb5b81258e8..93f3b8c8382 100644 --- a/Mage.Sets/src/mage/cards/a/AbundantGrowth.java +++ b/Mage.Sets/src/mage/cards/a/AbundantGrowth.java @@ -41,7 +41,7 @@ public final class AbundantGrowth extends CardImpl { Ability gainedAbility = new AnyColorManaAbility(new TapSourceCost()); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA); effect.setText("Enchanted land has \"{T}: Add one mana of any color.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private AbundantGrowth(final AbundantGrowth card) { diff --git a/Mage.Sets/src/mage/cards/a/AbyssalPersecutor.java b/Mage.Sets/src/mage/cards/a/AbyssalPersecutor.java index 1185b3e3192..d21335aa819 100644 --- a/Mage.Sets/src/mage/cards/a/AbyssalPersecutor.java +++ b/Mage.Sets/src/mage/cards/a/AbyssalPersecutor.java @@ -33,7 +33,7 @@ public final class AbyssalPersecutor extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // You can't win the game and your opponents can't lose the game. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AbyssalPersecutorCannotWinEffect())); + this.addAbility(new SimpleStaticAbility(new AbyssalPersecutorCannotWinEffect())); } private AbyssalPersecutor(final AbyssalPersecutor card) { diff --git a/Mage.Sets/src/mage/cards/a/AbzanFalconer.java b/Mage.Sets/src/mage/cards/a/AbzanFalconer.java index 10b01542ecc..98d9d5400b5 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanFalconer.java +++ b/Mage.Sets/src/mage/cards/a/AbzanFalconer.java @@ -31,7 +31,7 @@ public final class AbzanFalconer extends CardImpl { this.addAbility(new OutlastAbility(new ColoredManaCost(ColoredManaSymbol.W))); // Each creature you control with a +1/+1 counter on it has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( FlyingAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_EACH_CONTROLLED_CREATURE_P1P1) diff --git a/Mage.Sets/src/mage/cards/a/AbzanRunemark.java b/Mage.Sets/src/mage/cards/a/AbzanRunemark.java index 08c17792440..8f487ce98cf 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanRunemark.java +++ b/Mage.Sets/src/mage/cards/a/AbzanRunemark.java @@ -44,7 +44,7 @@ public final class AbzanRunemark extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // Enchanted creature has vigilance as long as you control a black or green permanent. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA), diff --git a/Mage.Sets/src/mage/cards/a/AcesBaseballBat.java b/Mage.Sets/src/mage/cards/a/AcesBaseballBat.java index 708ec10be13..75383b17811 100644 --- a/Mage.Sets/src/mage/cards/a/AcesBaseballBat.java +++ b/Mage.Sets/src/mage/cards/a/AcesBaseballBat.java @@ -43,7 +43,7 @@ public final class AcesBaseballBat extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +3/+0 - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(3, 0))); // As long as equipped creature is attacking, it has first strike and must be blocked by a Dalek if able. Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( diff --git a/Mage.Sets/src/mage/cards/a/AdantoVanguard.java b/Mage.Sets/src/mage/cards/a/AdantoVanguard.java index e6c56c647ef..1019fccb186 100644 --- a/Mage.Sets/src/mage/cards/a/AdantoVanguard.java +++ b/Mage.Sets/src/mage/cards/a/AdantoVanguard.java @@ -33,7 +33,7 @@ public final class AdantoVanguard extends CardImpl { this.toughness = new MageInt(1); // As long as Adanto Vanguard is attacking, it gets +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(2, 0, Duration.WhileOnBattlefield), SourceAttackingCondition.instance, "As long as {this} is attacking, it gets +2/+0" diff --git a/Mage.Sets/src/mage/cards/a/AdaptiveAutomaton.java b/Mage.Sets/src/mage/cards/a/AdaptiveAutomaton.java index febdaf1d340..cf8b977acdc 100644 --- a/Mage.Sets/src/mage/cards/a/AdaptiveAutomaton.java +++ b/Mage.Sets/src/mage/cards/a/AdaptiveAutomaton.java @@ -38,9 +38,9 @@ public final class AdaptiveAutomaton extends CardImpl { ability.addEffect(new EnterAttributeAddChosenSubtypeEffect()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AddChosenSubtypeEffect())); + this.addAbility(new SimpleStaticAbility(new AddChosenSubtypeEffect())); // Other creatures you control of the chosen type get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllOfChosenSubtypeEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllOfChosenSubtypeEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); } private AdaptiveAutomaton(final AdaptiveAutomaton card) { @@ -52,4 +52,3 @@ public final class AdaptiveAutomaton extends CardImpl { return new AdaptiveAutomaton(this); } } - diff --git a/Mage.Sets/src/mage/cards/a/AdmiralBeckettBrass.java b/Mage.Sets/src/mage/cards/a/AdmiralBeckettBrass.java index 33ab01435ff..fdee119783e 100644 --- a/Mage.Sets/src/mage/cards/a/AdmiralBeckettBrass.java +++ b/Mage.Sets/src/mage/cards/a/AdmiralBeckettBrass.java @@ -46,7 +46,7 @@ public final class AdmiralBeckettBrass extends CardImpl { this.toughness = new MageInt(3); // Other Pirates you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); // At the beginning of your end step, gain control of target nonland permanent controlled by a player who was dealt combat damage by three or more Pirates this turn. Ability ability = new BeginningOfEndStepTriggeredAbility(new GainControlTargetEffect(Duration.Custom, true)); diff --git a/Mage.Sets/src/mage/cards/a/AdrianaCaptainOfTheGuard.java b/Mage.Sets/src/mage/cards/a/AdrianaCaptainOfTheGuard.java index 5440fd66811..50e3cfa50dd 100644 --- a/Mage.Sets/src/mage/cards/a/AdrianaCaptainOfTheGuard.java +++ b/Mage.Sets/src/mage/cards/a/AdrianaCaptainOfTheGuard.java @@ -29,7 +29,7 @@ public final class AdrianaCaptainOfTheGuard extends CardImpl { this.addAbility(new MeleeAbility()); // Other creatures you control have melee. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(new MeleeAbility(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("creatures"), true))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(new MeleeAbility(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("creatures"), true))); } diff --git a/Mage.Sets/src/mage/cards/a/AdventurersGuildhouse.java b/Mage.Sets/src/mage/cards/a/AdventurersGuildhouse.java index bda63d25143..a95838dba1b 100644 --- a/Mage.Sets/src/mage/cards/a/AdventurersGuildhouse.java +++ b/Mage.Sets/src/mage/cards/a/AdventurersGuildhouse.java @@ -32,7 +32,7 @@ public final class AdventurersGuildhouse extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.LAND}, ""); // Green legendary creatures you control have "bands with other legendary creatures." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(new BandsWithOtherAbility(SuperType.LEGENDARY), Duration.WhileOnBattlefield, filter).withForceQuotes())); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(new BandsWithOtherAbility(SuperType.LEGENDARY), Duration.WhileOnBattlefield, filter).withForceQuotes())); } private AdventurersGuildhouse(final AdventurersGuildhouse card) { diff --git a/Mage.Sets/src/mage/cards/a/AegisOfTheGods.java b/Mage.Sets/src/mage/cards/a/AegisOfTheGods.java index cb2066c38db..b26766f94a6 100644 --- a/Mage.Sets/src/mage/cards/a/AegisOfTheGods.java +++ b/Mage.Sets/src/mage/cards/a/AegisOfTheGods.java @@ -28,7 +28,7 @@ public final class AegisOfTheGods extends CardImpl { this.toughness = new MageInt(1); // You have hexproof. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControllerEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControllerEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield))); } private AegisOfTheGods(final AegisOfTheGods card) { diff --git a/Mage.Sets/src/mage/cards/a/AerialModification.java b/Mage.Sets/src/mage/cards/a/AerialModification.java index a9648df897a..2aced485449 100644 --- a/Mage.Sets/src/mage/cards/a/AerialModification.java +++ b/Mage.Sets/src/mage/cards/a/AerialModification.java @@ -44,12 +44,12 @@ public final class AerialModification extends CardImpl { this.addAbility(ability); // As long as enchanted permanent is a Vehicle, it's a creature in addition to its other types. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureIfVehicleEffect())); + this.addAbility(new SimpleStaticAbility(new BecomesCreatureIfVehicleEffect())); // Enchanted creature gets +2/+2 and has flying. Effect effect = new BoostEnchantedEffect(2, 2); effect.setText("Enchanted creature gets +2/+2"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText(" and has flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/a/AeronautTinkerer.java b/Mage.Sets/src/mage/cards/a/AeronautTinkerer.java index 769b373b33b..2e0a85a633f 100644 --- a/Mage.Sets/src/mage/cards/a/AeronautTinkerer.java +++ b/Mage.Sets/src/mage/cards/a/AeronautTinkerer.java @@ -34,7 +34,7 @@ public final class AeronautTinkerer extends CardImpl { this.toughness = new MageInt(3); // Aeronaut Tinkerer has flying as long as you control an artifact. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(new FilterControlledArtifactPermanent()), rule))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(new FilterControlledArtifactPermanent()), rule))); } diff --git a/Mage.Sets/src/mage/cards/a/AetherMeltdown.java b/Mage.Sets/src/mage/cards/a/AetherMeltdown.java index 5dd8864cad7..5a86fd7e514 100644 --- a/Mage.Sets/src/mage/cards/a/AetherMeltdown.java +++ b/Mage.Sets/src/mage/cards/a/AetherMeltdown.java @@ -47,7 +47,7 @@ public final class AetherMeltdown extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(2))); // Enchanted permanent gets -4/-0. Effect effect = new BoostEnchantedEffect(-4, 0, Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private AetherMeltdown(final AetherMeltdown card) { diff --git a/Mage.Sets/src/mage/cards/a/AetherStorm.java b/Mage.Sets/src/mage/cards/a/AetherStorm.java index 59adaa1b776..943d827cbac 100644 --- a/Mage.Sets/src/mage/cards/a/AetherStorm.java +++ b/Mage.Sets/src/mage/cards/a/AetherStorm.java @@ -27,7 +27,7 @@ public final class AetherStorm extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}"); // Creature spells can't be cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AetherStormReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new AetherStormReplacementEffect())); // Pay 4 life: Destroy Aether Storm. It can't be regenerated. Any player may activate this ability. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroySourceEffect(true), new PayLifeCost(4)); diff --git a/Mage.Sets/src/mage/cards/a/AggressiveMining.java b/Mage.Sets/src/mage/cards/a/AggressiveMining.java index 9d3cf0c2d40..4841c68211e 100644 --- a/Mage.Sets/src/mage/cards/a/AggressiveMining.java +++ b/Mage.Sets/src/mage/cards/a/AggressiveMining.java @@ -33,7 +33,7 @@ public final class AggressiveMining extends CardImpl { // You can't play lands. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AggressiveMiningEffect())); + this.addAbility(new SimpleStaticAbility(new AggressiveMiningEffect())); // Sacrifice a land: Draw two cards. Activate this ability only once each turn. Cost cost = new SacrificeTargetCost(StaticFilters.FILTER_LAND); diff --git a/Mage.Sets/src/mage/cards/a/Agoraphobia.java b/Mage.Sets/src/mage/cards/a/Agoraphobia.java index 9af799cb4a0..4753b6ab23f 100644 --- a/Mage.Sets/src/mage/cards/a/Agoraphobia.java +++ b/Mage.Sets/src/mage/cards/a/Agoraphobia.java @@ -38,7 +38,7 @@ public final class Agoraphobia extends CardImpl { this.addAbility(ability); // Enchanted creature gets -5/-0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-5, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-5, 0))); // {2}{U}: Return Agoraphobia to its owner's hand. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{2}{U}"))); diff --git a/Mage.Sets/src/mage/cards/a/AinokBondKin.java b/Mage.Sets/src/mage/cards/a/AinokBondKin.java index 76e4482c4dd..a3649c72a6d 100644 --- a/Mage.Sets/src/mage/cards/a/AinokBondKin.java +++ b/Mage.Sets/src/mage/cards/a/AinokBondKin.java @@ -31,7 +31,7 @@ public final class AinokBondKin extends CardImpl { this.addAbility(new OutlastAbility(new ManaCostsImpl<>("{1}{W}"))); // Each creature you control with a +1/+1 counter on it has first strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_EACH_CONTROLLED_CREATURE_P1P1))); @@ -46,4 +46,3 @@ public final class AinokBondKin extends CardImpl { return new AinokBondKin(this); } } - diff --git a/Mage.Sets/src/mage/cards/a/AirBladder.java b/Mage.Sets/src/mage/cards/a/AirBladder.java index 77131379fd7..98a8b7e60f7 100644 --- a/Mage.Sets/src/mage/cards/a/AirBladder.java +++ b/Mage.Sets/src/mage/cards/a/AirBladder.java @@ -35,10 +35,10 @@ public final class AirBladder extends CardImpl { this.addAbility(ability); // Enchanted creature has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); // Enchanted creature can block only creatures with flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockOnlyFlyingAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CanBlockOnlyFlyingAttachedEffect(AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/a/AkiriLineSlinger.java b/Mage.Sets/src/mage/cards/a/AkiriLineSlinger.java index 91ff1aeedfe..ed74652664e 100644 --- a/Mage.Sets/src/mage/cards/a/AkiriLineSlinger.java +++ b/Mage.Sets/src/mage/cards/a/AkiriLineSlinger.java @@ -40,7 +40,7 @@ public final class AkiriLineSlinger extends CardImpl { // Akiri, Line-Slinger gets +1/+0 for each artifact you control. Effect effect = new BoostSourceEffect(ArtifactYouControlCount.instance, StaticValue.get(0), Duration.WhileOnBattlefield); effect.setText("{this} gets +1/+0 for each artifact you control"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect) + this.addAbility(new SimpleStaticAbility(effect) .addHint(ArtifactYouControlHint.instance)); // Partner diff --git a/Mage.Sets/src/mage/cards/a/AkkiLavarunner.java b/Mage.Sets/src/mage/cards/a/AkkiLavarunner.java index f12786d3615..e999385adca 100644 --- a/Mage.Sets/src/mage/cards/a/AkkiLavarunner.java +++ b/Mage.Sets/src/mage/cards/a/AkkiLavarunner.java @@ -94,7 +94,7 @@ class TokTokVolcanoBorn extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); this.addAbility(ProtectionAbility.from(ObjectColor.RED)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TokTokVolcanoBornEffect())); + this.addAbility(new SimpleStaticAbility(new TokTokVolcanoBornEffect())); } private TokTokVolcanoBorn(final TokTokVolcanoBorn token) { super(token); diff --git a/Mage.Sets/src/mage/cards/a/AkkiUnderling.java b/Mage.Sets/src/mage/cards/a/AkkiUnderling.java index 33e193d7504..e626ccd726e 100644 --- a/Mage.Sets/src/mage/cards/a/AkkiUnderling.java +++ b/Mage.Sets/src/mage/cards/a/AkkiUnderling.java @@ -31,7 +31,7 @@ public final class AkkiUnderling extends CardImpl { // As long as you have seven or more cards in hand, Akki Underling gets +2/+1 and has first strike. Condition condition = new CardsInHandCondition(ComparisonType.MORE_THAN,6); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(2,1, Duration.WhileOnBattlefield), condition, "As long as you have seven or more cards in hand, {this} gets +2/+1")); ability.addEffect(new ConditionalContinuousEffect( new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield), condition, "and has first strike")); diff --git a/Mage.Sets/src/mage/cards/a/AkromasDevoted.java b/Mage.Sets/src/mage/cards/a/AkromasDevoted.java index 32c23bb8ef8..2c028119436 100644 --- a/Mage.Sets/src/mage/cards/a/AkromasDevoted.java +++ b/Mage.Sets/src/mage/cards/a/AkromasDevoted.java @@ -28,7 +28,7 @@ public final class AkromasDevoted extends CardImpl { this.toughness = new MageInt(4); // Cleric creatures have vigilance. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(VigilanceAbility.getInstance(), + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.CLERIC, "Cleric creatures")))); } diff --git a/Mage.Sets/src/mage/cards/a/AkromasMemorial.java b/Mage.Sets/src/mage/cards/a/AkromasMemorial.java index 2470c8c5ea7..7070b36a856 100644 --- a/Mage.Sets/src/mage/cards/a/AkromasMemorial.java +++ b/Mage.Sets/src/mage/cards/a/AkromasMemorial.java @@ -27,7 +27,7 @@ public final class AkromasMemorial extends CardImpl { // Creatures you control have flying, first strike, vigilance, trample, haste, and protection from black and from red. CompoundAbility compoundAbilities = new CompoundAbility(FlyingAbility.getInstance(), FirstStrikeAbility.getInstance(), VigilanceAbility.getInstance(), TrampleAbility.getInstance(), HasteAbility.getInstance(), ProtectionAbility.from(ObjectColor.BLACK, ObjectColor.RED)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(compoundAbilities, Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Creatures")))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(compoundAbilities, Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Creatures")))); } private AkromasMemorial(final AkromasMemorial card) { diff --git a/Mage.Sets/src/mage/cards/a/AkronLegionnaire.java b/Mage.Sets/src/mage/cards/a/AkronLegionnaire.java index 654c17694a4..1ff3c9677ec 100644 --- a/Mage.Sets/src/mage/cards/a/AkronLegionnaire.java +++ b/Mage.Sets/src/mage/cards/a/AkronLegionnaire.java @@ -37,7 +37,7 @@ public final class AkronLegionnaire extends CardImpl { // Except for creatures named Akron Legionnaire and artifact creatures, creatures you control can't attack. Effect effect = new CantAttackAllEffect(Duration.WhileOnBattlefield, filter); effect.setText("Except for creatures named Akron Legionnaire and artifact creatures, creatures you control can't attack"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/a/AlexisCloak.java b/Mage.Sets/src/mage/cards/a/AlexisCloak.java index 358fe9d2e3d..7949315d695 100644 --- a/Mage.Sets/src/mage/cards/a/AlexisCloak.java +++ b/Mage.Sets/src/mage/cards/a/AlexisCloak.java @@ -34,7 +34,7 @@ public final class AlexisCloak extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has shroud. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA))); } private AlexisCloak(final AlexisCloak card) { diff --git a/Mage.Sets/src/mage/cards/a/AlhammarretHighArbiter.java b/Mage.Sets/src/mage/cards/a/AlhammarretHighArbiter.java index 978fef081f4..5e37d2046c6 100644 --- a/Mage.Sets/src/mage/cards/a/AlhammarretHighArbiter.java +++ b/Mage.Sets/src/mage/cards/a/AlhammarretHighArbiter.java @@ -40,7 +40,7 @@ public final class AlhammarretHighArbiter extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // As Alhammarret, High Arbiter enters the battlefield, each opponent reveals their hand. You choose the name of a nonland card revealed this way. // Your opponents can't cast spells with the chosen name. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EntersBattlefieldEffect(new AlhammarretHighArbiterEffect(), ""))); + this.addAbility(new SimpleStaticAbility(new EntersBattlefieldEffect(new AlhammarretHighArbiterEffect(), ""))); } private AlhammarretHighArbiter(final AlhammarretHighArbiter card) { diff --git a/Mage.Sets/src/mage/cards/a/AlhammarretsArchive.java b/Mage.Sets/src/mage/cards/a/AlhammarretsArchive.java index f3ed61ac613..1ce92cda1b2 100644 --- a/Mage.Sets/src/mage/cards/a/AlhammarretsArchive.java +++ b/Mage.Sets/src/mage/cards/a/AlhammarretsArchive.java @@ -24,10 +24,10 @@ public final class AlhammarretsArchive extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // If you would gain life, you gain twice that much life instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AlhammarretsArchiveEffect())); + this.addAbility(new SimpleStaticAbility(new AlhammarretsArchiveEffect())); // If you draw a card except the first one you draw in each of your draw steps, draw two cards instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AlhammarretsArchiveReplacementEffect()), new CardsDrawnDuringDrawStepWatcher()); + this.addAbility(new SimpleStaticAbility(new AlhammarretsArchiveReplacementEffect()), new CardsDrawnDuringDrawStepWatcher()); } private AlhammarretsArchive(final AlhammarretsArchive card) { diff --git a/Mage.Sets/src/mage/cards/a/AliFromCairo.java b/Mage.Sets/src/mage/cards/a/AliFromCairo.java index fd59a73b719..6722d506744 100644 --- a/Mage.Sets/src/mage/cards/a/AliFromCairo.java +++ b/Mage.Sets/src/mage/cards/a/AliFromCairo.java @@ -28,7 +28,7 @@ public final class AliFromCairo extends CardImpl { this.toughness = new MageInt(1); // Damage that would reduce your life total to less than 1 reduces it to 1 instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AliFromCairoReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new AliFromCairoReplacementEffect())); } private AliFromCairo(final AliFromCairo card) { diff --git a/Mage.Sets/src/mage/cards/a/AlloyGolem.java b/Mage.Sets/src/mage/cards/a/AlloyGolem.java index 1afcccc96da..814bfae1e1b 100644 --- a/Mage.Sets/src/mage/cards/a/AlloyGolem.java +++ b/Mage.Sets/src/mage/cards/a/AlloyGolem.java @@ -33,7 +33,7 @@ public final class AlloyGolem extends CardImpl { Ability ability = new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Neutral)); ability.addEffect(new EnterAttributeSetChosenColorEffect()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SetChosenColorEffect())); + this.addAbility(new SimpleStaticAbility(new SetChosenColorEffect())); } private AlloyGolem(final AlloyGolem card) { diff --git a/Mage.Sets/src/mage/cards/a/AlmsCollector.java b/Mage.Sets/src/mage/cards/a/AlmsCollector.java index f1a5e2c95e7..95dd9afa7db 100644 --- a/Mage.Sets/src/mage/cards/a/AlmsCollector.java +++ b/Mage.Sets/src/mage/cards/a/AlmsCollector.java @@ -35,7 +35,7 @@ public final class AlmsCollector extends CardImpl { this.addAbility(FlashAbility.getInstance()); // If an opponent would draw two or more cards, instead you and that player each draw a card. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AlmsCollectorReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new AlmsCollectorReplacementEffect())); } private AlmsCollector(final AlmsCollector card) { diff --git a/Mage.Sets/src/mage/cards/a/AlphaAuthority.java b/Mage.Sets/src/mage/cards/a/AlphaAuthority.java index 4d38e6629b4..7797f39291c 100644 --- a/Mage.Sets/src/mage/cards/a/AlphaAuthority.java +++ b/Mage.Sets/src/mage/cards/a/AlphaAuthority.java @@ -34,7 +34,7 @@ public final class AlphaAuthority extends CardImpl { this.addAbility(ability); // Enchanted creature has hexproof and can't be blocked by more than one creature. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HexproofAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new GainAbilityAttachedEffect(HexproofAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield)); Effect effect = new CantBeBlockedByMoreThanOneAttachedEffect(AttachmentType.AURA); effect.setText("and can't be blocked by more than one creature"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/a/AlphaStatus.java b/Mage.Sets/src/mage/cards/a/AlphaStatus.java index 36f8a0db5af..958d3ffcd18 100644 --- a/Mage.Sets/src/mage/cards/a/AlphaStatus.java +++ b/Mage.Sets/src/mage/cards/a/AlphaStatus.java @@ -37,7 +37,7 @@ public final class AlphaStatus extends CardImpl { // Enchanted creature gets +2/+2 for each other creature on the battlefield that shares a creature type with it. DynamicValue dynamicValue = new AlphaStatusDynamicValue(); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(dynamicValue, dynamicValue, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(dynamicValue, dynamicValue, Duration.WhileOnBattlefield))); } private AlphaStatus(final AlphaStatus card) { diff --git a/Mage.Sets/src/mage/cards/a/AlpineMoon.java b/Mage.Sets/src/mage/cards/a/AlpineMoon.java index d1fe7619ea6..da13a2bff44 100644 --- a/Mage.Sets/src/mage/cards/a/AlpineMoon.java +++ b/Mage.Sets/src/mage/cards/a/AlpineMoon.java @@ -30,7 +30,7 @@ public final class AlpineMoon extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseACardNameEffect(ChooseACardNameEffect.TypeOfName.NONBASIC_LAND_NAME))); // Lands your opponents control with the chosen name lose all land types and abilities, and they gain "{T}: Add one mana of any color." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AlpineMoonEffect())); + this.addAbility(new SimpleStaticAbility(new AlpineMoonEffect())); } private AlpineMoon(final AlpineMoon card) { diff --git a/Mage.Sets/src/mage/cards/a/AltarGolem.java b/Mage.Sets/src/mage/cards/a/AltarGolem.java index 3c9f8c399ef..28b8d99cf13 100644 --- a/Mage.Sets/src/mage/cards/a/AltarGolem.java +++ b/Mage.Sets/src/mage/cards/a/AltarGolem.java @@ -50,7 +50,7 @@ public final class AltarGolem extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetBasePowerToughnessSourceEffect(amount))); // Altar Golem doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // Tap five untapped creatures you control: Untap Altar Golem. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(5, 5, filter, true)))); diff --git a/Mage.Sets/src/mage/cards/a/AlwaysWatching.java b/Mage.Sets/src/mage/cards/a/AlwaysWatching.java index 464b6f395c5..85806acd384 100644 --- a/Mage.Sets/src/mage/cards/a/AlwaysWatching.java +++ b/Mage.Sets/src/mage/cards/a/AlwaysWatching.java @@ -32,7 +32,7 @@ public final class AlwaysWatching extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{W}{W}"); // Nontoken creatures you control get +1/+1 and have vigilance. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter)); + Ability ability = new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter)); Effect effect = new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filter); effect.setText("and have vigilance"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/a/AmbushCommander.java b/Mage.Sets/src/mage/cards/a/AmbushCommander.java index c8326fa36ba..c3a94efbce0 100644 --- a/Mage.Sets/src/mage/cards/a/AmbushCommander.java +++ b/Mage.Sets/src/mage/cards/a/AmbushCommander.java @@ -43,7 +43,7 @@ public final class AmbushCommander extends CardImpl { new CreatureToken(1, 1, "1/1 green Elf creatures").withColor("G").withSubType(SubType.ELF), "lands", filter2, Duration.WhileOnBattlefield, true); effect.getDependencyTypes().add(DependencyType.BecomeForest); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // {1}{G}, Sacrifice an Elf: Target creature gets +3/+3 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(3, 3, Duration.EndOfTurn), diff --git a/Mage.Sets/src/mage/cards/a/AnHavvaConstable.java b/Mage.Sets/src/mage/cards/a/AnHavvaConstable.java index 0d0e37d51c6..f077d739041 100644 --- a/Mage.Sets/src/mage/cards/a/AnHavvaConstable.java +++ b/Mage.Sets/src/mage/cards/a/AnHavvaConstable.java @@ -29,7 +29,7 @@ public final class AnHavvaConstable extends CardImpl { this.toughness = new MageInt(1); // An-Havva Constable's toughness is equal to 1 plus the number of green creatures on the battlefield. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AnHavvaConstableEffect())); + this.addAbility(new SimpleStaticAbility(new AnHavvaConstableEffect())); } private AnHavvaConstable(final AnHavvaConstable card) { diff --git a/Mage.Sets/src/mage/cards/a/AnabaSpiritCrafter.java b/Mage.Sets/src/mage/cards/a/AnabaSpiritCrafter.java index eb50d85134d..6f55e9ab5e1 100644 --- a/Mage.Sets/src/mage/cards/a/AnabaSpiritCrafter.java +++ b/Mage.Sets/src/mage/cards/a/AnabaSpiritCrafter.java @@ -33,7 +33,7 @@ public final class AnabaSpiritCrafter extends CardImpl { this.toughness = new MageInt(3); // Minotaur creatures get +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 0, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 0, Duration.WhileOnBattlefield, filter, false))); } private AnabaSpiritCrafter(final AnabaSpiritCrafter card) { diff --git a/Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java b/Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java index 0846e7444e7..0dc09db1b19 100644 --- a/Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java +++ b/Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java @@ -52,7 +52,7 @@ public final class AnafenzaTheForemost extends CardImpl { this.addAbility(ability); // If a nontoken creature an opponent owns would die or a creature card not on the battlefield would be put into an opponent's graveyard, exile that card instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AnafenzaTheForemostEffect())); + this.addAbility(new SimpleStaticAbility(new AnafenzaTheForemostEffect())); } private AnafenzaTheForemost(final AnafenzaTheForemost card) { diff --git a/Mage.Sets/src/mage/cards/a/AnakinSkywalker.java b/Mage.Sets/src/mage/cards/a/AnakinSkywalker.java index ff037d42aa1..45af92015a5 100644 --- a/Mage.Sets/src/mage/cards/a/AnakinSkywalker.java +++ b/Mage.Sets/src/mage/cards/a/AnakinSkywalker.java @@ -51,7 +51,7 @@ public final class AnakinSkywalker extends CardImpl { // If Anakin Skywalker would be destroyed, regenerate, then transform him instead. this.addAbility(new TransformAbility()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AnakinSkywalkerEffect())); + this.addAbility(new SimpleStaticAbility(new AnakinSkywalkerEffect())); } diff --git a/Mage.Sets/src/mage/cards/a/AncestralVengeance.java b/Mage.Sets/src/mage/cards/a/AncestralVengeance.java index ae6f7f9414a..a01001024ec 100644 --- a/Mage.Sets/src/mage/cards/a/AncestralVengeance.java +++ b/Mage.Sets/src/mage/cards/a/AncestralVengeance.java @@ -40,7 +40,7 @@ public final class AncestralVengeance extends CardImpl { this.addAbility(ability); // Enchanted creature gets -1/-1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-1, -1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-1, -1, Duration.WhileOnBattlefield))); } private AncestralVengeance(final AncestralVengeance card) { diff --git a/Mage.Sets/src/mage/cards/a/AngelOfInvention.java b/Mage.Sets/src/mage/cards/a/AngelOfInvention.java index 740a4fbfe49..4481871950e 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfInvention.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfInvention.java @@ -37,7 +37,7 @@ public final class AngelOfInvention extends CardImpl { // Fabricate 2 this.addAbility(new FabricateAbility(2)); // Other creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, true))); } private AngelOfInvention(final AngelOfInvention card) { diff --git a/Mage.Sets/src/mage/cards/a/AngelOfJubilation.java b/Mage.Sets/src/mage/cards/a/AngelOfJubilation.java index b2f51d8da59..535752c85f4 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfJubilation.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfJubilation.java @@ -36,7 +36,7 @@ public final class AngelOfJubilation extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Other nonblack creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES_NON_BLACK, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES_NON_BLACK, true))); // Players can't pay life or sacrifice creatures to cast spells or activate abilities. Ability ability = new SimpleStaticAbility(new AngelOfJubilationEffect()); diff --git a/Mage.Sets/src/mage/cards/a/AngelicArbiter.java b/Mage.Sets/src/mage/cards/a/AngelicArbiter.java index b799e68b472..c774819091b 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicArbiter.java +++ b/Mage.Sets/src/mage/cards/a/AngelicArbiter.java @@ -34,10 +34,10 @@ public final class AngelicArbiter extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Each opponent who cast a spell this turn can't attack with creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AngelicArbiterCantAttackTargetEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new AngelicArbiterCantAttackTargetEffect(Duration.WhileOnBattlefield))); // Each opponent who attacked with a creature this turn can't cast spells. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AngelicArbiterEffect2()), new PlayerAttackedWatcher()); + this.addAbility(new SimpleStaticAbility(new AngelicArbiterEffect2()), new PlayerAttackedWatcher()); } private AngelicArbiter(final AngelicArbiter card) { diff --git a/Mage.Sets/src/mage/cards/a/AngelicDestiny.java b/Mage.Sets/src/mage/cards/a/AngelicDestiny.java index 5cf5e25c687..a3aeba3e175 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicDestiny.java +++ b/Mage.Sets/src/mage/cards/a/AngelicDestiny.java @@ -38,7 +38,7 @@ public final class AngelicDestiny extends CardImpl { this.addAbility(ability); // Enchanted creature gets +4/+4, has flying and first strike, and is an Angel in addition to its other types. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(4, 4, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(4, 4, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText(", has flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/a/AngelicGift.java b/Mage.Sets/src/mage/cards/a/AngelicGift.java index 1eed31cce37..de37d0b2ad1 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicGift.java +++ b/Mage.Sets/src/mage/cards/a/AngelicGift.java @@ -37,7 +37,7 @@ public final class AngelicGift extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); // Enchanted creature has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); } private AngelicGift(final AngelicGift card) { diff --git a/Mage.Sets/src/mage/cards/a/AngelicOverseer.java b/Mage.Sets/src/mage/cards/a/AngelicOverseer.java index 48d49d07e0a..507b689ab74 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicOverseer.java +++ b/Mage.Sets/src/mage/cards/a/AngelicOverseer.java @@ -43,7 +43,7 @@ public final class AngelicOverseer extends CardImpl { // As long as you control a Human, Angelic Overseer has hexproof and is indestructible. ConditionalContinuousEffect effect1 = new ConditionalContinuousEffect(new GainAbilitySourceEffect(HexproofAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), rule1); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect1); + Ability ability = new SimpleStaticAbility(effect1); ConditionalContinuousEffect effect2 = new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), rule2); ability.addEffect(effect2); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AngelicShield.java b/Mage.Sets/src/mage/cards/a/AngelicShield.java index eb6222638f8..10cfe3fe663 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicShield.java +++ b/Mage.Sets/src/mage/cards/a/AngelicShield.java @@ -26,7 +26,7 @@ public final class AngelicShield extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{W}{U}"); // Creatures you control get +0/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield))); // Sacrifice Angelic Shield: Return target creature to its owner's hand. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/a/AngelsTrumpet.java b/Mage.Sets/src/mage/cards/a/AngelsTrumpet.java index bdaa033fa4b..082613a8c32 100644 --- a/Mage.Sets/src/mage/cards/a/AngelsTrumpet.java +++ b/Mage.Sets/src/mage/cards/a/AngelsTrumpet.java @@ -27,7 +27,7 @@ public final class AngelsTrumpet extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // All creatures have vigilance. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_CREATURES))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_CREATURES))); // At the beginning of each player's end step, tap all untapped creatures that player controls that didn't attack this turn. Angel's Trumpet deals damage to the player equal to the number of creatures tapped this way. this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.EACH_PLAYER, new AngelsTrumpetTapEffect(), false)); diff --git a/Mage.Sets/src/mage/cards/a/AngrathsMarauders.java b/Mage.Sets/src/mage/cards/a/AngrathsMarauders.java index a90287a641c..a6a02096c16 100644 --- a/Mage.Sets/src/mage/cards/a/AngrathsMarauders.java +++ b/Mage.Sets/src/mage/cards/a/AngrathsMarauders.java @@ -32,7 +32,7 @@ public final class AngrathsMarauders extends CardImpl { this.toughness = new MageInt(4); // If a source you control would deal damage to a permanent or player, it deals double that damage to that permanent or player instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AngrathsMaraudersEffect())); + this.addAbility(new SimpleStaticAbility(new AngrathsMaraudersEffect())); } private AngrathsMarauders(final AngrathsMarauders card) { diff --git a/Mage.Sets/src/mage/cards/a/AngryMob.java b/Mage.Sets/src/mage/cards/a/AngryMob.java index a85c6468100..aa9f1897bfd 100644 --- a/Mage.Sets/src/mage/cards/a/AngryMob.java +++ b/Mage.Sets/src/mage/cards/a/AngryMob.java @@ -39,7 +39,7 @@ public final class AngryMob extends CardImpl { // As long as it's your turn, Angry Mob's power and toughness are each equal to 2 plus the number of Swamps your opponents control. As long as it's not your turn, Angry Mob's power and toughness are each 2. PermanentsOnBattlefieldCount swamps = new PermanentsOnBattlefieldCount(filter); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(swamps, swamps, Duration.WhileOnBattlefield), MyTurnCondition.instance, "During your turn, {this}'s power and toughness are each equal to 2 plus the number of Swamps your opponents control. During turns other than yours, {this}'s power and toughness are each 2")) diff --git a/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java b/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java index a5d14feb1c5..7ec2f30c3d5 100644 --- a/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java +++ b/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java @@ -42,7 +42,7 @@ public final class AnimalBoneyard extends CardImpl { gainedAbility.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{T}, Sacrifice a creature: You gain life equal to the sacrificed creature's toughness.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private AnimalBoneyard(final AnimalBoneyard card) { diff --git a/Mage.Sets/src/mage/cards/a/AnimarSoulOfElements.java b/Mage.Sets/src/mage/cards/a/AnimarSoulOfElements.java index e079cd58301..0b697a9b82c 100644 --- a/Mage.Sets/src/mage/cards/a/AnimarSoulOfElements.java +++ b/Mage.Sets/src/mage/cards/a/AnimarSoulOfElements.java @@ -40,7 +40,7 @@ public final class AnimarSoulOfElements extends CardImpl { this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), StaticFilters.FILTER_SPELL_A_CREATURE, false)); // Creature spells you cast cost {1} less to cast for each +1/+1 counter on Animar. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AnimarCostReductionEffect())); + this.addAbility(new SimpleStaticAbility(new AnimarCostReductionEffect())); } diff --git a/Mage.Sets/src/mage/cards/a/AnimateArtifact.java b/Mage.Sets/src/mage/cards/a/AnimateArtifact.java index 1430feebaf2..3b40eec226e 100644 --- a/Mage.Sets/src/mage/cards/a/AnimateArtifact.java +++ b/Mage.Sets/src/mage/cards/a/AnimateArtifact.java @@ -42,7 +42,7 @@ public final class AnimateArtifact extends CardImpl { this.addAbility(ability); // As long as enchanted artifact isn't a creature, it's an artifact creature with power and toughness each equal to its converted mana cost. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AnimateArtifactContinuousEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new AnimateArtifactContinuousEffect(Duration.WhileOnBattlefield))); } private AnimateArtifact(final AnimateArtifact card) { diff --git a/Mage.Sets/src/mage/cards/a/AnimateWall.java b/Mage.Sets/src/mage/cards/a/AnimateWall.java index 398d8b26129..7b852039321 100644 --- a/Mage.Sets/src/mage/cards/a/AnimateWall.java +++ b/Mage.Sets/src/mage/cards/a/AnimateWall.java @@ -41,10 +41,10 @@ public final class AnimateWall extends CardImpl { this.addAbility(ability); // Enchanted Wall can attack as though it didn't have defender. - Ability canAttackAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.WhileOnBattlefield)); + Ability canAttackAbility = new SimpleStaticAbility(new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.WhileOnBattlefield)); Effect enchantEffect = new GainAbilityAttachedEffect(canAttackAbility, AttachmentType.AURA, Duration.WhileOnBattlefield); enchantEffect.setText("Enchanted Wall can attack as though it didn't have defender"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, enchantEffect)); + this.addAbility(new SimpleStaticAbility(enchantEffect)); } private AnimateWall(final AnimateWall card) { diff --git a/Mage.Sets/src/mage/cards/a/Annex.java b/Mage.Sets/src/mage/cards/a/Annex.java index 8518e84fec3..e20c831cba4 100644 --- a/Mage.Sets/src/mage/cards/a/Annex.java +++ b/Mage.Sets/src/mage/cards/a/Annex.java @@ -33,7 +33,7 @@ public final class Annex extends CardImpl { this.addAbility(ability); // You control enchanted land. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect("land"))); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect("land"))); } private Annex(final Annex card) { diff --git a/Mage.Sets/src/mage/cards/a/AnointedProcession.java b/Mage.Sets/src/mage/cards/a/AnointedProcession.java index b6835921a0e..862634c2f3f 100644 --- a/Mage.Sets/src/mage/cards/a/AnointedProcession.java +++ b/Mage.Sets/src/mage/cards/a/AnointedProcession.java @@ -19,7 +19,7 @@ public final class AnointedProcession extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); // If an effect would create one or more tokens under your control, it creates twice that many of those tokens instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CreateTwiceThatManyTokensEffect())); + this.addAbility(new SimpleStaticAbility(new CreateTwiceThatManyTokensEffect())); } private AnointedProcession(final AnointedProcession card) { diff --git a/Mage.Sets/src/mage/cards/a/AnthemOfRakdos.java b/Mage.Sets/src/mage/cards/a/AnthemOfRakdos.java index 042ee5c0009..520e001ee70 100644 --- a/Mage.Sets/src/mage/cards/a/AnthemOfRakdos.java +++ b/Mage.Sets/src/mage/cards/a/AnthemOfRakdos.java @@ -38,7 +38,7 @@ public final class AnthemOfRakdos extends CardImpl { this.addAbility(ability); // Hellbent - As long as you have no cards in hand, if a source you control would deal damage to a creature or player, it deals double that damage to that creature or player instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AnthemOfRakdosHellbentEffect())); + this.addAbility(new SimpleStaticAbility(new AnthemOfRakdosHellbentEffect())); } private AnthemOfRakdos(final AnthemOfRakdos card) { diff --git a/Mage.Sets/src/mage/cards/a/AntiMagicAura.java b/Mage.Sets/src/mage/cards/a/AntiMagicAura.java index 99531330278..4fb0772a235 100644 --- a/Mage.Sets/src/mage/cards/a/AntiMagicAura.java +++ b/Mage.Sets/src/mage/cards/a/AntiMagicAura.java @@ -38,7 +38,7 @@ public final class AntiMagicAura extends CardImpl { // Enchanted creature can't be the target of spells and can't be enchanted by other Auras. CantBeTargetedAttachedEffect cantTargetEffect = new CantBeTargetedAttachedEffect(new FilterSpell("spells"), Duration.WhileOnBattlefield, AttachmentType.AURA, TargetController.ANY); - Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, cantTargetEffect); + Ability ability2 = new SimpleStaticAbility(cantTargetEffect); ability2.addEffect(new AntiMagicAuraRuleEffect()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/a/AnvilOfBogardan.java b/Mage.Sets/src/mage/cards/a/AnvilOfBogardan.java index 9bcdbb74394..dbf38a698d8 100644 --- a/Mage.Sets/src/mage/cards/a/AnvilOfBogardan.java +++ b/Mage.Sets/src/mage/cards/a/AnvilOfBogardan.java @@ -26,7 +26,7 @@ public final class AnvilOfBogardan extends CardImpl { // Players have no maximum hand size. Effect effect = new MaximumHandSizeControllerEffect(Integer.MAX_VALUE, Duration.WhileOnBattlefield, HandSizeModification.SET, TargetController.ANY); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // At the beginning of each player's draw step, that player draws an additional card, then discards a card. this.addAbility(new BeginningOfDrawTriggeredAbility(TargetController.EACH_PLAYER, new AnvilOfBogardanEffect(), false)); diff --git a/Mage.Sets/src/mage/cards/a/AqueousForm.java b/Mage.Sets/src/mage/cards/a/AqueousForm.java index 2feb1fa12f1..54cf1496632 100644 --- a/Mage.Sets/src/mage/cards/a/AqueousForm.java +++ b/Mage.Sets/src/mage/cards/a/AqueousForm.java @@ -33,7 +33,7 @@ public final class AqueousForm extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't be blocked. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedAttachedEffect(AttachmentType.AURA))); // Whenever enchanted creature attacks, scry 1. this.addAbility(new AttacksAttachedTriggeredAbility(new ScryEffect(1), AttachmentType.AURA,false)); diff --git a/Mage.Sets/src/mage/cards/a/ArachnusWeb.java b/Mage.Sets/src/mage/cards/a/ArachnusWeb.java index 5a488b8cecd..5b0c4b8bd45 100644 --- a/Mage.Sets/src/mage/cards/a/ArachnusWeb.java +++ b/Mage.Sets/src/mage/cards/a/ArachnusWeb.java @@ -36,7 +36,7 @@ public final class ArachnusWeb extends CardImpl { this.addAbility(ability); // Enchanted creature can't attack or block, and its activated abilities can't be activated. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAttackActivateAttachedEffect())); + this.addAbility(new SimpleStaticAbility(new CantBlockAttackActivateAttachedEffect())); // At the beginning of the end step, if enchanted creature's power is 4 or greater, destroy Arachnus Web. FilterPermanent filter = new FilterPermanent("if enchanted creature's power is 4 or greater"); filter.add(new PowerPredicate(ComparisonType.MORE_THAN, 3)); diff --git a/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java b/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java index bd2dda43293..3247fb35aec 100644 --- a/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java +++ b/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java @@ -48,7 +48,7 @@ public final class ArcadesSabboth extends CardImpl { new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{G}{W}{U}")))); // Each untapped creature you control gets +0/+2 as long as it's not attacking. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(0, 2, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(0, 2, Duration.WhileOnBattlefield, filter, false))); // {W}: Arcades Sabboth gets +0/+1 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); diff --git a/Mage.Sets/src/mage/cards/a/ArcaneFlight.java b/Mage.Sets/src/mage/cards/a/ArcaneFlight.java index df6222d567d..db8e4508a4c 100644 --- a/Mage.Sets/src/mage/cards/a/ArcaneFlight.java +++ b/Mage.Sets/src/mage/cards/a/ArcaneFlight.java @@ -36,7 +36,7 @@ public final class ArcaneFlight extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1 and has flying - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText("and has flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/a/ArcaneLaboratory.java b/Mage.Sets/src/mage/cards/a/ArcaneLaboratory.java index 54570cc9024..32bcfb4169b 100644 --- a/Mage.Sets/src/mage/cards/a/ArcaneLaboratory.java +++ b/Mage.Sets/src/mage/cards/a/ArcaneLaboratory.java @@ -21,7 +21,7 @@ public final class ArcaneLaboratory extends CardImpl { // Each player can't cast more than one spell each turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantCastMoreThanOneSpellEffect(TargetController.ANY))); + this.addAbility(new SimpleStaticAbility(new CantCastMoreThanOneSpellEffect(TargetController.ANY))); } private ArcaneLaboratory(final ArcaneLaboratory card) { diff --git a/Mage.Sets/src/mage/cards/a/ArcanumWings.java b/Mage.Sets/src/mage/cards/a/ArcanumWings.java index 7aa520175c8..9bae2d422f8 100644 --- a/Mage.Sets/src/mage/cards/a/ArcanumWings.java +++ b/Mage.Sets/src/mage/cards/a/ArcanumWings.java @@ -34,7 +34,7 @@ public final class ArcanumWings extends CardImpl { this.addAbility(ability); // Enchanted creature has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); // Aura swap {2}{U} this.addAbility(new AuraSwapAbility(new ManaCostsImpl<>("{2}{U}"))); diff --git a/Mage.Sets/src/mage/cards/a/ArchangelOfStrife.java b/Mage.Sets/src/mage/cards/a/ArchangelOfStrife.java index 8fda073bba3..a6d36d38479 100644 --- a/Mage.Sets/src/mage/cards/a/ArchangelOfStrife.java +++ b/Mage.Sets/src/mage/cards/a/ArchangelOfStrife.java @@ -37,10 +37,10 @@ public final class ArchangelOfStrife extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ArchangelOfStrifeChooseEffect())); // Creatures controlled by players who chose war get +3/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ArchangelOfStrifeWarEffect())); + this.addAbility(new SimpleStaticAbility(new ArchangelOfStrifeWarEffect())); // Creatures controlled by players who chose peace get +0/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ArchangelOfStrifePeaceEffect())); + this.addAbility(new SimpleStaticAbility(new ArchangelOfStrifePeaceEffect())); } private ArchangelOfStrife(final ArchangelOfStrife card) { diff --git a/Mage.Sets/src/mage/cards/a/ArchangelOfTithes.java b/Mage.Sets/src/mage/cards/a/ArchangelOfTithes.java index d08e7b2329e..a9e920024c2 100644 --- a/Mage.Sets/src/mage/cards/a/ArchangelOfTithes.java +++ b/Mage.Sets/src/mage/cards/a/ArchangelOfTithes.java @@ -35,10 +35,10 @@ public final class ArchangelOfTithes extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // As long as Archangel of Tithes is untapped, creatures can't attack you or a planeswalker you control unless their controller pays {1} for each of those creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ArchangelOfTithesPayManaToAttackAllEffect())); + this.addAbility(new SimpleStaticAbility(new ArchangelOfTithesPayManaToAttackAllEffect())); // As long as Archangel of Tithes is attacking, creatures can't block unless their controller pays {1} for each of those creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ArchangelOfTithesPayManaToBlockAllEffect())); + this.addAbility(new SimpleStaticAbility(new ArchangelOfTithesPayManaToBlockAllEffect())); } private ArchangelOfTithes(final ArchangelOfTithes card) { diff --git a/Mage.Sets/src/mage/cards/a/ArchonOfValorsReach.java b/Mage.Sets/src/mage/cards/a/ArchonOfValorsReach.java index 42149989237..8ed4f8c1760 100644 --- a/Mage.Sets/src/mage/cards/a/ArchonOfValorsReach.java +++ b/Mage.Sets/src/mage/cards/a/ArchonOfValorsReach.java @@ -53,7 +53,7 @@ public final class ArchonOfValorsReach extends CardImpl { )); // Players can't cast spells of the chosen type. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ArchonOfValorsReachReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new ArchonOfValorsReachReplacementEffect())); } private ArchonOfValorsReach(final ArchonOfValorsReach card) { diff --git a/Mage.Sets/src/mage/cards/a/ArcticAven.java b/Mage.Sets/src/mage/cards/a/ArcticAven.java index 32dddb0688a..def04d87a63 100644 --- a/Mage.Sets/src/mage/cards/a/ArcticAven.java +++ b/Mage.Sets/src/mage/cards/a/ArcticAven.java @@ -41,7 +41,7 @@ public final class ArcticAven extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Arctic Aven gets +1/+1 as long as you control a Plains. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceWhileControlsEffect(filter, 1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filter, 1, 1))); // {W}: Arctic Aven gains lifelink until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), diff --git a/Mage.Sets/src/mage/cards/a/ArdentRecruit.java b/Mage.Sets/src/mage/cards/a/ArdentRecruit.java index a8ab1d943e8..0d2b7298e6f 100644 --- a/Mage.Sets/src/mage/cards/a/ArdentRecruit.java +++ b/Mage.Sets/src/mage/cards/a/ArdentRecruit.java @@ -31,7 +31,7 @@ public final class ArdentRecruit extends CardImpl { ContinuousEffect boostSource = new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield); ConditionalContinuousEffect effect = new ConditionalContinuousEffect(boostSource, MetalcraftCondition.instance, "{this} gets +2/+2 as long as you control three or more artifacts"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); ability.setAbilityWord(AbilityWord.METALCRAFT); ability.addHint(MetalcraftHint.instance); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/ArgentumArmor.java b/Mage.Sets/src/mage/cards/a/ArgentumArmor.java index c4e8cab728f..e90ad9c7c2a 100644 --- a/Mage.Sets/src/mage/cards/a/ArgentumArmor.java +++ b/Mage.Sets/src/mage/cards/a/ArgentumArmor.java @@ -28,7 +28,7 @@ public final class ArgentumArmor extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +6/+6. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(6, 6))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(6, 6))); // Whenever equipped creature attacks, destroy target permanent. Ability ability = new AttacksAttachedTriggeredAbility(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/cards/a/ArmadilloCloak.java b/Mage.Sets/src/mage/cards/a/ArmadilloCloak.java index 74ba32112c3..5d558ed9071 100644 --- a/Mage.Sets/src/mage/cards/a/ArmadilloCloak.java +++ b/Mage.Sets/src/mage/cards/a/ArmadilloCloak.java @@ -37,7 +37,7 @@ public final class ArmadilloCloak extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2 and has trample. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA); effect.setText("and has trample"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/a/ArmamentMaster.java b/Mage.Sets/src/mage/cards/a/ArmamentMaster.java index c6bd0f0788e..46591b108a7 100644 --- a/Mage.Sets/src/mage/cards/a/ArmamentMaster.java +++ b/Mage.Sets/src/mage/cards/a/ArmamentMaster.java @@ -35,7 +35,7 @@ public final class ArmamentMaster extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ArmamentMasterEffect())); + this.addAbility(new SimpleStaticAbility(new ArmamentMasterEffect())); } private ArmamentMaster(final ArmamentMaster card) { @@ -99,4 +99,4 @@ class ArmamentMasterEffect extends ContinuousEffectImpl { return count; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/a/ArmamentOfNyx.java b/Mage.Sets/src/mage/cards/a/ArmamentOfNyx.java index 10662727c23..c1c9c6f794b 100644 --- a/Mage.Sets/src/mage/cards/a/ArmamentOfNyx.java +++ b/Mage.Sets/src/mage/cards/a/ArmamentOfNyx.java @@ -47,7 +47,7 @@ public final class ArmamentOfNyx extends CardImpl { this.addAbility(ability); Condition condition = new AttachedToMatchesFilterCondition(filter); // Enchanted creature has double strike as long as it's an enchantment. Otherwise, prevent all damage that would be dealt by enchanted creature - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilityAttachedEffect(DoubleStrikeAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield), condition, "Enchanted creature has double strike as long as it's an enchantment")); ReplacementEffect effect = new PreventAllDamageByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", false); diff --git a/Mage.Sets/src/mage/cards/a/ArmorOfFaith.java b/Mage.Sets/src/mage/cards/a/ArmorOfFaith.java index f82b60729ce..f9ee8e5f6d7 100644 --- a/Mage.Sets/src/mage/cards/a/ArmorOfFaith.java +++ b/Mage.Sets/src/mage/cards/a/ArmorOfFaith.java @@ -32,7 +32,7 @@ public final class ArmorOfFaith extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); // {W}: Enchanted creature gets +0/+1 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } diff --git a/Mage.Sets/src/mage/cards/a/ArmorOfThorns.java b/Mage.Sets/src/mage/cards/a/ArmorOfThorns.java index 69b30553c8e..6f2740c6efd 100644 --- a/Mage.Sets/src/mage/cards/a/ArmorOfThorns.java +++ b/Mage.Sets/src/mage/cards/a/ArmorOfThorns.java @@ -35,7 +35,7 @@ public final class ArmorOfThorns extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); } private ArmorOfThorns(final ArmorOfThorns card) { diff --git a/Mage.Sets/src/mage/cards/a/ArmorSliver.java b/Mage.Sets/src/mage/cards/a/ArmorSliver.java index d3b81dcb084..716d1c76dde 100644 --- a/Mage.Sets/src/mage/cards/a/ArmorSliver.java +++ b/Mage.Sets/src/mage/cards/a/ArmorSliver.java @@ -28,7 +28,7 @@ public final class ArmorSliver extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn).setText("this creature gets +0/+1 until end of turn"), new GenericManaCost(2)), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS, false))); } diff --git a/Mage.Sets/src/mage/cards/a/ArmoredGalleon.java b/Mage.Sets/src/mage/cards/a/ArmoredGalleon.java index 1c96f405baf..2ceaa36175d 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoredGalleon.java +++ b/Mage.Sets/src/mage/cards/a/ArmoredGalleon.java @@ -26,7 +26,7 @@ public final class ArmoredGalleon extends CardImpl { this.toughness = new MageInt(4); // Armored Galleon can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); } private ArmoredGalleon(final ArmoredGalleon card) { diff --git a/Mage.Sets/src/mage/cards/a/ArmoryGuard.java b/Mage.Sets/src/mage/cards/a/ArmoryGuard.java index 33186adc2f7..6b20c41adaa 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoryGuard.java +++ b/Mage.Sets/src/mage/cards/a/ArmoryGuard.java @@ -39,7 +39,7 @@ public final class ArmoryGuard extends CardImpl { // Armory Guard has vigilance as long as you control a Gate. ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(VigilanceAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private ArmoryGuard(final ArmoryGuard card) { diff --git a/Mage.Sets/src/mage/cards/a/Arrest.java b/Mage.Sets/src/mage/cards/a/Arrest.java index e3204b09cae..6dea4126463 100644 --- a/Mage.Sets/src/mage/cards/a/Arrest.java +++ b/Mage.Sets/src/mage/cards/a/Arrest.java @@ -36,7 +36,7 @@ public final class Arrest extends CardImpl { this.addAbility(ability); //Enchanted creature can't attack or block, and its activated abilities can't be activated. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAttackActivateAttachedEffect())); + this.addAbility(new SimpleStaticAbility(new CantBlockAttackActivateAttachedEffect())); } private Arrest(final Arrest card) { diff --git a/Mage.Sets/src/mage/cards/a/ArvadTheCursed.java b/Mage.Sets/src/mage/cards/a/ArvadTheCursed.java index e9f7622fb56..4a666c81898 100644 --- a/Mage.Sets/src/mage/cards/a/ArvadTheCursed.java +++ b/Mage.Sets/src/mage/cards/a/ArvadTheCursed.java @@ -43,7 +43,7 @@ public final class ArvadTheCursed extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // Other legendary creatures you control get +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, true))); } private ArvadTheCursed(final ArvadTheCursed card) { diff --git a/Mage.Sets/src/mage/cards/a/AscendantEvincar.java b/Mage.Sets/src/mage/cards/a/AscendantEvincar.java index 63d5c7354f4..1cf5a1c9ea2 100644 --- a/Mage.Sets/src/mage/cards/a/AscendantEvincar.java +++ b/Mage.Sets/src/mage/cards/a/AscendantEvincar.java @@ -38,8 +38,8 @@ public final class AscendantEvincar extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterBlack, true))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(-1, -1, Duration.WhileOnBattlefield, filterNonBlack, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterBlack, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(-1, -1, Duration.WhileOnBattlefield, filterNonBlack, false))); } private AscendantEvincar(final AscendantEvincar card) { diff --git a/Mage.Sets/src/mage/cards/a/AshenmoorCohort.java b/Mage.Sets/src/mage/cards/a/AshenmoorCohort.java index 778edcdb755..5356d392c67 100644 --- a/Mage.Sets/src/mage/cards/a/AshenmoorCohort.java +++ b/Mage.Sets/src/mage/cards/a/AshenmoorCohort.java @@ -44,7 +44,7 @@ public final class AshenmoorCohort extends CardImpl { // Ashenmoor Cohort gets +1/+1 as long as you control another black creature. Condition condition = new PermanentsOnTheBattlefieldCondition(filter); ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), condition, rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/a/AshenmoorLiege.java b/Mage.Sets/src/mage/cards/a/AshenmoorLiege.java index ca02268669b..bc1d52240b5 100644 --- a/Mage.Sets/src/mage/cards/a/AshenmoorLiege.java +++ b/Mage.Sets/src/mage/cards/a/AshenmoorLiege.java @@ -38,9 +38,9 @@ public final class AshenmoorLiege extends CardImpl { this.toughness = new MageInt(1); // Other black creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBlackCreature, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBlackCreature, true))); // Other red creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterRedCreature, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterRedCreature, true))); // Whenever Ashenmoor Liege becomes the target of a spell or ability an opponent controls, that player loses 4 life. this.addAbility(new BecomesTargetSourceTriggeredAbility(new LoseLifeTargetEffect(4), diff --git a/Mage.Sets/src/mage/cards/a/AshesOfTheAbhorrent.java b/Mage.Sets/src/mage/cards/a/AshesOfTheAbhorrent.java index 697dc26ec5e..89282f4d220 100644 --- a/Mage.Sets/src/mage/cards/a/AshesOfTheAbhorrent.java +++ b/Mage.Sets/src/mage/cards/a/AshesOfTheAbhorrent.java @@ -27,7 +27,7 @@ public final class AshesOfTheAbhorrent extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); // Players can't cast spells from graveyards or activate abilities of cards in graveyards. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AshesOfTheAbhorrentEffect())); + this.addAbility(new SimpleStaticAbility(new AshesOfTheAbhorrentEffect())); // Whenever a creature dies, you gain 1 life. this.addAbility(new DiesCreatureTriggeredAbility(new GainLifeEffect(1), false)); diff --git a/Mage.Sets/src/mage/cards/a/AshesOfTheFallen.java b/Mage.Sets/src/mage/cards/a/AshesOfTheFallen.java index cc46bd2a3e4..7d66823818e 100644 --- a/Mage.Sets/src/mage/cards/a/AshesOfTheFallen.java +++ b/Mage.Sets/src/mage/cards/a/AshesOfTheFallen.java @@ -30,7 +30,7 @@ public final class AshesOfTheFallen extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseCreatureTypeEffect(Outcome.Benefit))); // Each creature card in your graveyard has the chosen creature type in addition to its other types. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AshesOfTheFallenEffect())); + this.addAbility(new SimpleStaticAbility(new AshesOfTheFallenEffect())); } private AshesOfTheFallen(final AshesOfTheFallen card) { diff --git a/Mage.Sets/src/mage/cards/a/AshlingsPrerogative.java b/Mage.Sets/src/mage/cards/a/AshlingsPrerogative.java index 1baae502b13..84d3a3c59a1 100644 --- a/Mage.Sets/src/mage/cards/a/AshlingsPrerogative.java +++ b/Mage.Sets/src/mage/cards/a/AshlingsPrerogative.java @@ -34,10 +34,10 @@ public final class AshlingsPrerogative extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new ChooseModeEffect("Odd or even?", "Odd", "Even"), null, "As {this} enters, choose odd or even. (Zero is even.)", "")); // Each creature with converted mana cost of the chosen value has haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AshlingsPrerogativeCorrectOddityEffect())); + this.addAbility(new SimpleStaticAbility(new AshlingsPrerogativeCorrectOddityEffect())); // Each creature without converted mana cost of the chosen value enters the battlefield tapped. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AshlingsPrerogativeIncorrectOddityEffect())); + this.addAbility(new SimpleStaticAbility(new AshlingsPrerogativeIncorrectOddityEffect())); } diff --git a/Mage.Sets/src/mage/cards/a/AshmouthBlade.java b/Mage.Sets/src/mage/cards/a/AshmouthBlade.java index 2fe642b6b13..7ada6ce0445 100644 --- a/Mage.Sets/src/mage/cards/a/AshmouthBlade.java +++ b/Mage.Sets/src/mage/cards/a/AshmouthBlade.java @@ -29,7 +29,7 @@ public final class AshmouthBlade extends CardImpl { this.nightCard = true; // Equipped creature gets +3/+3 - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 3)); + Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(3, 3)); this.addAbility(ability); // and has first strike. diff --git a/Mage.Sets/src/mage/cards/a/AspectOfGorgon.java b/Mage.Sets/src/mage/cards/a/AspectOfGorgon.java index b1aabc72608..5b4467c48dc 100644 --- a/Mage.Sets/src/mage/cards/a/AspectOfGorgon.java +++ b/Mage.Sets/src/mage/cards/a/AspectOfGorgon.java @@ -37,7 +37,7 @@ public final class AspectOfGorgon extends CardImpl { // Enchanted creature gets +1/+3 and has deathtouch. Effect effect = new BoostEnchantedEffect(1,3, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +1/+3"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(DeathtouchAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("and has deathtouch"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/a/AspectOfMongoose.java b/Mage.Sets/src/mage/cards/a/AspectOfMongoose.java index 5c4938a4fa4..cd9f2bd361a 100644 --- a/Mage.Sets/src/mage/cards/a/AspectOfMongoose.java +++ b/Mage.Sets/src/mage/cards/a/AspectOfMongoose.java @@ -35,7 +35,7 @@ public final class AspectOfMongoose extends CardImpl { this.addAbility(ability); // Enchanted creature has shroud. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA))); // When Aspect of Mongoose is put into a graveyard from the battlefield, return Aspect of Mongoose to its owner's hand. this.addAbility(new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new ReturnToHandSourceEffect())); diff --git a/Mage.Sets/src/mage/cards/a/AudaciousInfiltrator.java b/Mage.Sets/src/mage/cards/a/AudaciousInfiltrator.java index 58bab8ce0b6..3677d59cfcd 100644 --- a/Mage.Sets/src/mage/cards/a/AudaciousInfiltrator.java +++ b/Mage.Sets/src/mage/cards/a/AudaciousInfiltrator.java @@ -31,7 +31,7 @@ public final class AudaciousInfiltrator extends CardImpl { // Audacious Infiltrator can't be blocked by artifact creatures. Effect effect = new CantBeBlockedByCreaturesSourceEffect(StaticFilters.FILTER_PERMANENT_ARTIFACT_CREATURE, Duration.WhileOnBattlefield); effect.setText("{this} can't be blocked by artifact creatures"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private AudaciousInfiltrator(final AudaciousInfiltrator card) { diff --git a/Mage.Sets/src/mage/cards/a/AuraGnarlid.java b/Mage.Sets/src/mage/cards/a/AuraGnarlid.java index d99b8c265c7..33bb9857e25 100644 --- a/Mage.Sets/src/mage/cards/a/AuraGnarlid.java +++ b/Mage.Sets/src/mage/cards/a/AuraGnarlid.java @@ -35,10 +35,10 @@ public final class AuraGnarlid extends CardImpl { this.toughness = new MageInt(2); // Creatures with power less than Aura Gnarlid's power can't block it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByCreaturesWithLessPowerEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByCreaturesWithLessPowerEffect())); // Aura Gnarlid gets +1/+1 for each Aura on the battlefield. PermanentsOnBattlefieldCount count = new PermanentsOnBattlefieldCount(filter); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); } private AuraGnarlid(final AuraGnarlid card) { diff --git a/Mage.Sets/src/mage/cards/a/AuraOfSilence.java b/Mage.Sets/src/mage/cards/a/AuraOfSilence.java index f03a3d249b4..7431846b325 100644 --- a/Mage.Sets/src/mage/cards/a/AuraOfSilence.java +++ b/Mage.Sets/src/mage/cards/a/AuraOfSilence.java @@ -35,7 +35,7 @@ public final class AuraOfSilence extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}{W}"); // Artifact and enchantment spells your opponents cast cost {2} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostIncreasingAllEffect(2, filter, TargetController.OPPONENT))); + this.addAbility(new SimpleStaticAbility(new SpellsCostIncreasingAllEffect(2, filter, TargetController.OPPONENT))); // Sacrifice Aura of Silence: Destroy target artifact or enchantment. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); @@ -51,4 +51,4 @@ public final class AuraOfSilence extends CardImpl { public AuraOfSilence copy() { return new AuraOfSilence(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/a/AuramancersGuise.java b/Mage.Sets/src/mage/cards/a/AuramancersGuise.java index 0655344cf70..a63e6660004 100644 --- a/Mage.Sets/src/mage/cards/a/AuramancersGuise.java +++ b/Mage.Sets/src/mage/cards/a/AuramancersGuise.java @@ -43,7 +43,7 @@ public final class AuramancersGuise extends CardImpl { DynamicValue ptBoost = new EnchantedCreatureAurasCount(); BoostEnchantedEffect effect = new BoostEnchantedEffect(ptBoost, ptBoost, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +2/+2 for each Aura attached to it"); - SimpleStaticAbility ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + SimpleStaticAbility ability2 = new SimpleStaticAbility(effect); ability2.addEffect(new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA).setText("and has vigilance")); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/a/Aurification.java b/Mage.Sets/src/mage/cards/a/Aurification.java index ce985e4a73b..7fb1c58e04a 100644 --- a/Mage.Sets/src/mage/cards/a/Aurification.java +++ b/Mage.Sets/src/mage/cards/a/Aurification.java @@ -43,8 +43,8 @@ public final class Aurification extends CardImpl { BecomesSubtypeAllEffect becomesSubtypeAllEffect = new BecomesSubtypeAllEffect(Duration.WhileOnBattlefield, Arrays.asList(SubType.WALL), filter, false); becomesSubtypeAllEffect.setText(""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, becomesSubtypeAllEffect)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(DefenderAbility.getInstance(), Duration.WhileOnBattlefield, filter, rule))); + this.addAbility(new SimpleStaticAbility(becomesSubtypeAllEffect)); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(DefenderAbility.getInstance(), Duration.WhileOnBattlefield, filter, rule))); // When Aurification leaves the battlefield, remove all gold counters from all creatures. this.addAbility(new LeavesBattlefieldTriggeredAbility(new RemoveAllCountersAllEffect( diff --git a/Mage.Sets/src/mage/cards/a/AuriokGlaivemaster.java b/Mage.Sets/src/mage/cards/a/AuriokGlaivemaster.java index 13183a247cb..f4ee36dd3d4 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokGlaivemaster.java +++ b/Mage.Sets/src/mage/cards/a/AuriokGlaivemaster.java @@ -33,9 +33,9 @@ public final class AuriokGlaivemaster extends CardImpl { this.toughness = new MageInt(1); ConditionalContinuousEffect effect1 = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), EquippedSourceCondition.instance, rule1); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect1)); + this.addAbility(new SimpleStaticAbility(effect1)); ConditionalContinuousEffect effect2 = new ConditionalContinuousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), EquippedSourceCondition.instance, rule2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect2)); + this.addAbility(new SimpleStaticAbility(effect2)); } private AuriokGlaivemaster(final AuriokGlaivemaster card) { diff --git a/Mage.Sets/src/mage/cards/a/AuriokSteelshaper.java b/Mage.Sets/src/mage/cards/a/AuriokSteelshaper.java index a46f070c583..df4ad9aff84 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokSteelshaper.java +++ b/Mage.Sets/src/mage/cards/a/AuriokSteelshaper.java @@ -42,10 +42,10 @@ public final class AuriokSteelshaper extends CardImpl { this.toughness = new MageInt(1); // Equip costs you pay cost {1} less. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AbilitiesCostReductionControllerEffect(EquipAbility.class, "Equip"))); + this.addAbility(new SimpleStaticAbility(new AbilitiesCostReductionControllerEffect(EquipAbility.class, "Equip"))); // As long as Auriok Steelshaper is equipped, each creature you control that's a Soldier or a Knight gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, soldiersOrKnights, false), EquippedSourceCondition.instance, "As long as {this} is equipped, each creature you control that's a Soldier or a Knight gets +1/+1" diff --git a/Mage.Sets/src/mage/cards/a/AvariceAmulet.java b/Mage.Sets/src/mage/cards/a/AvariceAmulet.java index e9824f95f33..0b7faa1834d 100644 --- a/Mage.Sets/src/mage/cards/a/AvariceAmulet.java +++ b/Mage.Sets/src/mage/cards/a/AvariceAmulet.java @@ -32,7 +32,7 @@ public final class AvariceAmulet extends CardImpl { // Equipped creature gets +2/+0 Effect effect = new BoostEquippedEffect(2, 0); effect.setText("Equipped creature gets +2/+0"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); // and has vigilance effect = new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.EQUIPMENT); effect.setText("and has vigilance"); diff --git a/Mage.Sets/src/mage/cards/a/AvatarOfHope.java b/Mage.Sets/src/mage/cards/a/AvatarOfHope.java index f2ad028ddbc..848d04052cf 100644 --- a/Mage.Sets/src/mage/cards/a/AvatarOfHope.java +++ b/Mage.Sets/src/mage/cards/a/AvatarOfHope.java @@ -40,7 +40,7 @@ public final class AvatarOfHope extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Avatar of Hope can block any number of creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(0))); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect(0))); } private AvatarOfHope(final AvatarOfHope card) { diff --git a/Mage.Sets/src/mage/cards/a/AvatarOfSlaughter.java b/Mage.Sets/src/mage/cards/a/AvatarOfSlaughter.java index bbc4f2ea311..772cbb3528a 100644 --- a/Mage.Sets/src/mage/cards/a/AvatarOfSlaughter.java +++ b/Mage.Sets/src/mage/cards/a/AvatarOfSlaughter.java @@ -33,7 +33,7 @@ public final class AvatarOfSlaughter extends CardImpl { // All creatures have double strike and attack each turn if able. Effect effect = new GainAbilityAllEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES); effect.setText("All creatures have double strike"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new AttacksIfAbleAllEffect(StaticFilters.FILTER_PERMANENT_CREATURES); effect.setText("and attack each combat if able"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/a/AvenBrigadier.java b/Mage.Sets/src/mage/cards/a/AvenBrigadier.java index 21a05786aa9..647211d438a 100644 --- a/Mage.Sets/src/mage/cards/a/AvenBrigadier.java +++ b/Mage.Sets/src/mage/cards/a/AvenBrigadier.java @@ -38,9 +38,9 @@ public final class AvenBrigadier extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Other Bird creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter1, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter1, true))); // Other Soldier creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter2, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter2, true))); } private AvenBrigadier(final AvenBrigadier card) { diff --git a/Mage.Sets/src/mage/cards/a/AvenMindcensor.java b/Mage.Sets/src/mage/cards/a/AvenMindcensor.java index 004d3af9ba8..ee8c8de963c 100644 --- a/Mage.Sets/src/mage/cards/a/AvenMindcensor.java +++ b/Mage.Sets/src/mage/cards/a/AvenMindcensor.java @@ -34,7 +34,7 @@ public final class AvenMindcensor extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // If an opponent would search a library, that player searches the top four cards of that library instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AvenMindcensorEffect())); + this.addAbility(new SimpleStaticAbility(new AvenMindcensorEffect())); } diff --git a/Mage.Sets/src/mage/cards/a/AvenWindGuide.java b/Mage.Sets/src/mage/cards/a/AvenWindGuide.java index 5cbf46c7310..f663fc6bbc1 100644 --- a/Mage.Sets/src/mage/cards/a/AvenWindGuide.java +++ b/Mage.Sets/src/mage/cards/a/AvenWindGuide.java @@ -45,7 +45,7 @@ public final class AvenWindGuide extends CardImpl { Duration.WhileOnBattlefield, StaticFilters.FILTER_CREATURE_TOKENS); effect.setText("Creature tokens you control have flying"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new GainAbilityControlledEffect( VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/a/AwakenTheAncient.java b/Mage.Sets/src/mage/cards/a/AwakenTheAncient.java index 9cdf13a640d..e4ffb5e9d66 100644 --- a/Mage.Sets/src/mage/cards/a/AwakenTheAncient.java +++ b/Mage.Sets/src/mage/cards/a/AwakenTheAncient.java @@ -38,7 +38,7 @@ public final class AwakenTheAncient extends CardImpl { this.addAbility(ability); // Enchanted Mountain is a 7/7 red Giant creature with haste. It's still a land. - Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect( + Ability ability2 = new SimpleStaticAbility(new BecomesCreatureAttachedEffect( new GiantToken(), "Enchanted Mountain is a 7/7 red Giant creature with haste. It's still a land", Duration.WhileOnBattlefield, BecomesCreatureAttachedEffect.LoseType.COLOR)); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/a/AysenHighway.java b/Mage.Sets/src/mage/cards/a/AysenHighway.java index 5a771dd715a..98a30a9454a 100644 --- a/Mage.Sets/src/mage/cards/a/AysenHighway.java +++ b/Mage.Sets/src/mage/cards/a/AysenHighway.java @@ -30,7 +30,7 @@ public final class AysenHighway extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{W}{W}{W}"); // White creatures have plainswalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(new PlainswalkAbility(false), Duration.WhileOnBattlefield, filter))); } diff --git a/Mage.Sets/src/mage/cards/a/AzusaLostButSeeking.java b/Mage.Sets/src/mage/cards/a/AzusaLostButSeeking.java index 2fcfa0a1cc7..b78da83fcc8 100644 --- a/Mage.Sets/src/mage/cards/a/AzusaLostButSeeking.java +++ b/Mage.Sets/src/mage/cards/a/AzusaLostButSeeking.java @@ -24,7 +24,7 @@ public final class AzusaLostButSeeking extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayAdditionalLandsControllerEffect(2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new PlayAdditionalLandsControllerEffect(2, Duration.WhileOnBattlefield))); } private AzusaLostButSeeking(final AzusaLostButSeeking card) {