diff --git a/Mage.Sets/src/mage/cards/w/WalkerOfTheWastes.java b/Mage.Sets/src/mage/cards/w/WalkerOfTheWastes.java index 53b6d772d7c..a1941600818 100644 --- a/Mage.Sets/src/mage/cards/w/WalkerOfTheWastes.java +++ b/Mage.Sets/src/mage/cards/w/WalkerOfTheWastes.java @@ -40,7 +40,7 @@ public final class WalkerOfTheWastes extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Walker of the Wastes gets +1/+1 for each land you control named Wastes. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect( + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect( new PermanentsOnBattlefieldCount(filter), new PermanentsOnBattlefieldCount(filter), Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/w/WallOfDiffusion.java b/Mage.Sets/src/mage/cards/w/WallOfDiffusion.java index 334ae6c8f4c..dc38500fb4a 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfDiffusion.java +++ b/Mage.Sets/src/mage/cards/w/WallOfDiffusion.java @@ -29,7 +29,7 @@ public final class WallOfDiffusion extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // Wall of Diffusion can block creatures with shadow as though Wall of Diffusion had shadow. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAsThoughtItHadShadowEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CanBlockAsThoughtItHadShadowEffect(Duration.WhileOnBattlefield))); } private WallOfDiffusion(final WallOfDiffusion card) { @@ -40,4 +40,4 @@ public final class WallOfDiffusion extends CardImpl { public WallOfDiffusion copy() { return new WallOfDiffusion(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/w/WallOfGlare.java b/Mage.Sets/src/mage/cards/w/WallOfGlare.java index 41cbbbf3d82..dd924d959c7 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfGlare.java +++ b/Mage.Sets/src/mage/cards/w/WallOfGlare.java @@ -28,7 +28,7 @@ public final class WallOfGlare extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // Wall of Glare can block any number of creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(0))); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect(0))); } private WallOfGlare(final WallOfGlare card) { diff --git a/Mage.Sets/src/mage/cards/w/WanderingEye.java b/Mage.Sets/src/mage/cards/w/WanderingEye.java index f720cfe64eb..c1dbf1b4237 100644 --- a/Mage.Sets/src/mage/cards/w/WanderingEye.java +++ b/Mage.Sets/src/mage/cards/w/WanderingEye.java @@ -28,7 +28,7 @@ public final class WanderingEye extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Players play with their hands revealed. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithHandRevealedEffect(TargetController.ANY))); + this.addAbility(new SimpleStaticAbility(new PlayWithHandRevealedEffect(TargetController.ANY))); } private WanderingEye(final WanderingEye card) { diff --git a/Mage.Sets/src/mage/cards/w/WanderingWolf.java b/Mage.Sets/src/mage/cards/w/WanderingWolf.java index fb1e49adc18..666f74d2e65 100644 --- a/Mage.Sets/src/mage/cards/w/WanderingWolf.java +++ b/Mage.Sets/src/mage/cards/w/WanderingWolf.java @@ -25,7 +25,7 @@ public final class WanderingWolf extends CardImpl { this.toughness = new MageInt(1); // Creatures with power less than Wandering Wolf's power can't block it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByCreaturesWithLessPowerEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByCreaturesWithLessPowerEffect())); } private WanderingWolf(final WanderingWolf card) { diff --git a/Mage.Sets/src/mage/cards/w/WarFalcon.java b/Mage.Sets/src/mage/cards/w/WarFalcon.java index 75b28494de4..ec066f5553a 100644 --- a/Mage.Sets/src/mage/cards/w/WarFalcon.java +++ b/Mage.Sets/src/mage/cards/w/WarFalcon.java @@ -34,7 +34,7 @@ public final class WarFalcon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // War Falcon can't attack unless you control a Knight or a Soldier. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WarFalconEffect())); + this.addAbility(new SimpleStaticAbility(new WarFalconEffect())); } private WarFalcon(final WarFalcon card) { @@ -84,4 +84,3 @@ class WarFalconEffect extends RestrictionEffect { return false; } } - diff --git a/Mage.Sets/src/mage/cards/w/WardOfBones.java b/Mage.Sets/src/mage/cards/w/WardOfBones.java index 0e7339a83d8..eb7279e5c98 100644 --- a/Mage.Sets/src/mage/cards/w/WardOfBones.java +++ b/Mage.Sets/src/mage/cards/w/WardOfBones.java @@ -32,7 +32,7 @@ public final class WardOfBones extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{6}"); // Each opponent who controls more creatures than you can't play creature cards. The same is true for artifacts, enchantments, and lands. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WardOfBonesEffect())); + this.addAbility(new SimpleStaticAbility(new WardOfBonesEffect())); } diff --git a/Mage.Sets/src/mage/cards/w/WardOfLights.java b/Mage.Sets/src/mage/cards/w/WardOfLights.java index e149a6a65eb..5114a37c0f3 100644 --- a/Mage.Sets/src/mage/cards/w/WardOfLights.java +++ b/Mage.Sets/src/mage/cards/w/WardOfLights.java @@ -43,7 +43,7 @@ public final class WardOfLights extends CardImpl { // As Ward of Lights enters the battlefield, choose a color. this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Benefit))); // Enchanted creature has protection from the chosen color. This effect doesn't remove Ward of Lights. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ProtectionChosenColorAttachedEffect(true))); + this.addAbility(new SimpleStaticAbility(new ProtectionChosenColorAttachedEffect(true))); } private WardOfLights(final WardOfLights card) { diff --git a/Mage.Sets/src/mage/cards/w/WardSliver.java b/Mage.Sets/src/mage/cards/w/WardSliver.java index 59ce823dbc4..6d5e984883d 100644 --- a/Mage.Sets/src/mage/cards/w/WardSliver.java +++ b/Mage.Sets/src/mage/cards/w/WardSliver.java @@ -42,7 +42,7 @@ public final class WardSliver extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Protect))); // All Slivers have protection from the chosen color. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WardSliverGainAbilityControlledEffect())); + this.addAbility(new SimpleStaticAbility(new WardSliverGainAbilityControlledEffect())); } diff --git a/Mage.Sets/src/mage/cards/w/WardenOfEvosIsle.java b/Mage.Sets/src/mage/cards/w/WardenOfEvosIsle.java index 09f0040c610..1b5df25033b 100644 --- a/Mage.Sets/src/mage/cards/w/WardenOfEvosIsle.java +++ b/Mage.Sets/src/mage/cards/w/WardenOfEvosIsle.java @@ -38,7 +38,7 @@ public final class WardenOfEvosIsle extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Creature spells with flying you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); } diff --git a/Mage.Sets/src/mage/cards/w/WardenOfTheWall.java b/Mage.Sets/src/mage/cards/w/WardenOfTheWall.java index 0fa60be344c..80682bee3e0 100644 --- a/Mage.Sets/src/mage/cards/w/WardenOfTheWall.java +++ b/Mage.Sets/src/mage/cards/w/WardenOfTheWall.java @@ -34,7 +34,7 @@ public final class WardenOfTheWall extends CardImpl { this.addAbility(new ColorlessManaAbility()); // As long as it's not your turn, Warden of the Wall is a 2/3 Gargoyle artifact creature with flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BecomesCreatureSourceEffect(new GargoyleToken(), CardType.ARTIFACT, Duration.WhileOnBattlefield), NotMyTurnCondition.instance, "During turns other than yours, Warden of the Wall is a 2/3 Gargoyle artifact creature with flying")) diff --git a/Mage.Sets/src/mage/cards/w/WardscaleDragon.java b/Mage.Sets/src/mage/cards/w/WardscaleDragon.java index 872f63c9eb4..1b0af0849f4 100644 --- a/Mage.Sets/src/mage/cards/w/WardscaleDragon.java +++ b/Mage.Sets/src/mage/cards/w/WardscaleDragon.java @@ -34,7 +34,7 @@ public final class WardscaleDragon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // As long as Wardscale Dragon is attacking, defending player can't cast spells. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WardscaleDragonRuleEffect())); + this.addAbility(new SimpleStaticAbility(new WardscaleDragonRuleEffect())); } diff --git a/Mage.Sets/src/mage/cards/w/WarlordsAxe.java b/Mage.Sets/src/mage/cards/w/WarlordsAxe.java index 49abf4a0158..dc359819798 100644 --- a/Mage.Sets/src/mage/cards/w/WarlordsAxe.java +++ b/Mage.Sets/src/mage/cards/w/WarlordsAxe.java @@ -26,7 +26,7 @@ public final class WarlordsAxe extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +3/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(3, 1))); // Equip {4} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(4))); @@ -42,4 +42,3 @@ public final class WarlordsAxe extends CardImpl { } } - diff --git a/Mage.Sets/src/mage/cards/w/WarmongersChariot.java b/Mage.Sets/src/mage/cards/w/WarmongersChariot.java index ceefa82cfb4..2ab3887fb70 100644 --- a/Mage.Sets/src/mage/cards/w/WarmongersChariot.java +++ b/Mage.Sets/src/mage/cards/w/WarmongersChariot.java @@ -25,10 +25,10 @@ public final class WarmongersChariot extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 2))); // As long as equipped creature has defender, it can attack as though it didn't have defender. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WarmongersChariotEffect())); + this.addAbility(new SimpleStaticAbility(new WarmongersChariotEffect())); // Equip {3} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3))); diff --git a/Mage.Sets/src/mage/cards/w/Watchdog.java b/Mage.Sets/src/mage/cards/w/Watchdog.java index 311d1f2c90c..3555a605fbb 100644 --- a/Mage.Sets/src/mage/cards/w/Watchdog.java +++ b/Mage.Sets/src/mage/cards/w/Watchdog.java @@ -33,9 +33,9 @@ public final class Watchdog extends CardImpl { this.toughness = new MageInt(2); // Watchdog blocks each turn if able. - addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BlocksIfAbleSourceEffect(Duration.WhileOnBattlefield))); + addAbility(new SimpleStaticAbility(new BlocksIfAbleSourceEffect(Duration.WhileOnBattlefield))); // As long as Watchdog is untapped, all creatures attacking you get -1/-0. - addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostAllEffect(-1, 0, Duration.WhileOnBattlefield, new WatchdogFilter(), false), SourceTappedCondition.UNTAPPED, "As long as {this} is untapped, all creatures attacking you get -1/-0"))); } diff --git a/Mage.Sets/src/mage/cards/w/WatcherInTheWeb.java b/Mage.Sets/src/mage/cards/w/WatcherInTheWeb.java index 1cef365b4a8..42fb22d20dd 100644 --- a/Mage.Sets/src/mage/cards/w/WatcherInTheWeb.java +++ b/Mage.Sets/src/mage/cards/w/WatcherInTheWeb.java @@ -31,7 +31,7 @@ public final class WatcherInTheWeb extends CardImpl { // Watcher in the Web can block an additional seven creatures each combat. Effect effect = new CanBlockAdditionalCreatureEffect(7); effect.setText("{this} can block an additional seven creatures each combat"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private WatcherInTheWeb(final WatcherInTheWeb card) { diff --git a/Mage.Sets/src/mage/cards/w/WatcherOfTheSpheres.java b/Mage.Sets/src/mage/cards/w/WatcherOfTheSpheres.java index 9291749b4ef..636e7aa952d 100644 --- a/Mage.Sets/src/mage/cards/w/WatcherOfTheSpheres.java +++ b/Mage.Sets/src/mage/cards/w/WatcherOfTheSpheres.java @@ -47,7 +47,7 @@ public final class WatcherOfTheSpheres extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Creature spells with flying you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); // Whenever another creature with flying you control enters, Watcher of the Spheres gets +1/+1 until end of turn. this.addAbility(new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), filter1, false)); diff --git a/Mage.Sets/src/mage/cards/w/WatcherSliver.java b/Mage.Sets/src/mage/cards/w/WatcherSliver.java index 4c427081b9b..deaf59c319f 100644 --- a/Mage.Sets/src/mage/cards/w/WatcherSliver.java +++ b/Mage.Sets/src/mage/cards/w/WatcherSliver.java @@ -28,7 +28,7 @@ public final class WatcherSliver extends CardImpl { this.toughness = new MageInt(2); // All Sliver creatures get +0/+2. - 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))); } private WatcherSliver(final WatcherSliver card) { diff --git a/Mage.Sets/src/mage/cards/w/WatchwingScarecrow.java b/Mage.Sets/src/mage/cards/w/WatchwingScarecrow.java index e381285d5c6..ac08669272c 100644 --- a/Mage.Sets/src/mage/cards/w/WatchwingScarecrow.java +++ b/Mage.Sets/src/mage/cards/w/WatchwingScarecrow.java @@ -45,11 +45,11 @@ public final class WatchwingScarecrow extends CardImpl { // Watchwing Scarecrow has vigilance as long as you control a white creature. ContinuousEffect effect = new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), rule))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), rule))); // Watchwing Scarecrow has flying as long as you control a blue creature. ContinuousEffect effect2 = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect2, new PermanentsOnTheBattlefieldCondition(filter2), rule2))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(effect2, new PermanentsOnTheBattlefieldCondition(filter2), rule2))); } diff --git a/Mage.Sets/src/mage/cards/w/WaterWurm.java b/Mage.Sets/src/mage/cards/w/WaterWurm.java index 53f0100d746..7640c05809d 100644 --- a/Mage.Sets/src/mage/cards/w/WaterWurm.java +++ b/Mage.Sets/src/mage/cards/w/WaterWurm.java @@ -30,7 +30,7 @@ public final class WaterWurm extends CardImpl { this.toughness = new MageInt(1); // Water Wurm gets +0/+1 as long as an opponent controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(0, 1, Duration.WhileOnBattlefield), new OpponentControlsPermanentCondition(filter), "{this} gets +0/+1 as long as an opponent controls an Island"))); diff --git a/Mage.Sets/src/mage/cards/w/Waterknot.java b/Mage.Sets/src/mage/cards/w/Waterknot.java index 55c421ea57c..b803a938161 100644 --- a/Mage.Sets/src/mage/cards/w/Waterknot.java +++ b/Mage.Sets/src/mage/cards/w/Waterknot.java @@ -36,7 +36,7 @@ public final class Waterknot extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); } private Waterknot(final Waterknot card) { diff --git a/Mage.Sets/src/mage/cards/w/WayOfTheThief.java b/Mage.Sets/src/mage/cards/w/WayOfTheThief.java index 7eafe85cae1..a67cb258e2a 100644 --- a/Mage.Sets/src/mage/cards/w/WayOfTheThief.java +++ b/Mage.Sets/src/mage/cards/w/WayOfTheThief.java @@ -44,12 +44,12 @@ public final class WayOfTheThief extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // Enchanted creature can't be blocked as long as you control a Gate. Effect effect = new ConditionalRestrictionEffect(new CantBeBlockedAttachedEffect(AttachmentType.AURA), new PermanentsOnTheBattlefieldCondition(filter)); effect.setText(rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private WayOfTheThief(final WayOfTheThief card) { diff --git a/Mage.Sets/src/mage/cards/w/WaywardSwordtooth.java b/Mage.Sets/src/mage/cards/w/WaywardSwordtooth.java index 1287659b8e0..1fd41897c59 100644 --- a/Mage.Sets/src/mage/cards/w/WaywardSwordtooth.java +++ b/Mage.Sets/src/mage/cards/w/WaywardSwordtooth.java @@ -36,7 +36,7 @@ public final class WaywardSwordtooth extends CardImpl { new PlayAdditionalLandsControllerEffect(1, Duration.WhileOnBattlefield))); // Wayward Sawtooth can't attack or block unless you have the city's blessing. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockUnlessConditionSourceEffect(CitysBlessingCondition.instance)) + this.addAbility(new SimpleStaticAbility(new CantAttackBlockUnlessConditionSourceEffect(CitysBlessingCondition.instance)) .addHint(CitysBlessingHint.instance) ); } diff --git a/Mage.Sets/src/mage/cards/w/Weakness.java b/Mage.Sets/src/mage/cards/w/Weakness.java index 2d503f434b6..677fc2dbe72 100644 --- a/Mage.Sets/src/mage/cards/w/Weakness.java +++ b/Mage.Sets/src/mage/cards/w/Weakness.java @@ -35,7 +35,7 @@ public final class Weakness extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -2/-1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-2, -1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-2, -1, Duration.WhileOnBattlefield))); } private Weakness(final Weakness card) { diff --git a/Mage.Sets/src/mage/cards/w/WeaponsTrainer.java b/Mage.Sets/src/mage/cards/w/WeaponsTrainer.java index c8a81625464..a4425d78e96 100644 --- a/Mage.Sets/src/mage/cards/w/WeaponsTrainer.java +++ b/Mage.Sets/src/mage/cards/w/WeaponsTrainer.java @@ -39,7 +39,7 @@ public final class WeaponsTrainer extends CardImpl { // Other creatures you control get +1/+0 as long as you control an Equipment. ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, true), new PermanentsOnTheBattlefieldCondition(filter), rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private WeaponsTrainer(final WeaponsTrainer card) { diff --git a/Mage.Sets/src/mage/cards/w/WeatheredBodyguards.java b/Mage.Sets/src/mage/cards/w/WeatheredBodyguards.java index 06e1f51e339..8d0ab093541 100644 --- a/Mage.Sets/src/mage/cards/w/WeatheredBodyguards.java +++ b/Mage.Sets/src/mage/cards/w/WeatheredBodyguards.java @@ -35,7 +35,7 @@ public final class WeatheredBodyguards extends CardImpl { this.toughness = new MageInt(5); // As long as Weathered Bodyguards is untapped, all combat damage that would be dealt to you by unblocked creatures is dealt to Weathered Bodyguards instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WeatheredBodyguardsEffect())); + this.addAbility(new SimpleStaticAbility(new WeatheredBodyguardsEffect())); // Morph {3}{W} this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{W}"))); diff --git a/Mage.Sets/src/mage/cards/w/WeequayBeastmaster.java b/Mage.Sets/src/mage/cards/w/WeequayBeastmaster.java index 656702b257c..281505e46ae 100644 --- a/Mage.Sets/src/mage/cards/w/WeequayBeastmaster.java +++ b/Mage.Sets/src/mage/cards/w/WeequayBeastmaster.java @@ -29,7 +29,7 @@ public final class WeequayBeastmaster extends CardImpl { this.toughness = new MageInt(1); // Monstrosity abilities you activate cost {1} less to activate. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AbilitiesCostReductionControllerEffect(MonstrosityAbility.class, "Monstrosity"))); + this.addAbility(new SimpleStaticAbility(new AbilitiesCostReductionControllerEffect(MonstrosityAbility.class, "Monstrosity"))); // Whenever a creature you control becomes monstrous, put an additional +1/+1 counter on that creature. this.addAbility(new BecomesMonstrousTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()))); diff --git a/Mage.Sets/src/mage/cards/w/WeightOfConscience.java b/Mage.Sets/src/mage/cards/w/WeightOfConscience.java index 0a62d39f97b..3b850094825 100644 --- a/Mage.Sets/src/mage/cards/w/WeightOfConscience.java +++ b/Mage.Sets/src/mage/cards/w/WeightOfConscience.java @@ -43,7 +43,7 @@ public final class WeightOfConscience extends CardImpl { this.addAbility(ability); // Enchanted creature can't attack. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantAttackAttachedEffect(AttachmentType.AURA))); // Tap two untapped creatures you control that share a creature type: Exile enchanted creature. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileAttachedEffect(), new TapTargetCost(new WeightOfConscienceTarget()))); diff --git a/Mage.Sets/src/mage/cards/w/WeightOfTheUnderworld.java b/Mage.Sets/src/mage/cards/w/WeightOfTheUnderworld.java index f225ffe82ad..304ed11080d 100644 --- a/Mage.Sets/src/mage/cards/w/WeightOfTheUnderworld.java +++ b/Mage.Sets/src/mage/cards/w/WeightOfTheUnderworld.java @@ -35,7 +35,7 @@ public final class WeightOfTheUnderworld extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -3/-2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-3,-2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-3,-2, Duration.WhileOnBattlefield))); } private WeightOfTheUnderworld(final WeightOfTheUnderworld card) { diff --git a/Mage.Sets/src/mage/cards/w/WeirdingWood.java b/Mage.Sets/src/mage/cards/w/WeirdingWood.java index a665f9ad367..fc0bf8fbded 100644 --- a/Mage.Sets/src/mage/cards/w/WeirdingWood.java +++ b/Mage.Sets/src/mage/cards/w/WeirdingWood.java @@ -46,7 +46,7 @@ public final class WeirdingWood extends CardImpl { Ability gainedAbility = new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(2), new TapSourceCost()); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA); effect.setText("Enchanted land has \"{T}: Add two mana of any one color.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private WeirdingWood(final WeirdingWood card) { diff --git a/Mage.Sets/src/mage/cards/w/WellLaidPlans.java b/Mage.Sets/src/mage/cards/w/WellLaidPlans.java index 5000e804399..c2a5674e6d2 100644 --- a/Mage.Sets/src/mage/cards/w/WellLaidPlans.java +++ b/Mage.Sets/src/mage/cards/w/WellLaidPlans.java @@ -24,7 +24,7 @@ public final class WellLaidPlans extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}"); // Prevent all damage that would be dealt to a creature by another creature if they share a color. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WellLaidPlansPreventionEffect())); + this.addAbility(new SimpleStaticAbility(new WellLaidPlansPreventionEffect())); } private WellLaidPlans(final WellLaidPlans card) { diff --git a/Mage.Sets/src/mage/cards/w/WheelOfSunAndMoon.java b/Mage.Sets/src/mage/cards/w/WheelOfSunAndMoon.java index 891d02a85da..664d4afa559 100644 --- a/Mage.Sets/src/mage/cards/w/WheelOfSunAndMoon.java +++ b/Mage.Sets/src/mage/cards/w/WheelOfSunAndMoon.java @@ -43,7 +43,7 @@ public final class WheelOfSunAndMoon extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // If a card would be put into enchanted player's graveyard from anywhere, instead that card is revealed and put on the bottom of that player's library. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WheelOfSunAndMoonEffect())); + this.addAbility(new SimpleStaticAbility(new WheelOfSunAndMoonEffect())); } private WheelOfSunAndMoon(final WheelOfSunAndMoon card) { diff --git a/Mage.Sets/src/mage/cards/w/Whimwader.java b/Mage.Sets/src/mage/cards/w/Whimwader.java index c626d552ffe..4f9c0b975c2 100644 --- a/Mage.Sets/src/mage/cards/w/Whimwader.java +++ b/Mage.Sets/src/mage/cards/w/Whimwader.java @@ -35,7 +35,7 @@ public final class Whimwader extends CardImpl { this.toughness = new MageInt(4); // Whimwader can't attack unless defending player controls a blue permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(filter))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(filter))); } diff --git a/Mage.Sets/src/mage/cards/w/WhipSilk.java b/Mage.Sets/src/mage/cards/w/WhipSilk.java index 1a0f3c698d1..1319d9c7ef2 100644 --- a/Mage.Sets/src/mage/cards/w/WhipSilk.java +++ b/Mage.Sets/src/mage/cards/w/WhipSilk.java @@ -39,7 +39,7 @@ public final class WhipSilk extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has reach. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ReachAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ReachAbility.getInstance(), AttachmentType.AURA))); // {G}: Return Whip Silk to its owner's hand. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ColoredManaCost(ColoredManaSymbol.G))); } diff --git a/Mage.Sets/src/mage/cards/w/WhiteScarab.java b/Mage.Sets/src/mage/cards/w/WhiteScarab.java index 6307194c1aa..85ae7386660 100644 --- a/Mage.Sets/src/mage/cards/w/WhiteScarab.java +++ b/Mage.Sets/src/mage/cards/w/WhiteScarab.java @@ -54,11 +54,11 @@ public final class WhiteScarab extends CardImpl { // Enchanted creature can't be blocked by white creatures. Effect effect = new CantBeBlockedByCreaturesAttachedEffect(Duration.WhileOnBattlefield, filter, AttachmentType.AURA); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); this.addAbility(ability); // Enchanted creature gets +2/+2 as long as an opponent controls a white permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield), new OpponentControlsPermanentCondition(filter2), "Enchanted creature gets +2/+2 as long as an opponent controls a white permanent"))); diff --git a/Mage.Sets/src/mage/cards/w/WightOfPrecinctSix.java b/Mage.Sets/src/mage/cards/w/WightOfPrecinctSix.java index 1db1781e8f3..33a342998c7 100644 --- a/Mage.Sets/src/mage/cards/w/WightOfPrecinctSix.java +++ b/Mage.Sets/src/mage/cards/w/WightOfPrecinctSix.java @@ -37,7 +37,7 @@ public final class WightOfPrecinctSix extends CardImpl { // Wight of Precinct Six gets +1/+1 for each creature card in your opponents' graveyards. DynamicValue boost = new CardsInOpponentGraveyardsCount(filter); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(boost, boost, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(boost, boost, Duration.WhileOnBattlefield))); } private WightOfPrecinctSix(final WightOfPrecinctSix card) { diff --git a/Mage.Sets/src/mage/cards/w/WildNacatl.java b/Mage.Sets/src/mage/cards/w/WildNacatl.java index 7df81a662a5..64fc262874f 100644 --- a/Mage.Sets/src/mage/cards/w/WildNacatl.java +++ b/Mage.Sets/src/mage/cards/w/WildNacatl.java @@ -36,10 +36,10 @@ public final class WildNacatl extends CardImpl { this.toughness = new MageInt(1); // Wild Nacatl gets +1/+1 as long as you control a Mountain. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceWhileControlsEffect(filter1, 1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filter1, 1, 1))); // Wild Nacatl gets +1/+1 as long as you control a Plains. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceWhileControlsEffect(filter2, 1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filter2, 1, 1))); } private WildNacatl(final WildNacatl card) { diff --git a/Mage.Sets/src/mage/cards/w/WildwoodGeist.java b/Mage.Sets/src/mage/cards/w/WildwoodGeist.java index 094742355c4..2b8aece07af 100644 --- a/Mage.Sets/src/mage/cards/w/WildwoodGeist.java +++ b/Mage.Sets/src/mage/cards/w/WildwoodGeist.java @@ -28,7 +28,7 @@ public final class WildwoodGeist extends CardImpl { this.toughness = new MageInt(3); // Wildwood Geist gets +2/+2 as long as it's your turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), MyTurnCondition.instance, "{this} gets +2/+2 as long as it's your turn")) diff --git a/Mage.Sets/src/mage/cards/w/WiltLeafLiege.java b/Mage.Sets/src/mage/cards/w/WiltLeafLiege.java index 4556b435c3d..d6ff06088c3 100644 --- a/Mage.Sets/src/mage/cards/w/WiltLeafLiege.java +++ b/Mage.Sets/src/mage/cards/w/WiltLeafLiege.java @@ -41,9 +41,9 @@ public final class WiltLeafLiege extends CardImpl { this.toughness = new MageInt(4); // Other green creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterGreen, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterGreen, true))); // Other white creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterWhite, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterWhite, true))); // If a spell or ability an opponent controls causes you to discard Wilt-Leaf Liege, put it onto the battlefield instead of putting it into your graveyard. this.addAbility(new SimpleStaticAbility(Zone.HAND, new DiscardOntoBattlefieldEffect())); } diff --git a/Mage.Sets/src/mage/cards/w/WindZendikon.java b/Mage.Sets/src/mage/cards/w/WindZendikon.java index 8325b480e7f..210206e70e6 100644 --- a/Mage.Sets/src/mage/cards/w/WindZendikon.java +++ b/Mage.Sets/src/mage/cards/w/WindZendikon.java @@ -38,7 +38,7 @@ public final class WindZendikon extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect( + Ability ability2 = new SimpleStaticAbility(new BecomesCreatureAttachedEffect( new WindZendikonElementalToken(), "Enchanted land is a 2/2 blue Elemental creature with flying. It's still a land", Duration.WhileOnBattlefield, BecomesCreatureAttachedEffect.LoseType.COLOR)); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/w/WindbriskRaptor.java b/Mage.Sets/src/mage/cards/w/WindbriskRaptor.java index 228d077589f..a939a230746 100644 --- a/Mage.Sets/src/mage/cards/w/WindbriskRaptor.java +++ b/Mage.Sets/src/mage/cards/w/WindbriskRaptor.java @@ -43,7 +43,7 @@ public final class WindbriskRaptor extends CardImpl { // Attacking creatures you control have lifelink. Effect effect = new GainAbilityControlledEffect(LifelinkAbility.getInstance(), Duration.WhileOnBattlefield, filter); effect.setText("Attacking creatures you control have lifelink"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/w/WindwrightMage.java b/Mage.Sets/src/mage/cards/w/WindwrightMage.java index 64c534008f5..e7f71736f06 100644 --- a/Mage.Sets/src/mage/cards/w/WindwrightMage.java +++ b/Mage.Sets/src/mage/cards/w/WindwrightMage.java @@ -37,7 +37,7 @@ public final class WindwrightMage extends CardImpl { // Lifelink this.addAbility(LifelinkAbility.getInstance()); // Windwright Mage has flying as long as an artifact card is in your graveyard. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield), WindwrightMageCondition.instance, "{this} has flying as long as an artifact card is in your graveyard"))); diff --git a/Mage.Sets/src/mage/cards/w/WingSplicer.java b/Mage.Sets/src/mage/cards/w/WingSplicer.java index 9fb84b1a88c..c2536a5b208 100644 --- a/Mage.Sets/src/mage/cards/w/WingSplicer.java +++ b/Mage.Sets/src/mage/cards/w/WingSplicer.java @@ -42,7 +42,7 @@ public final class WingSplicer extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new PhyrexianGolemToken()))); // Golem creatures you control have flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, filter))); } private WingSplicer(final WingSplicer card) { diff --git a/Mage.Sets/src/mage/cards/w/Wingcrafter.java b/Mage.Sets/src/mage/cards/w/Wingcrafter.java index 942789033af..05f23eba739 100644 --- a/Mage.Sets/src/mage/cards/w/Wingcrafter.java +++ b/Mage.Sets/src/mage/cards/w/Wingcrafter.java @@ -34,7 +34,7 @@ public final class Wingcrafter extends CardImpl { this.addAbility(new SoulbondAbility()); // As long as Wingcrafter is paired with another creature, both creatures have flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(FlyingAbility.getInstance(), ruleText))); + this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(FlyingAbility.getInstance(), ruleText))); } private Wingcrafter(final Wingcrafter card) { diff --git a/Mage.Sets/src/mage/cards/w/WingrattleScarecrow.java b/Mage.Sets/src/mage/cards/w/WingrattleScarecrow.java index 3e95a7650cf..8dbca7aebad 100644 --- a/Mage.Sets/src/mage/cards/w/WingrattleScarecrow.java +++ b/Mage.Sets/src/mage/cards/w/WingrattleScarecrow.java @@ -44,11 +44,11 @@ public final class WingrattleScarecrow extends CardImpl { // Wingrattle Scarecrow has flying as long as you control a blue creature. ContinuousEffect effect = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), rule))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), rule))); // Wingrattle Scarecrow has persist as long as you control a black creature. ContinuousEffect effect2 = new GainAbilitySourceEffect(new PersistAbility(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect2, new PermanentsOnTheBattlefieldCondition(filter2), rule2))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(effect2, new PermanentsOnTheBattlefieldCondition(filter2), rule2))); } diff --git a/Mage.Sets/src/mage/cards/w/WingsOfAesthir.java b/Mage.Sets/src/mage/cards/w/WingsOfAesthir.java index 88f438932ea..325e5ba5a39 100644 --- a/Mage.Sets/src/mage/cards/w/WingsOfAesthir.java +++ b/Mage.Sets/src/mage/cards/w/WingsOfAesthir.java @@ -42,7 +42,7 @@ public final class WingsOfAesthir extends CardImpl { // Enchanted creature gets +1/+0 and has flying and first strike. Effect effect = new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield); effect.setText("enchanted creature gets +1/+0"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("and has flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/w/WingsOfHope.java b/Mage.Sets/src/mage/cards/w/WingsOfHope.java index e699d2d5cd6..8252b78d546 100644 --- a/Mage.Sets/src/mage/cards/w/WingsOfHope.java +++ b/Mage.Sets/src/mage/cards/w/WingsOfHope.java @@ -38,7 +38,7 @@ public final class WingsOfHope extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+3 and has flying. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 3, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, 3, 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/w/WingsOfHubris.java b/Mage.Sets/src/mage/cards/w/WingsOfHubris.java index f23a37ca4bb..96bf754eed5 100644 --- a/Mage.Sets/src/mage/cards/w/WingsOfHubris.java +++ b/Mage.Sets/src/mage/cards/w/WingsOfHubris.java @@ -40,7 +40,7 @@ public final class WingsOfHubris extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.EQUIPMENT))); // Sacrifice Wings of Hubris: Equipped creature can't be blocked this turn. Sacrifice it at the beginning of the next end step. this.addAbility(new SimpleActivatedAbility(new WingsOfHubrisEffect(), new SacrificeSourceCost())); diff --git a/Mage.Sets/src/mage/cards/w/WinterOrb.java b/Mage.Sets/src/mage/cards/w/WinterOrb.java index 7a9b3167bd8..f052a445c08 100644 --- a/Mage.Sets/src/mage/cards/w/WinterOrb.java +++ b/Mage.Sets/src/mage/cards/w/WinterOrb.java @@ -27,7 +27,7 @@ public final class WinterOrb extends CardImpl { // As long as Winter Orb is untapped, players can't untap more than one land during their untap steps. // Players can't untap more than one land during their untap steps. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WinterOrbEffect())); + this.addAbility(new SimpleStaticAbility(new WinterOrbEffect())); } diff --git a/Mage.Sets/src/mage/cards/w/Wirecat.java b/Mage.Sets/src/mage/cards/w/Wirecat.java index de63dd23ed0..3b8e48ae566 100644 --- a/Mage.Sets/src/mage/cards/w/Wirecat.java +++ b/Mage.Sets/src/mage/cards/w/Wirecat.java @@ -28,7 +28,7 @@ public final class Wirecat extends CardImpl { this.toughness = new MageInt(3); // Wirecat can't attack or block if an enchantment is on the battlefield. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WirecatEffect())); + this.addAbility(new SimpleStaticAbility(new WirecatEffect())); } private Wirecat(final Wirecat card) { diff --git a/Mage.Sets/src/mage/cards/w/WitchHunt.java b/Mage.Sets/src/mage/cards/w/WitchHunt.java index 24bf9cead9b..470b5570108 100644 --- a/Mage.Sets/src/mage/cards/w/WitchHunt.java +++ b/Mage.Sets/src/mage/cards/w/WitchHunt.java @@ -33,7 +33,7 @@ public final class WitchHunt extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{4}{R}"); // Players can't gain life. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantGainLifeAllEffect())); + this.addAbility(new SimpleStaticAbility(new CantGainLifeAllEffect())); // At the beginning of your upkeep, Witch Hunt deals 4 damage to you. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DamageControllerEffect(4))); // At the beginning of your end step, target opponent chosen at random gains control of Witch Hunt. diff --git a/Mage.Sets/src/mage/cards/w/WitchbaneOrb.java b/Mage.Sets/src/mage/cards/w/WitchbaneOrb.java index 463171af825..1664f8a91f0 100644 --- a/Mage.Sets/src/mage/cards/w/WitchbaneOrb.java +++ b/Mage.Sets/src/mage/cards/w/WitchbaneOrb.java @@ -34,7 +34,7 @@ public final class WitchbaneOrb extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new WitchbaneOrbEffect())); // You have hexproof. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControllerEffect(HexproofAbility.getInstance()))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControllerEffect(HexproofAbility.getInstance()))); } diff --git a/Mage.Sets/src/mage/cards/w/WitchesEye.java b/Mage.Sets/src/mage/cards/w/WitchesEye.java index 4186aae9731..5f26cb3b863 100644 --- a/Mage.Sets/src/mage/cards/w/WitchesEye.java +++ b/Mage.Sets/src/mage/cards/w/WitchesEye.java @@ -32,7 +32,7 @@ public final class WitchesEye extends CardImpl { // Equipped creature has "{1}, {T}: Scry 1." Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1, false), new GenericManaCost(1)); gainedAbility.addCost(new TapSourceCost()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.EQUIPMENT, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.EQUIPMENT, Duration.WhileOnBattlefield))); // Equip {1} this.addAbility(new EquipAbility(Outcome.Benefit, new GenericManaCost(1), false)); diff --git a/Mage.Sets/src/mage/cards/w/WizenedCenn.java b/Mage.Sets/src/mage/cards/w/WizenedCenn.java index ceb8ce23ccb..f7d7f9780fa 100644 --- a/Mage.Sets/src/mage/cards/w/WizenedCenn.java +++ b/Mage.Sets/src/mage/cards/w/WizenedCenn.java @@ -33,7 +33,7 @@ public final class WizenedCenn extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); // Other Kithkin creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); } private WizenedCenn(final WizenedCenn card) { diff --git a/Mage.Sets/src/mage/cards/w/WizenedSnitches.java b/Mage.Sets/src/mage/cards/w/WizenedSnitches.java index 27d2567f872..687c70df1bf 100644 --- a/Mage.Sets/src/mage/cards/w/WizenedSnitches.java +++ b/Mage.Sets/src/mage/cards/w/WizenedSnitches.java @@ -28,7 +28,7 @@ public final class WizenedSnitches extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Players play with the top card of their libraries revealed. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithTheTopCardRevealedEffect(true))); + this.addAbility(new SimpleStaticAbility(new PlayWithTheTopCardRevealedEffect(true))); } private WizenedSnitches(final WizenedSnitches card) { diff --git a/Mage.Sets/src/mage/cards/w/WolfhuntersQuiver.java b/Mage.Sets/src/mage/cards/w/WolfhuntersQuiver.java index 1a4f6d7c8d8..1f41fadcea3 100644 --- a/Mage.Sets/src/mage/cards/w/WolfhuntersQuiver.java +++ b/Mage.Sets/src/mage/cards/w/WolfhuntersQuiver.java @@ -38,7 +38,7 @@ public final class WolfhuntersQuiver extends CardImpl { abilityToGain.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAttachedEffect(abilityToGain, AttachmentType.EQUIPMENT); effect.setText("Equipped creature has \"{T}: This creature deals 1 damage to any target\""); - SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + SimpleStaticAbility ability = new SimpleStaticAbility(effect); // and "{T}: This creature deals 3 damage to target Werewolf creature." abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/w/WolfirSilverheart.java b/Mage.Sets/src/mage/cards/w/WolfirSilverheart.java index 4ed8da9a201..a3a1e01d95f 100644 --- a/Mage.Sets/src/mage/cards/w/WolfirSilverheart.java +++ b/Mage.Sets/src/mage/cards/w/WolfirSilverheart.java @@ -31,7 +31,7 @@ public final class WolfirSilverheart extends CardImpl { this.addAbility(new SoulbondAbility()); // As long as Wolfir Silverheart is paired with another creature, each of those creatures gets +4/+4. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostPairedEffect(4, 4, ruleText))); + this.addAbility(new SimpleStaticAbility(new BoostPairedEffect(4, 4, ruleText))); } private WolfirSilverheart(final WolfirSilverheart card) { diff --git a/Mage.Sets/src/mage/cards/w/WolfkinBond.java b/Mage.Sets/src/mage/cards/w/WolfkinBond.java index 088be9393e5..380b27b9a9c 100644 --- a/Mage.Sets/src/mage/cards/w/WolfkinBond.java +++ b/Mage.Sets/src/mage/cards/w/WolfkinBond.java @@ -41,7 +41,7 @@ public final class WolfkinBond extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new WolfToken()))); // 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 WolfkinBond(final WolfkinBond card) { diff --git a/Mage.Sets/src/mage/cards/w/WoodbornBehemoth.java b/Mage.Sets/src/mage/cards/w/WoodbornBehemoth.java index 0eeace4ea22..d7db1bfdef1 100644 --- a/Mage.Sets/src/mage/cards/w/WoodbornBehemoth.java +++ b/Mage.Sets/src/mage/cards/w/WoodbornBehemoth.java @@ -40,7 +40,7 @@ public final class WoodbornBehemoth extends CardImpl { ConditionalContinuousEffect effect2 = new ConditionalContinuousEffect( new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield), eightOrMoreLandCondition, " and has trample"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect1); + Ability ability = new SimpleStaticAbility(effect1); ability.addEffect(effect2); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WoodenStake.java b/Mage.Sets/src/mage/cards/w/WoodenStake.java index c31e522aad4..78e49449cfc 100644 --- a/Mage.Sets/src/mage/cards/w/WoodenStake.java +++ b/Mage.Sets/src/mage/cards/w/WoodenStake.java @@ -29,7 +29,7 @@ public final class WoodenStake extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 0))); // Whenever equipped creature blocks or becomes blocked by a Vampire, destroy that creature. It can't be regenerated. this.addAbility(new WoodenStakeBlocksOrBecomesBlockedTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/w/WoollyRazorback.java b/Mage.Sets/src/mage/cards/w/WoollyRazorback.java index 244f891422c..3230c86089d 100644 --- a/Mage.Sets/src/mage/cards/w/WoollyRazorback.java +++ b/Mage.Sets/src/mage/cards/w/WoollyRazorback.java @@ -43,7 +43,7 @@ public final class WoollyRazorback extends CardImpl { ConditionalReplacementEffect effect = new ConditionalReplacementEffect(new PreventCombatDamageBySourceEffect(Duration.WhileOnBattlefield), new SourceHasCounterCondition(CounterType.ICE)); effect.setText("as long as {this} has an ice counter on it, prevent all combat damage it would deal"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(DefenderAbility.getInstance()), new SourceHasCounterCondition(CounterType.ICE), "and it has defender")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/Wordmail.java b/Mage.Sets/src/mage/cards/w/Wordmail.java index c9dd600220e..8cbc74618eb 100644 --- a/Mage.Sets/src/mage/cards/w/Wordmail.java +++ b/Mage.Sets/src/mage/cards/w/Wordmail.java @@ -40,7 +40,7 @@ public final class Wordmail extends CardImpl { // Enchanted creature gets +1/+1 for each word in its name. WordmailCount count = new WordmailCount(); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(count, count, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(count, count, Duration.WhileOnBattlefield))); } private Wordmail(final Wordmail card) { diff --git a/Mage.Sets/src/mage/cards/w/WormsOfTheEarth.java b/Mage.Sets/src/mage/cards/w/WormsOfTheEarth.java index e11aa9a9f1a..c6f689b1904 100644 --- a/Mage.Sets/src/mage/cards/w/WormsOfTheEarth.java +++ b/Mage.Sets/src/mage/cards/w/WormsOfTheEarth.java @@ -29,10 +29,10 @@ public final class WormsOfTheEarth extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{B}{B}"); // Players can't play lands. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WormsOfTheEarthPlayEffect())); + this.addAbility(new SimpleStaticAbility(new WormsOfTheEarthPlayEffect())); // Lands can't enter the battlefield. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WormsOfTheEarthEnterEffect())); + this.addAbility(new SimpleStaticAbility(new WormsOfTheEarthEnterEffect())); // At the beginning of each upkeep, any player may sacrifice two lands or have Worms of the Earth deal 5 damage to that player. If a player does either, destroy Worms of the Earth. this.addAbility(new BeginningOfUpkeepTriggeredAbility(TargetController.ANY, new WormsOfTheEarthDestroyEffect(), false)); diff --git a/Mage.Sets/src/mage/cards/w/Worship.java b/Mage.Sets/src/mage/cards/w/Worship.java index c1275da1eb3..0298428d656 100644 --- a/Mage.Sets/src/mage/cards/w/Worship.java +++ b/Mage.Sets/src/mage/cards/w/Worship.java @@ -22,7 +22,7 @@ public final class Worship extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{W}"); // If you control a creature, damage that would reduce your life total to less than 1 reduces it to 1 instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WorshipReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new WorshipReplacementEffect())); } private Worship(final Worship card) { diff --git a/Mage.Sets/src/mage/cards/w/WreathOfGeists.java b/Mage.Sets/src/mage/cards/w/WreathOfGeists.java index 2c50cf1dd8f..9fd796936df 100644 --- a/Mage.Sets/src/mage/cards/w/WreathOfGeists.java +++ b/Mage.Sets/src/mage/cards/w/WreathOfGeists.java @@ -38,7 +38,7 @@ public final class WreathOfGeists extends CardImpl { // Enchanted creature gets +X/+X, where X is the number of creature cards in your graveyard. DynamicValue value = new CardsInControllerGraveyardCount(StaticFilters.FILTER_CARD_CREATURE); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(value, value))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(value, value))); } private WreathOfGeists(final WreathOfGeists card) { diff --git a/Mage.Sets/src/mage/cards/w/WuAdmiral.java b/Mage.Sets/src/mage/cards/w/WuAdmiral.java index 6efe6aec752..371c20c4280 100644 --- a/Mage.Sets/src/mage/cards/w/WuAdmiral.java +++ b/Mage.Sets/src/mage/cards/w/WuAdmiral.java @@ -31,7 +31,7 @@ public final class WuAdmiral extends CardImpl { this.toughness = new MageInt(3); // Wu Admiral gets +1/+1 as long as an opponent controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new OpponentControlsPermanentCondition(filter), "{this} gets +1/+1 as long as an opponent controls an Island"))); diff --git a/Mage.Sets/src/mage/cards/w/WuWarship.java b/Mage.Sets/src/mage/cards/w/WuWarship.java index 06b07e639c8..bc753d89040 100644 --- a/Mage.Sets/src/mage/cards/w/WuWarship.java +++ b/Mage.Sets/src/mage/cards/w/WuWarship.java @@ -26,7 +26,7 @@ public final class WuWarship extends CardImpl { this.toughness = new MageInt(3); // Wu Warship 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 WuWarship(final WuWarship card) { diff --git a/Mage.Sets/src/mage/cards/w/WurmweaverCoil.java b/Mage.Sets/src/mage/cards/w/WurmweaverCoil.java index b3234732ed5..712301dff85 100644 --- a/Mage.Sets/src/mage/cards/w/WurmweaverCoil.java +++ b/Mage.Sets/src/mage/cards/w/WurmweaverCoil.java @@ -46,7 +46,7 @@ public final class WurmweaverCoil extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(6, 6, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(6, 6, Duration.WhileOnBattlefield))); Ability activatedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new WurmToken(), 1), new ManaCostsImpl<>("{G}{G}{G}")); activatedAbility.addCost(new SacrificeSourceCost()); this.addAbility(activatedAbility); diff --git a/Mage.Sets/src/mage/cards/x/Xenograft.java b/Mage.Sets/src/mage/cards/x/Xenograft.java index 42c1f185645..372c4cf5a4a 100644 --- a/Mage.Sets/src/mage/cards/x/Xenograft.java +++ b/Mage.Sets/src/mage/cards/x/Xenograft.java @@ -27,7 +27,7 @@ public final class Xenograft extends CardImpl { // As Xenograft enters the battlefield, choose a creature type. this.addAbility(new AsEntersBattlefieldAbility(new ChooseCreatureTypeEffect(Outcome.Detriment))); // Each creature you control is the chosen type in addition to its other types. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new XenograftAddSubtypeEffect())); + this.addAbility(new SimpleStaticAbility(new XenograftAddSubtypeEffect())); } private Xenograft(final Xenograft card) { diff --git a/Mage.Sets/src/mage/cards/y/YavimayaEnchantress.java b/Mage.Sets/src/mage/cards/y/YavimayaEnchantress.java index d31ccad1b57..b6b2f813543 100644 --- a/Mage.Sets/src/mage/cards/y/YavimayaEnchantress.java +++ b/Mage.Sets/src/mage/cards/y/YavimayaEnchantress.java @@ -33,7 +33,7 @@ public final class YavimayaEnchantress extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), new PermanentsOnBattlefieldCount(filter), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), new PermanentsOnBattlefieldCount(filter), Duration.WhileOnBattlefield))); } private YavimayaEnchantress(final YavimayaEnchantress card) { diff --git a/Mage.Sets/src/mage/cards/y/YavimayasEmbrace.java b/Mage.Sets/src/mage/cards/y/YavimayasEmbrace.java index 09a0a36ff7c..7927061a80f 100644 --- a/Mage.Sets/src/mage/cards/y/YavimayasEmbrace.java +++ b/Mage.Sets/src/mage/cards/y/YavimayasEmbrace.java @@ -40,9 +40,9 @@ public final class YavimayasEmbrace extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); // 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/y/YawgmothsBargain.java b/Mage.Sets/src/mage/cards/y/YawgmothsBargain.java index 5f58a6d1723..c88b6042cb6 100644 --- a/Mage.Sets/src/mage/cards/y/YawgmothsBargain.java +++ b/Mage.Sets/src/mage/cards/y/YawgmothsBargain.java @@ -23,7 +23,7 @@ public final class YawgmothsBargain extends CardImpl { // Skip your draw step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipDrawStepEffect())); + this.addAbility(new SimpleStaticAbility(new SkipDrawStepEffect())); // Pay 1 life: Draw a card. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new PayLifeCost(1))); diff --git a/Mage.Sets/src/mage/cards/y/YevaNaturesHerald.java b/Mage.Sets/src/mage/cards/y/YevaNaturesHerald.java index fcf44e9d4ab..7d32f2e2aa4 100644 --- a/Mage.Sets/src/mage/cards/y/YevaNaturesHerald.java +++ b/Mage.Sets/src/mage/cards/y/YevaNaturesHerald.java @@ -41,7 +41,7 @@ public final class YevaNaturesHerald extends CardImpl { // Flash this.addAbility(FlashAbility.getInstance()); // You may cast green creature spells as though they had flash. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter))); } private YevaNaturesHerald(final YevaNaturesHerald card) { diff --git a/Mage.Sets/src/mage/cards/y/YgraEaterOfAll.java b/Mage.Sets/src/mage/cards/y/YgraEaterOfAll.java index f58324a77f9..13ab7ae12d1 100644 --- a/Mage.Sets/src/mage/cards/y/YgraEaterOfAll.java +++ b/Mage.Sets/src/mage/cards/y/YgraEaterOfAll.java @@ -38,7 +38,7 @@ public final class YgraEaterOfAll extends CardImpl { this.addAbility(new WardAbility(new SacrificeTargetCost(filter), false)); // Other creatures are Food artifacts in addition to their other types and have "{2}, {T}, Sacrifice this permanent: You gain 3 life." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new YgraEaterOfAllEffect())); + this.addAbility(new SimpleStaticAbility(new YgraEaterOfAllEffect())); // Whenever a Food is put into a graveyard from the battlefield, put two +1/+1 counters on Ygra, Eater of All. this.addAbility(new ZoneChangeAllTriggeredAbility(Zone.BATTLEFIELD, Zone.BATTLEFIELD, Zone.GRAVEYARD, diff --git a/Mage.Sets/src/mage/cards/y/YixlidJailer.java b/Mage.Sets/src/mage/cards/y/YixlidJailer.java index 3050e903b68..48cd9d5f3b1 100644 --- a/Mage.Sets/src/mage/cards/y/YixlidJailer.java +++ b/Mage.Sets/src/mage/cards/y/YixlidJailer.java @@ -30,8 +30,8 @@ public final class YixlidJailer extends CardImpl { this.toughness = new MageInt(1); // Cards in graveyards lose all abilities. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new YixlidJailerEffect())); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new YixlidJailerRulesEffect())); + this.addAbility(new SimpleStaticAbility(new YixlidJailerEffect())); + this.addAbility(new SimpleStaticAbility(new YixlidJailerRulesEffect())); } private YixlidJailer(final YixlidJailer card) { diff --git a/Mage.Sets/src/mage/cards/y/YuanShaoTheIndecisive.java b/Mage.Sets/src/mage/cards/y/YuanShaoTheIndecisive.java index 1a4dd9a037b..1f9e3e180c9 100644 --- a/Mage.Sets/src/mage/cards/y/YuanShaoTheIndecisive.java +++ b/Mage.Sets/src/mage/cards/y/YuanShaoTheIndecisive.java @@ -32,7 +32,7 @@ public final class YuanShaoTheIndecisive extends CardImpl { this.addAbility(HorsemanshipAbility.getInstance()); // Each creature you control can't be blocked by more than one creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByMoreThanOneAllEffect(new FilterControlledCreaturePermanent()))); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByMoreThanOneAllEffect(new FilterControlledCreaturePermanent()))); } private YuanShaoTheIndecisive(final YuanShaoTheIndecisive card) { diff --git a/Mage.Sets/src/mage/cards/z/ZephidsEmbrace.java b/Mage.Sets/src/mage/cards/z/ZephidsEmbrace.java index 17db1231ddf..91f83a13114 100644 --- a/Mage.Sets/src/mage/cards/z/ZephidsEmbrace.java +++ b/Mage.Sets/src/mage/cards/z/ZephidsEmbrace.java @@ -35,7 +35,7 @@ public final class ZephidsEmbrace extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and has flying and shroud. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2)); Effect effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText("and has flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/z/ZhouYuChiefCommander.java b/Mage.Sets/src/mage/cards/z/ZhouYuChiefCommander.java index f427c226b74..7b6e0a2d106 100644 --- a/Mage.Sets/src/mage/cards/z/ZhouYuChiefCommander.java +++ b/Mage.Sets/src/mage/cards/z/ZhouYuChiefCommander.java @@ -27,7 +27,7 @@ public final class ZhouYuChiefCommander extends CardImpl { this.toughness = new MageInt(8); // Zhou Yu, Chief Commander 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 ZhouYuChiefCommander(final ZhouYuChiefCommander card) { diff --git a/Mage.Sets/src/mage/cards/z/ZilorthaStrengthIncarnate.java b/Mage.Sets/src/mage/cards/z/ZilorthaStrengthIncarnate.java index d942cfaf157..5ce8990bead 100644 --- a/Mage.Sets/src/mage/cards/z/ZilorthaStrengthIncarnate.java +++ b/Mage.Sets/src/mage/cards/z/ZilorthaStrengthIncarnate.java @@ -30,7 +30,7 @@ public final class ZilorthaStrengthIncarnate extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ZilorthaStrengthIncarnateEffect())); + this.addAbility(new SimpleStaticAbility(new ZilorthaStrengthIncarnateEffect())); } private ZilorthaStrengthIncarnate(ZilorthaStrengthIncarnate card) { diff --git a/Mage.Sets/src/mage/cards/z/ZombieMaster.java b/Mage.Sets/src/mage/cards/z/ZombieMaster.java index aa45d24eb63..9e8bc0deaf3 100644 --- a/Mage.Sets/src/mage/cards/z/ZombieMaster.java +++ b/Mage.Sets/src/mage/cards/z/ZombieMaster.java @@ -41,11 +41,11 @@ public final class ZombieMaster extends CardImpl { // Other Zombie creatures have swampwalk. Effect effect = new GainAbilityAllEffect(new SwampwalkAbility(), Duration.WhileOnBattlefield, filter, true); effect.setText("Other Zombie creatures have swampwalk. (They can't be blocked as long as defending player controls a Swamp.)"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // Other Zombies have "{B}: Regenerate this permanent." effect = new GainAbilityAllEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")), Duration.WhileOnBattlefield, filter, true); effect.setText("Other Zombies have \"{B}: Regenerate this permanent.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/z/ZuberiGoldenFeather.java b/Mage.Sets/src/mage/cards/z/ZuberiGoldenFeather.java index b3a2897e619..ed83ae25ec3 100644 --- a/Mage.Sets/src/mage/cards/z/ZuberiGoldenFeather.java +++ b/Mage.Sets/src/mage/cards/z/ZuberiGoldenFeather.java @@ -29,7 +29,7 @@ public final class ZuberiGoldenFeather extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Other Griffin creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); } private ZuberiGoldenFeather(final ZuberiGoldenFeather card) { diff --git a/Mage.Sets/src/mage/cards/z/ZurEternalSchemer.java b/Mage.Sets/src/mage/cards/z/ZurEternalSchemer.java index 17cfc97c872..19a532e09e0 100644 --- a/Mage.Sets/src/mage/cards/z/ZurEternalSchemer.java +++ b/Mage.Sets/src/mage/cards/z/ZurEternalSchemer.java @@ -55,7 +55,7 @@ public final class ZurEternalSchemer extends CardImpl { // Enchantment creatures you control have deathtouch, lifelink, and hexproof. CompoundAbility compoundAbilities = new CompoundAbility(DeathtouchAbility.getInstance(), LifelinkAbility.getInstance(), HexproofAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(compoundAbilities, Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(compoundAbilities, Duration.WhileOnBattlefield, filter))); // {1}{W}: Target non-Aura enchantment you control becomes a creature in addition to its other types and has base power and toughness each equal to its mana value. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ZurEternalSchemerEffect(), new ManaCostsImpl<>("{1}{W}")); diff --git a/Mage.Sets/src/mage/cards/z/ZurgoBellstriker.java b/Mage.Sets/src/mage/cards/z/ZurgoBellstriker.java index da80d55a43e..c52da4dc799 100644 --- a/Mage.Sets/src/mage/cards/z/ZurgoBellstriker.java +++ b/Mage.Sets/src/mage/cards/z/ZurgoBellstriker.java @@ -32,7 +32,7 @@ public final class ZurgoBellstriker extends CardImpl { this.toughness = new MageInt(2); // Zurgo Bellstriker can't block creatures with power 2 or greater. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockCreaturesSourceEffect(filter))); + this.addAbility(new SimpleStaticAbility(new CantBlockCreaturesSourceEffect(filter))); // Dash {1}{R} this.addAbility(new DashAbility("{1}{R}")); }