diff --git a/Mage.Sets/src/mage/cards/a/AbzanBattlePriest.java b/Mage.Sets/src/mage/cards/a/AbzanBattlePriest.java index a8825077a0f..9548556ad0c 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanBattlePriest.java +++ b/Mage.Sets/src/mage/cards/a/AbzanBattlePriest.java @@ -32,7 +32,6 @@ public final class AbzanBattlePriest extends CardImpl { // Each creature you control with a +1/+1 counter on it has lifelink. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityAllEffect( LifelinkAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_EACH_CONTROLLED_CREATURE_P1P1, diff --git a/Mage.Sets/src/mage/cards/a/AerialEngineer.java b/Mage.Sets/src/mage/cards/a/AerialEngineer.java index 3d0ad400fce..450e1759fc8 100644 --- a/Mage.Sets/src/mage/cards/a/AerialEngineer.java +++ b/Mage.Sets/src/mage/cards/a/AerialEngineer.java @@ -33,7 +33,6 @@ public final class AerialEngineer extends CardImpl { // As long as you control an artifact, Aerial Engineer gets +2/+0 and has flying. Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(2, 0, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition( diff --git a/Mage.Sets/src/mage/cards/a/AggressiveMammoth.java b/Mage.Sets/src/mage/cards/a/AggressiveMammoth.java index 5db5480e8ea..96bae96f2bc 100644 --- a/Mage.Sets/src/mage/cards/a/AggressiveMammoth.java +++ b/Mage.Sets/src/mage/cards/a/AggressiveMammoth.java @@ -31,7 +31,6 @@ public final class AggressiveMammoth extends CardImpl { // Other creatures you control have trample. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityControlledEffect( TrampleAbility.getInstance(), Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/a/AhnCropInvader.java b/Mage.Sets/src/mage/cards/a/AhnCropInvader.java index 4dc68cf6781..c91347f923d 100644 --- a/Mage.Sets/src/mage/cards/a/AhnCropInvader.java +++ b/Mage.Sets/src/mage/cards/a/AhnCropInvader.java @@ -38,7 +38,6 @@ public final class AhnCropInvader extends CardImpl { // As long as it's your turn, Ahn-Crop Invader has first strike. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect( FirstStrikeAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/a/AmuletOfSafekeeping.java b/Mage.Sets/src/mage/cards/a/AmuletOfSafekeeping.java index fc149d9c60e..d8aea5bad5f 100644 --- a/Mage.Sets/src/mage/cards/a/AmuletOfSafekeeping.java +++ b/Mage.Sets/src/mage/cards/a/AmuletOfSafekeeping.java @@ -30,7 +30,6 @@ public final class AmuletOfSafekeeping extends CardImpl { // Creature tokens get -1/-0. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostAllEffect( -1, 0, Duration.WhileOnBattlefield, StaticFilters.FILTER_CREATURE_TOKENS, false diff --git a/Mage.Sets/src/mage/cards/a/ArchfiendOfDespair.java b/Mage.Sets/src/mage/cards/a/ArchfiendOfDespair.java index 835f80563ed..c1419d88fc5 100644 --- a/Mage.Sets/src/mage/cards/a/ArchfiendOfDespair.java +++ b/Mage.Sets/src/mage/cards/a/ArchfiendOfDespair.java @@ -39,7 +39,6 @@ public final class ArchfiendOfDespair extends CardImpl { // Your opponents can't gain life. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new CantGainLifeAllEffect( Duration.WhileOnBattlefield, TargetController.OPPONENT diff --git a/Mage.Sets/src/mage/cards/a/ArisenGorgon.java b/Mage.Sets/src/mage/cards/a/ArisenGorgon.java index 9a63ec14a4c..b3e86ab367b 100644 --- a/Mage.Sets/src/mage/cards/a/ArisenGorgon.java +++ b/Mage.Sets/src/mage/cards/a/ArisenGorgon.java @@ -37,7 +37,6 @@ public final class ArisenGorgon extends CardImpl { // Arisen Gorgon has deathtouch as long as you control a Liliana planeswalker. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect( DeathtouchAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/a/AsForetold.java b/Mage.Sets/src/mage/cards/a/AsForetold.java index acc708f89cc..f5a67dc386c 100644 --- a/Mage.Sets/src/mage/cards/a/AsForetold.java +++ b/Mage.Sets/src/mage/cards/a/AsForetold.java @@ -40,7 +40,6 @@ public final class AsForetold extends CardImpl { // Once each turn, you may pay {0} rather than pay the mana cost for a spell you cast with converted mana cost X or less, where X is the number of time counters on As Foretold. addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new AsForetoldAddAltCostEffect())); } diff --git a/Mage.Sets/src/mage/cards/a/AuriokEdgewright.java b/Mage.Sets/src/mage/cards/a/AuriokEdgewright.java index 55aa47616c4..f587e6408f6 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokEdgewright.java +++ b/Mage.Sets/src/mage/cards/a/AuriokEdgewright.java @@ -31,7 +31,6 @@ public final class AuriokEdgewright extends CardImpl { ContinuousEffect effect = new GainAbilitySourceEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield); this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect, MetalcraftCondition.instance, effectText)) .setAbilityWord(AbilityWord.METALCRAFT) .addHint(MetalcraftHint.instance) diff --git a/Mage.Sets/src/mage/cards/b/BattlefrontKrushok.java b/Mage.Sets/src/mage/cards/b/BattlefrontKrushok.java index 0a0bae295e3..6390b5d75e9 100644 --- a/Mage.Sets/src/mage/cards/b/BattlefrontKrushok.java +++ b/Mage.Sets/src/mage/cards/b/BattlefrontKrushok.java @@ -33,7 +33,6 @@ public final class BattlefrontKrushok extends CardImpl { // Each creature you control with a +1/+1 counter on it can't be blocked by more than one creature. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new CantBeBlockedByMoreThanOneAllEffect(StaticFilters.FILTER_CONTROLLED_CREATURE_P1P1))); } diff --git a/Mage.Sets/src/mage/cards/c/CallToArms.java b/Mage.Sets/src/mage/cards/c/CallToArms.java index 104f789b443..a2c4ccb20e9 100644 --- a/Mage.Sets/src/mage/cards/c/CallToArms.java +++ b/Mage.Sets/src/mage/cards/c/CallToArms.java @@ -50,7 +50,6 @@ public final class CallToArms extends CardImpl { // White creatures get +1/+1 as long as the chosen color is the most common color among nontoken permanents the chosen player controls but isn't tied for most common. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new CallToArmsEffect() )); diff --git a/Mage.Sets/src/mage/cards/c/CennsTactician.java b/Mage.Sets/src/mage/cards/c/CennsTactician.java index 9f5c1305160..711c5ef7d97 100644 --- a/Mage.Sets/src/mage/cards/c/CennsTactician.java +++ b/Mage.Sets/src/mage/cards/c/CennsTactician.java @@ -44,7 +44,6 @@ public final class CennsTactician extends CardImpl { // Each creature you control with a +1/+1 counter on it can block an additional creature each combat. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new CanBlockAdditionalCreatureAllEffect( 1, StaticFilters.FILTER_EACH_CONTROLLED_CREATURE_P1P1, diff --git a/Mage.Sets/src/mage/cards/c/ChaosLord.java b/Mage.Sets/src/mage/cards/c/ChaosLord.java index bdffba28598..208bbffb97b 100644 --- a/Mage.Sets/src/mage/cards/c/ChaosLord.java +++ b/Mage.Sets/src/mage/cards/c/ChaosLord.java @@ -43,7 +43,6 @@ public final class ChaosLord extends CardImpl { // Chaos Lord can attack as though it had haste unless it entered the battlefield this turn. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ChaosLordEffect())); } diff --git a/Mage.Sets/src/mage/cards/c/ChargingWarBoar.java b/Mage.Sets/src/mage/cards/c/ChargingWarBoar.java index 58c8cdd9610..3cb206f6161 100644 --- a/Mage.Sets/src/mage/cards/c/ChargingWarBoar.java +++ b/Mage.Sets/src/mage/cards/c/ChargingWarBoar.java @@ -42,7 +42,6 @@ public final class ChargingWarBoar extends CardImpl { // As long as you control a Domri planeswalker, Charging War Boar gets +1/+1 and has trample. Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), condition, "As long as you control a Domri planeswalker, {this} gets +1/+1" diff --git a/Mage.Sets/src/mage/cards/c/CliffrunnerBehemoth.java b/Mage.Sets/src/mage/cards/c/CliffrunnerBehemoth.java index c056044d859..c3338497b36 100644 --- a/Mage.Sets/src/mage/cards/c/CliffrunnerBehemoth.java +++ b/Mage.Sets/src/mage/cards/c/CliffrunnerBehemoth.java @@ -43,13 +43,11 @@ public final class CliffrunnerBehemoth extends CardImpl { // Cliffrunner Behemoth has haste as long as you control a red permanent. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(redPermanentFilter), "{this} has haste as long as you control a red permanent"))); // Cliffrunner Behemoth has lifelink as long as you control a white permanent. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect(LifelinkAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(whitePermanentFilter), "{this} has lifelink as long as you control a white permanent"))); diff --git a/Mage.Sets/src/mage/cards/c/ColossusOfAkros.java b/Mage.Sets/src/mage/cards/c/ColossusOfAkros.java index 8b271aa8f0e..1e73592785c 100644 --- a/Mage.Sets/src/mage/cards/c/ColossusOfAkros.java +++ b/Mage.Sets/src/mage/cards/c/ColossusOfAkros.java @@ -43,7 +43,6 @@ public final class ColossusOfAkros extends CardImpl { this.addAbility(new MonstrosityAbility("{10}", 10)); // As long as Colossus of Akros is monstrous, it has trample and can attack as though it didn't have defender. Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield), MonstrousCondition.instance, "As long as {this} is monstrous, it has trample")); diff --git a/Mage.Sets/src/mage/cards/c/CourtCleric.java b/Mage.Sets/src/mage/cards/c/CourtCleric.java index b9625bb2b87..d3eeb7babe7 100644 --- a/Mage.Sets/src/mage/cards/c/CourtCleric.java +++ b/Mage.Sets/src/mage/cards/c/CourtCleric.java @@ -40,7 +40,6 @@ public final class CourtCleric extends CardImpl { // Court Cleric gets +1/+1 as long as you control an Ajani planeswalker. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), diff --git a/Mage.Sets/src/mage/cards/c/CrashOfRhinoBeetles.java b/Mage.Sets/src/mage/cards/c/CrashOfRhinoBeetles.java index f0f33ad5fce..c4d07c0f8eb 100644 --- a/Mage.Sets/src/mage/cards/c/CrashOfRhinoBeetles.java +++ b/Mage.Sets/src/mage/cards/c/CrashOfRhinoBeetles.java @@ -34,7 +34,6 @@ public final class CrashOfRhinoBeetles extends CardImpl { // Crash of Rhino Beetles gets +10/+10 as long as you control ten or more lands. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect( 10, 10, Duration.WhileOnBattlefield diff --git a/Mage.Sets/src/mage/cards/c/CrownedCeratok.java b/Mage.Sets/src/mage/cards/c/CrownedCeratok.java index 0191ad079ce..2ad266fcb12 100644 --- a/Mage.Sets/src/mage/cards/c/CrownedCeratok.java +++ b/Mage.Sets/src/mage/cards/c/CrownedCeratok.java @@ -32,7 +32,6 @@ public final class CrownedCeratok extends CardImpl { // Each creature you control with a +1/+1 counter on it has trample. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityAllEffect( TrampleAbility.getInstance(), Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/d/DarkbladeAgent.java b/Mage.Sets/src/mage/cards/d/DarkbladeAgent.java index 5e902c1de29..40f777c4955 100644 --- a/Mage.Sets/src/mage/cards/d/DarkbladeAgent.java +++ b/Mage.Sets/src/mage/cards/d/DarkbladeAgent.java @@ -35,7 +35,6 @@ public final class DarkbladeAgent extends CardImpl { // As long as you've surveilled this turn, Darkblade Agent has deathtouch and "Whenever this creature deals combat damage to a player, draw a card." Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect( DeathtouchAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/d/DarksteelMonolith.java b/Mage.Sets/src/mage/cards/d/DarksteelMonolith.java index 0cc187f582f..3ae3a10afc3 100644 --- a/Mage.Sets/src/mage/cards/d/DarksteelMonolith.java +++ b/Mage.Sets/src/mage/cards/d/DarksteelMonolith.java @@ -34,7 +34,6 @@ public final class DarksteelMonolith extends CardImpl { // Once each turn, you may pay {0} rather than pay the mana cost for a colorless spell that you cast from your hand. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new DarksteelMonolithAddAltCostEffect() )); } diff --git a/Mage.Sets/src/mage/cards/d/DepartedDeckhand.java b/Mage.Sets/src/mage/cards/d/DepartedDeckhand.java index 2eccac06366..eb731ca38e6 100644 --- a/Mage.Sets/src/mage/cards/d/DepartedDeckhand.java +++ b/Mage.Sets/src/mage/cards/d/DepartedDeckhand.java @@ -50,7 +50,6 @@ public final class DepartedDeckhand extends CardImpl { // Departed Deckhand can only be blocked by Spirits. Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new CantBeBlockedByCreaturesSourceEffect( filter, Duration.WhileOnBattlefield ).setText("{this} can't be blocked except by Spirits") diff --git a/Mage.Sets/src/mage/cards/d/DizzyingGaze.java b/Mage.Sets/src/mage/cards/d/DizzyingGaze.java index dc6a62204bc..104cbca60a1 100644 --- a/Mage.Sets/src/mage/cards/d/DizzyingGaze.java +++ b/Mage.Sets/src/mage/cards/d/DizzyingGaze.java @@ -52,7 +52,6 @@ public final class DizzyingGaze extends CardImpl { Ability ability2 = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{R}")); ability2.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityAttachedEffect( ability2, AttachmentType.AURA, diff --git a/Mage.Sets/src/mage/cards/d/DomesticatedHydra.java b/Mage.Sets/src/mage/cards/d/DomesticatedHydra.java index 663107943a1..3a4f34fc9f0 100644 --- a/Mage.Sets/src/mage/cards/d/DomesticatedHydra.java +++ b/Mage.Sets/src/mage/cards/d/DomesticatedHydra.java @@ -34,7 +34,6 @@ public final class DomesticatedHydra extends CardImpl { // As long as Domesticated Hydra is monstrous, it has trample. Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield), MonstrousCondition.instance, "As long as {this} is monstrous, it has trample")); diff --git a/Mage.Sets/src/mage/cards/d/DovinsAutomaton.java b/Mage.Sets/src/mage/cards/d/DovinsAutomaton.java index e1e17cde995..a5424cab24a 100644 --- a/Mage.Sets/src/mage/cards/d/DovinsAutomaton.java +++ b/Mage.Sets/src/mage/cards/d/DovinsAutomaton.java @@ -36,7 +36,6 @@ public final class DovinsAutomaton extends CardImpl { // As long as you control a Dovin planeswalker, Dovin's Automaton gets +2/+2 and has vigilance. Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), condition, "As long as you control a Dovin planeswalker, {this} gets +2/+2" diff --git a/Mage.Sets/src/mage/cards/d/DrogskolCaptain.java b/Mage.Sets/src/mage/cards/d/DrogskolCaptain.java index 33ff8aefc19..e809798bc45 100644 --- a/Mage.Sets/src/mage/cards/d/DrogskolCaptain.java +++ b/Mage.Sets/src/mage/cards/d/DrogskolCaptain.java @@ -36,7 +36,6 @@ public final class DrogskolCaptain extends CardImpl { // Other Spirit creatures you control get +1/+1 and have hexproof. Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostControlledEffect( 1, 1, Duration.WhileOnBattlefield, filter, true diff --git a/Mage.Sets/src/mage/cards/d/DropkickBomber.java b/Mage.Sets/src/mage/cards/d/DropkickBomber.java index 2a1075bcf26..c113bfa61f3 100644 --- a/Mage.Sets/src/mage/cards/d/DropkickBomber.java +++ b/Mage.Sets/src/mage/cards/d/DropkickBomber.java @@ -49,7 +49,6 @@ public final class DropkickBomber extends CardImpl { // Other Goblins you control get +1/+1. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostControlledEffect( 1, 1, Duration.WhileOnBattlefield, filter, true diff --git a/Mage.Sets/src/mage/cards/e/EarthenGoo.java b/Mage.Sets/src/mage/cards/e/EarthenGoo.java index 87405b0d6b4..dbf9ceeb0d3 100644 --- a/Mage.Sets/src/mage/cards/e/EarthenGoo.java +++ b/Mage.Sets/src/mage/cards/e/EarthenGoo.java @@ -44,7 +44,6 @@ public final class EarthenGoo extends CardImpl { // Earthen Goo gets +1/+1 for each age counter on it. DynamicValue value = new CountersSourceCount(CounterType.AGE); this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostSourceEffect(value, value, Duration.WhileOnBattlefield) .setText("{this} gets +1/+1 for each age counter on it") )); diff --git a/Mage.Sets/src/mage/cards/e/ElvishClancaller.java b/Mage.Sets/src/mage/cards/e/ElvishClancaller.java index fb0b200c467..ca682779119 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishClancaller.java +++ b/Mage.Sets/src/mage/cards/e/ElvishClancaller.java @@ -44,7 +44,6 @@ public final class ElvishClancaller extends CardImpl { // Other Elves you control get +1/+1. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostControlledEffect( 1, 1, Duration.WhileOnBattlefield, filter, true diff --git a/Mage.Sets/src/mage/cards/g/GarrisonSergeant.java b/Mage.Sets/src/mage/cards/g/GarrisonSergeant.java index 92d607bbc85..5e761f9c840 100644 --- a/Mage.Sets/src/mage/cards/g/GarrisonSergeant.java +++ b/Mage.Sets/src/mage/cards/g/GarrisonSergeant.java @@ -38,7 +38,6 @@ public final class GarrisonSergeant extends CardImpl { // Garrison Sergeant has double strike as long as you control a Gate. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect( DoubleStrikeAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/g/GearsmithGuardian.java b/Mage.Sets/src/mage/cards/g/GearsmithGuardian.java index d78b54aad05..cd2a57e35fa 100644 --- a/Mage.Sets/src/mage/cards/g/GearsmithGuardian.java +++ b/Mage.Sets/src/mage/cards/g/GearsmithGuardian.java @@ -38,7 +38,6 @@ public final class GearsmithGuardian extends CardImpl { // Gearsmith Guardian gets +2/+0 as long as you control a blue creature. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(2, 0, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), diff --git a/Mage.Sets/src/mage/cards/g/GearsmithProdigy.java b/Mage.Sets/src/mage/cards/g/GearsmithProdigy.java index a3f696aeb60..f65e994a939 100644 --- a/Mage.Sets/src/mage/cards/g/GearsmithProdigy.java +++ b/Mage.Sets/src/mage/cards/g/GearsmithProdigy.java @@ -31,7 +31,6 @@ public final class GearsmithProdigy extends CardImpl { // Gearsmith Prodigy gets +1/+0 as long as you control an artifact. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(1, 0, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT), diff --git a/Mage.Sets/src/mage/cards/g/Gigantiform.java b/Mage.Sets/src/mage/cards/g/Gigantiform.java index 31ea58d53fb..feb60a03ab0 100644 --- a/Mage.Sets/src/mage/cards/g/Gigantiform.java +++ b/Mage.Sets/src/mage/cards/g/Gigantiform.java @@ -70,7 +70,6 @@ class GigantiformAbility extends StaticAbility { public GigantiformAbility() { super(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA)); Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new SetBasePowerToughnessSourceEffect(8, 8, Duration.WhileOnBattlefield) ); this.addEffect(new GainAbilityAttachedEffect(ability, AttachmentType.AURA)); diff --git a/Mage.Sets/src/mage/cards/g/GoblinTrashmaster.java b/Mage.Sets/src/mage/cards/g/GoblinTrashmaster.java index 433e8abd4ae..f74be7d8f39 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinTrashmaster.java +++ b/Mage.Sets/src/mage/cards/g/GoblinTrashmaster.java @@ -40,7 +40,6 @@ public final class GoblinTrashmaster extends CardImpl { // Other Goblins you control get +1/+1. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostControlledEffect( 1, 1, Duration.WhileOnBattlefield, filter, true diff --git a/Mage.Sets/src/mage/cards/g/GoreclawTerrorOfQalSisma.java b/Mage.Sets/src/mage/cards/g/GoreclawTerrorOfQalSisma.java index 586d0ab7683..6774ef5c4ca 100644 --- a/Mage.Sets/src/mage/cards/g/GoreclawTerrorOfQalSisma.java +++ b/Mage.Sets/src/mage/cards/g/GoreclawTerrorOfQalSisma.java @@ -46,7 +46,6 @@ public final class GoreclawTerrorOfQalSisma extends CardImpl { // Creature spells you cast with power 4 or greater cost {2} less to cast. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 2) )); diff --git a/Mage.Sets/src/mage/cards/g/GraspingScoundrel.java b/Mage.Sets/src/mage/cards/g/GraspingScoundrel.java index 5b110dc08b4..6c9655f7380 100644 --- a/Mage.Sets/src/mage/cards/g/GraspingScoundrel.java +++ b/Mage.Sets/src/mage/cards/g/GraspingScoundrel.java @@ -30,7 +30,6 @@ public final class GraspingScoundrel extends CardImpl{ // Grasping Scoundrel gets +1/+0 as long as it's attacking. this.addAbility( new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(1, 0, Duration.WhileOnBattlefield), SourceAttackingCondition.instance, diff --git a/Mage.Sets/src/mage/cards/g/GruulSpellbreaker.java b/Mage.Sets/src/mage/cards/g/GruulSpellbreaker.java index dce0c0e1c83..38600966b9d 100644 --- a/Mage.Sets/src/mage/cards/g/GruulSpellbreaker.java +++ b/Mage.Sets/src/mage/cards/g/GruulSpellbreaker.java @@ -41,7 +41,6 @@ public final class GruulSpellbreaker extends CardImpl { // As long as it's your turn, you and Gruul Spellbreaker have hexproof. Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilityControllerEffect( HexproofAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/h/HeavenlyBlademaster.java b/Mage.Sets/src/mage/cards/h/HeavenlyBlademaster.java index 7ddd346ebb2..3201bb0c792 100644 --- a/Mage.Sets/src/mage/cards/h/HeavenlyBlademaster.java +++ b/Mage.Sets/src/mage/cards/h/HeavenlyBlademaster.java @@ -56,7 +56,6 @@ public final class HeavenlyBlademaster extends CardImpl { new AuraAttachedCount(1) ); this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostControlledEffect( totalAmount, totalAmount, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, true diff --git a/Mage.Sets/src/mage/cards/h/HighAlert.java b/Mage.Sets/src/mage/cards/h/HighAlert.java index 764a3f00699..0fe967a5ab4 100644 --- a/Mage.Sets/src/mage/cards/h/HighAlert.java +++ b/Mage.Sets/src/mage/cards/h/HighAlert.java @@ -31,7 +31,6 @@ public final class HighAlert extends CardImpl { // Creatures you control can attack as though they didn't have defender. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new CanAttackAsThoughItDidntHaveDefenderAllEffect( Duration.WhileOnBattlefield, StaticFilters.FILTER_CONTROLLED_CREATURES diff --git a/Mage.Sets/src/mage/cards/h/HungeringHydra.java b/Mage.Sets/src/mage/cards/h/HungeringHydra.java index 778433589c5..49da8774253 100644 --- a/Mage.Sets/src/mage/cards/h/HungeringHydra.java +++ b/Mage.Sets/src/mage/cards/h/HungeringHydra.java @@ -39,7 +39,6 @@ public final class HungeringHydra extends CardImpl { // Hungering Hydra can't be blocked by more than one creature. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new CantBeBlockedByMoreThanOneSourceEffect() )); diff --git a/Mage.Sets/src/mage/cards/h/HuntingVelociraptor.java b/Mage.Sets/src/mage/cards/h/HuntingVelociraptor.java index 9cef9d28b06..35321728914 100644 --- a/Mage.Sets/src/mage/cards/h/HuntingVelociraptor.java +++ b/Mage.Sets/src/mage/cards/h/HuntingVelociraptor.java @@ -38,7 +38,6 @@ public final class HuntingVelociraptor extends CardImpl { // Dinosaur spells you cast have prowl {2}{R}. // Based on Chief Engineer this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityControlledSpellsEffect(new ProwlAbility("{2}{R}"), filter) )); } diff --git a/Mage.Sets/src/mage/cards/i/InfiniteHourglass.java b/Mage.Sets/src/mage/cards/i/InfiniteHourglass.java index 77e4d3c9009..b7219ba551a 100644 --- a/Mage.Sets/src/mage/cards/i/InfiniteHourglass.java +++ b/Mage.Sets/src/mage/cards/i/InfiniteHourglass.java @@ -36,7 +36,6 @@ public final class InfiniteHourglass extends CardImpl { // All creatures get +1/+0 for each time counter on Infinite Hourglass. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostAllEffect( new CountersSourceCount(CounterType.TIME), StaticValue.get(0), diff --git a/Mage.Sets/src/mage/cards/i/InspiringPaladin.java b/Mage.Sets/src/mage/cards/i/InspiringPaladin.java index c561923ca9e..c8b159db04c 100644 --- a/Mage.Sets/src/mage/cards/i/InspiringPaladin.java +++ b/Mage.Sets/src/mage/cards/i/InspiringPaladin.java @@ -42,7 +42,6 @@ public final class InspiringPaladin extends CardImpl { // During your turn, this creature has first strike. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect( FirstStrikeAbility.getInstance(), @@ -54,7 +53,6 @@ public final class InspiringPaladin extends CardImpl { // During your turn, creatures you control with +1/+1 counters on them have first strike. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilityControlledEffect( FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter diff --git a/Mage.Sets/src/mage/cards/j/JudithTheScourgeDiva.java b/Mage.Sets/src/mage/cards/j/JudithTheScourgeDiva.java index c01ce816d58..bbb2e3a70e4 100644 --- a/Mage.Sets/src/mage/cards/j/JudithTheScourgeDiva.java +++ b/Mage.Sets/src/mage/cards/j/JudithTheScourgeDiva.java @@ -32,7 +32,6 @@ public final class JudithTheScourgeDiva extends CardImpl { // Other creatures you control get +1/+0. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, true) )); diff --git a/Mage.Sets/src/mage/cards/k/KarganDragonrider.java b/Mage.Sets/src/mage/cards/k/KarganDragonrider.java index 80849c15163..01918619f94 100644 --- a/Mage.Sets/src/mage/cards/k/KarganDragonrider.java +++ b/Mage.Sets/src/mage/cards/k/KarganDragonrider.java @@ -33,7 +33,6 @@ public final class KarganDragonrider extends CardImpl { // As long as you control a Dragon, Kargan Dragonrider has flying. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect( FlyingAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/k/KestiaTheCultivator.java b/Mage.Sets/src/mage/cards/k/KestiaTheCultivator.java index 6d68a230cf2..4dec64fb6f0 100644 --- a/Mage.Sets/src/mage/cards/k/KestiaTheCultivator.java +++ b/Mage.Sets/src/mage/cards/k/KestiaTheCultivator.java @@ -50,7 +50,6 @@ public final class KestiaTheCultivator extends CardImpl { // Enchanted creature gets +4/+4. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostEnchantedEffect(4, 4, Duration.WhileOnBattlefield) )); diff --git a/Mage.Sets/src/mage/cards/l/LeylineOfTheMeek.java b/Mage.Sets/src/mage/cards/l/LeylineOfTheMeek.java index 5e28150bb16..4e1a1a730fb 100644 --- a/Mage.Sets/src/mage/cards/l/LeylineOfTheMeek.java +++ b/Mage.Sets/src/mage/cards/l/LeylineOfTheMeek.java @@ -25,7 +25,6 @@ public final class LeylineOfTheMeek extends CardImpl { // Creature tokens get +1/+1. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostAllEffect( 1, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_CREATURE_TOKENS, false diff --git a/Mage.Sets/src/mage/cards/l/LightningMare.java b/Mage.Sets/src/mage/cards/l/LightningMare.java index 32f6f387f40..4e10b68c637 100644 --- a/Mage.Sets/src/mage/cards/l/LightningMare.java +++ b/Mage.Sets/src/mage/cards/l/LightningMare.java @@ -43,7 +43,6 @@ public final class LightningMare extends CardImpl { // Lightning Mare can't be blocked by blue creatures. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new CantBeBlockedByCreaturesSourceEffect( filter, Duration.WhileOnBattlefield ) diff --git a/Mage.Sets/src/mage/cards/l/LimitedResources.java b/Mage.Sets/src/mage/cards/l/LimitedResources.java index 3763e9d5324..473b27251a4 100644 --- a/Mage.Sets/src/mage/cards/l/LimitedResources.java +++ b/Mage.Sets/src/mage/cards/l/LimitedResources.java @@ -36,7 +36,6 @@ public final class LimitedResources extends CardImpl { // Players can't play lands as long as ten or more lands are on the battlefield. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousRuleModifyingEffect( new CantPlayLandEffect(), new PermanentsOnTheBattlefieldCondition( diff --git a/Mage.Sets/src/mage/cards/l/LongshotSquad.java b/Mage.Sets/src/mage/cards/l/LongshotSquad.java index 1b4c8a70e30..be3009bab1b 100644 --- a/Mage.Sets/src/mage/cards/l/LongshotSquad.java +++ b/Mage.Sets/src/mage/cards/l/LongshotSquad.java @@ -34,7 +34,6 @@ public final class LongshotSquad extends CardImpl { this.addAbility(new OutlastAbility(new ManaCostsImpl<>("{1}{G}"))); // Each creature you control with a +1/+1 counter on it has reach. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityAllEffect( ReachAbility.getInstance(), Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/m/MarkOfAsylum.java b/Mage.Sets/src/mage/cards/m/MarkOfAsylum.java index 3729f0817fe..7b7e25b5aca 100644 --- a/Mage.Sets/src/mage/cards/m/MarkOfAsylum.java +++ b/Mage.Sets/src/mage/cards/m/MarkOfAsylum.java @@ -22,7 +22,6 @@ public final class MarkOfAsylum extends CardImpl { // Prevent all noncombat damage that would be dealt to creatures you control. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new PreventAllNonCombatDamageToAllEffect( Duration.WhileOnBattlefield, StaticFilters.FILTER_CONTROLLED_CREATURES diff --git a/Mage.Sets/src/mage/cards/m/MerEkNightblade.java b/Mage.Sets/src/mage/cards/m/MerEkNightblade.java index 5062d23e0ab..5fd0e071474 100644 --- a/Mage.Sets/src/mage/cards/m/MerEkNightblade.java +++ b/Mage.Sets/src/mage/cards/m/MerEkNightblade.java @@ -35,7 +35,6 @@ public final class MerEkNightblade extends CardImpl { // Each creature you control with a +1/+1 counter on it has deathtouch. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityAllEffect( DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/m/MonstrousHound.java b/Mage.Sets/src/mage/cards/m/MonstrousHound.java index cd157ea75a9..6173b065b42 100644 --- a/Mage.Sets/src/mage/cards/m/MonstrousHound.java +++ b/Mage.Sets/src/mage/cards/m/MonstrousHound.java @@ -33,13 +33,11 @@ public final class MonstrousHound extends CardImpl { // Monstrous Hound can't attack unless you control more lands than defending player. Effect effect = new CantAttackUnlessControllerControlsMoreLandsEffect(); this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, effect.setText("{this} can't attack unless you control more lands than defending player"))); // Monstrous Hound can't block unless you control more lands than attacking player. Effect effect2 = new CantBlockUnlessControllerControlsMoreLandsEffect(); this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, effect2.setText("{this} can't block unless you control more lands than attacking player"))); } diff --git a/Mage.Sets/src/mage/cards/m/MoonEatingDog.java b/Mage.Sets/src/mage/cards/m/MoonEatingDog.java index 9b8ac020620..ea2d688ca17 100644 --- a/Mage.Sets/src/mage/cards/m/MoonEatingDog.java +++ b/Mage.Sets/src/mage/cards/m/MoonEatingDog.java @@ -36,7 +36,6 @@ public final class MoonEatingDog extends CardImpl { // As long as you control a Yanling planeswalker, Moon-Eating Dog has flying. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect( FlyingAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/m/MythUnbound.java b/Mage.Sets/src/mage/cards/m/MythUnbound.java index 2098dcd267a..150076ac28d 100644 --- a/Mage.Sets/src/mage/cards/m/MythUnbound.java +++ b/Mage.Sets/src/mage/cards/m/MythUnbound.java @@ -36,7 +36,6 @@ public final class MythUnbound extends CardImpl { // Your commander costs {1} less to cast for each time it's been cast from the command zone this game. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new MythUnboundCostReductionEffect() )); diff --git a/Mage.Sets/src/mage/cards/o/OctopusUmbra.java b/Mage.Sets/src/mage/cards/o/OctopusUmbra.java index 351ec798fe7..44c1874ff41 100644 --- a/Mage.Sets/src/mage/cards/o/OctopusUmbra.java +++ b/Mage.Sets/src/mage/cards/o/OctopusUmbra.java @@ -51,7 +51,6 @@ public final class OctopusUmbra extends CardImpl { Ability abilityToAdd = new AttacksTriggeredAbility(new TapTargetEffect(), true); abilityToAdd.addTarget(new TargetCreaturePermanent(filter)); ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new SetBasePowerToughnessEnchantedEffect(8, 8) ); ability.addEffect(new GainAbilityAttachedEffect( diff --git a/Mage.Sets/src/mage/cards/o/OrcishSiegemaster.java b/Mage.Sets/src/mage/cards/o/OrcishSiegemaster.java index 8ce8d86155d..1f4b28f6dc0 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishSiegemaster.java +++ b/Mage.Sets/src/mage/cards/o/OrcishSiegemaster.java @@ -49,7 +49,6 @@ public final class OrcishSiegemaster extends CardImpl { // Other Orcs and Goblins you control have trample. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityControlledEffect( TrampleAbility.getInstance(), Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/p/PalladiaMorsTheRuiner.java b/Mage.Sets/src/mage/cards/p/PalladiaMorsTheRuiner.java index dd5502b9966..52a3f52255f 100644 --- a/Mage.Sets/src/mage/cards/p/PalladiaMorsTheRuiner.java +++ b/Mage.Sets/src/mage/cards/p/PalladiaMorsTheRuiner.java @@ -52,7 +52,6 @@ public final class PalladiaMorsTheRuiner extends CardImpl { // Palladia-Mors, the Ruiner has hexproof if it hasn't dealt damage yet. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect(HexproofAbility.getInstance()), PalladiaMorsTheRuinerCondition.instance, diff --git a/Mage.Sets/src/mage/cards/p/PestilentSpirit.java b/Mage.Sets/src/mage/cards/p/PestilentSpirit.java index e3ac73f936c..d14dd02035d 100644 --- a/Mage.Sets/src/mage/cards/p/PestilentSpirit.java +++ b/Mage.Sets/src/mage/cards/p/PestilentSpirit.java @@ -44,7 +44,6 @@ public final class PestilentSpirit extends CardImpl { // Instant and sorcery spells you control have deathtouch. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityControlledSpellsEffect(DeathtouchAbility.getInstance(), filter) )); } diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianBoon.java b/Mage.Sets/src/mage/cards/p/PhyrexianBoon.java index cb95a667758..2f5f40ed96a 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianBoon.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianBoon.java @@ -39,7 +39,6 @@ public final class PhyrexianBoon extends CardImpl { // Enchanted creature gets +2/+1 as long as it's black. Otherwise, it gets -1/-2. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostEnchantedEffect(2, 1), new BoostEnchantedEffect(-1, -2), diff --git a/Mage.Sets/src/mage/cards/p/PistonFistCyclops.java b/Mage.Sets/src/mage/cards/p/PistonFistCyclops.java index 8e3fcc7424a..dcca9e7ba92 100644 --- a/Mage.Sets/src/mage/cards/p/PistonFistCyclops.java +++ b/Mage.Sets/src/mage/cards/p/PistonFistCyclops.java @@ -37,7 +37,6 @@ public final class PistonFistCyclops extends CardImpl { // As long as you've cast an instant or sorcery spell this turn, Piston-Fist Cyclops can attack as though it didn't have defender. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalAsThoughEffect( new CanAttackAsThoughItDidntHaveDefenderSourceEffect( Duration.WhileOnBattlefield diff --git a/Mage.Sets/src/mage/cards/p/PlagueMare.java b/Mage.Sets/src/mage/cards/p/PlagueMare.java index eb1711cd07c..50bdc856c3e 100644 --- a/Mage.Sets/src/mage/cards/p/PlagueMare.java +++ b/Mage.Sets/src/mage/cards/p/PlagueMare.java @@ -38,7 +38,6 @@ public final class PlagueMare extends CardImpl { // Plague Mare can't be blocked by white creatures. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new CantBeBlockedByCreaturesSourceEffect( filter, Duration.WhileOnBattlefield ) diff --git a/Mage.Sets/src/mage/cards/p/ProdigiousGrowth.java b/Mage.Sets/src/mage/cards/p/ProdigiousGrowth.java index d545bc70ff4..be4c432f381 100644 --- a/Mage.Sets/src/mage/cards/p/ProdigiousGrowth.java +++ b/Mage.Sets/src/mage/cards/p/ProdigiousGrowth.java @@ -39,7 +39,6 @@ public final class ProdigiousGrowth extends CardImpl { // Enchanted creature gets +7/+7 and has trample. ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostEnchantedEffect(7, 7, Duration.WhileOnBattlefield) ); ability.addEffect(new GainAbilityAttachedEffect( diff --git a/Mage.Sets/src/mage/cards/p/PurrajOfUrborg.java b/Mage.Sets/src/mage/cards/p/PurrajOfUrborg.java index 568069c60b6..921e0e81a72 100644 --- a/Mage.Sets/src/mage/cards/p/PurrajOfUrborg.java +++ b/Mage.Sets/src/mage/cards/p/PurrajOfUrborg.java @@ -46,7 +46,6 @@ public final class PurrajOfUrborg extends CardImpl { // Purraj of Urborg has first strike as long as it's attacking. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), SourceAttackingCondition.instance, diff --git a/Mage.Sets/src/mage/cards/r/RighteousWar.java b/Mage.Sets/src/mage/cards/r/RighteousWar.java index 09f2165673c..d4bcb79cfc5 100644 --- a/Mage.Sets/src/mage/cards/r/RighteousWar.java +++ b/Mage.Sets/src/mage/cards/r/RighteousWar.java @@ -33,7 +33,6 @@ public final class RighteousWar extends CardImpl { // White creatures you control have protection from black. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityControlledEffect( ProtectionAbility.from(ObjectColor.BLACK), Duration.WhileOnBattlefield, @@ -43,7 +42,6 @@ public final class RighteousWar extends CardImpl { // Black creatures you control have protection from white. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityControlledEffect( ProtectionAbility.from(ObjectColor.WHITE), Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/r/RushbladeCommander.java b/Mage.Sets/src/mage/cards/r/RushbladeCommander.java index 52315300f32..c77151a73b5 100644 --- a/Mage.Sets/src/mage/cards/r/RushbladeCommander.java +++ b/Mage.Sets/src/mage/cards/r/RushbladeCommander.java @@ -32,7 +32,6 @@ public final class RushbladeCommander extends CardImpl { // Warrior creatures your team controls have haste. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityAllEffect( HasteAbility.getInstance(), Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/s/SapphireDrake.java b/Mage.Sets/src/mage/cards/s/SapphireDrake.java index 266aef59b1b..ef72bb53c78 100644 --- a/Mage.Sets/src/mage/cards/s/SapphireDrake.java +++ b/Mage.Sets/src/mage/cards/s/SapphireDrake.java @@ -29,7 +29,6 @@ public final class SapphireDrake extends CardImpl { // Each creature you control with a +1/+1 counter on it has flying. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityAllEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_EACH_CONTROLLED_CREATURE_P1P1) diff --git a/Mage.Sets/src/mage/cards/s/ScroungedScythe.java b/Mage.Sets/src/mage/cards/s/ScroungedScythe.java index 6abb9df81ca..0c1473693d5 100644 --- a/Mage.Sets/src/mage/cards/s/ScroungedScythe.java +++ b/Mage.Sets/src/mage/cards/s/ScroungedScythe.java @@ -33,7 +33,6 @@ public final class ScroungedScythe extends CardImpl { // As long as equipped creature is a Human, it has menace. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilityAttachedEffect(new MenaceAbility(), AttachmentType.EQUIPMENT), new EquippedHasSubtypeCondition(SubType.HUMAN), diff --git a/Mage.Sets/src/mage/cards/s/Scuttlegator.java b/Mage.Sets/src/mage/cards/s/Scuttlegator.java index 9cde2f38b48..e9e53f0a082 100644 --- a/Mage.Sets/src/mage/cards/s/Scuttlegator.java +++ b/Mage.Sets/src/mage/cards/s/Scuttlegator.java @@ -39,7 +39,6 @@ public final class Scuttlegator extends CardImpl { // As long as Scuttlegator has a +1/+1 counter on it, it can attack as though it didn't have defender. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalAsThoughEffect( new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.WhileOnBattlefield), new SourceHasCounterCondition(CounterType.P1P1) diff --git a/Mage.Sets/src/mage/cards/s/ShannaSisaysLegacy.java b/Mage.Sets/src/mage/cards/s/ShannaSisaysLegacy.java index cf552fc7b80..2c5089b0294 100644 --- a/Mage.Sets/src/mage/cards/s/ShannaSisaysLegacy.java +++ b/Mage.Sets/src/mage/cards/s/ShannaSisaysLegacy.java @@ -45,7 +45,6 @@ public final class ShannaSisaysLegacy extends CardImpl { // Shanna gets +1/+1 for each creature you control. DynamicValue value = new PermanentsOnBattlefieldCount(StaticFilters.FILTER_CONTROLLED_CREATURES); this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostSourceEffect(value, value, Duration.WhileOnBattlefield) .setText("{this} gets +1/+1 for each creature you control") )); diff --git a/Mage.Sets/src/mage/cards/s/SigiledSwordOfValeron.java b/Mage.Sets/src/mage/cards/s/SigiledSwordOfValeron.java index f0c746feea8..7e5c262a622 100644 --- a/Mage.Sets/src/mage/cards/s/SigiledSwordOfValeron.java +++ b/Mage.Sets/src/mage/cards/s/SigiledSwordOfValeron.java @@ -34,7 +34,6 @@ public final class SigiledSwordOfValeron extends CardImpl { // Equipped creature gets +2/+0, has vigilance, and is a Knight in addition to its other types. Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0) ); ability.addEffect(new GainAbilityAttachedEffect( diff --git a/Mage.Sets/src/mage/cards/s/SinstrikersWill.java b/Mage.Sets/src/mage/cards/s/SinstrikersWill.java index 0095324e5de..36d87a617d8 100644 --- a/Mage.Sets/src/mage/cards/s/SinstrikersWill.java +++ b/Mage.Sets/src/mage/cards/s/SinstrikersWill.java @@ -40,7 +40,6 @@ public final class SinstrikersWill extends CardImpl { ability = new SimpleActivatedAbility(new DamageTargetEffect(SourcePermanentPowerValue.NOT_NEGATIVE), new TapSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature()); this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityAttachedEffect( ability, AttachmentType.AURA, diff --git a/Mage.Sets/src/mage/cards/s/SinuousVermin.java b/Mage.Sets/src/mage/cards/s/SinuousVermin.java index 72b64382bd2..5dc235ac726 100644 --- a/Mage.Sets/src/mage/cards/s/SinuousVermin.java +++ b/Mage.Sets/src/mage/cards/s/SinuousVermin.java @@ -35,7 +35,6 @@ public final class SinuousVermin extends CardImpl { // As long as Sinuous Vermin is monstrous, it has menace. Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(new MenaceAbility(), Duration.WhileOnBattlefield), MonstrousCondition.instance, "As long as {this} is monstrous, it has menace. " + diff --git a/Mage.Sets/src/mage/cards/s/SkatewingSpy.java b/Mage.Sets/src/mage/cards/s/SkatewingSpy.java index e4605b1908c..a2da2a8520a 100644 --- a/Mage.Sets/src/mage/cards/s/SkatewingSpy.java +++ b/Mage.Sets/src/mage/cards/s/SkatewingSpy.java @@ -34,7 +34,6 @@ public final class SkatewingSpy extends CardImpl { // Each creature you control with a +1/+1 counter on it has flying. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityAllEffect( FlyingAbility.getInstance(), Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/s/SkitteringCrustacean.java b/Mage.Sets/src/mage/cards/s/SkitteringCrustacean.java index 5130bd827a4..f8374ac0a98 100644 --- a/Mage.Sets/src/mage/cards/s/SkitteringCrustacean.java +++ b/Mage.Sets/src/mage/cards/s/SkitteringCrustacean.java @@ -34,7 +34,6 @@ public final class SkitteringCrustacean extends CardImpl { // As long as Skittering Crustacean is monstrous, it has hexproof. Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield), MonstrousCondition.instance, "As long as {this} is monstrous, it has hexproof")); diff --git a/Mage.Sets/src/mage/cards/s/SnowDevil.java b/Mage.Sets/src/mage/cards/s/SnowDevil.java index 12abdb83e88..f169d2fbcd8 100644 --- a/Mage.Sets/src/mage/cards/s/SnowDevil.java +++ b/Mage.Sets/src/mage/cards/s/SnowDevil.java @@ -50,7 +50,6 @@ public final class SnowDevil extends CardImpl { // Enchanted creature has first strike as long as it's blocking and you control a snow land. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilityAttachedEffect( FirstStrikeAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/s/SteamfloggerBoss.java b/Mage.Sets/src/mage/cards/s/SteamfloggerBoss.java index c4467fa9c81..d9c7bd20501 100644 --- a/Mage.Sets/src/mage/cards/s/SteamfloggerBoss.java +++ b/Mage.Sets/src/mage/cards/s/SteamfloggerBoss.java @@ -35,7 +35,6 @@ public final class SteamfloggerBoss extends CardImpl { // Other Rigger creatures you control get +1/+0 and have haste. Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostControlledEffect( 1, 0, Duration.WhileOnBattlefield, filter, true @@ -50,7 +49,6 @@ public final class SteamfloggerBoss extends CardImpl { // If a Rigger you control would assemble a Contraption, it assembles two Contraptions instead. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new InfoEffect( "If a Rigger you control would assemble a Contraption, " + "it assembles two Contraptions instead" diff --git a/Mage.Sets/src/mage/cards/s/StreetRiot.java b/Mage.Sets/src/mage/cards/s/StreetRiot.java index a87b1369aac..c3960dc93a6 100644 --- a/Mage.Sets/src/mage/cards/s/StreetRiot.java +++ b/Mage.Sets/src/mage/cards/s/StreetRiot.java @@ -27,7 +27,6 @@ public final class StreetRiot extends CardImpl { // As long as it's your turn, creatures you control get +1/+0 and have trample. Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostControlledEffect( 1, 0, Duration.WhileOnBattlefield diff --git a/Mage.Sets/src/mage/cards/s/SunCrestedPterodon.java b/Mage.Sets/src/mage/cards/s/SunCrestedPterodon.java index 1da9c7472ba..ce6bd240059 100644 --- a/Mage.Sets/src/mage/cards/s/SunCrestedPterodon.java +++ b/Mage.Sets/src/mage/cards/s/SunCrestedPterodon.java @@ -45,7 +45,6 @@ public final class SunCrestedPterodon extends CardImpl { ContinuousEffect effect = new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield); Condition condition = new PermanentsOnTheBattlefieldCondition(filterAnotherDino); this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect, condition, "{this} has vigilance as long as you control another Dinosaur.") )); diff --git a/Mage.Sets/src/mage/cards/s/SupremePhantom.java b/Mage.Sets/src/mage/cards/s/SupremePhantom.java index a75ced12162..2be942ed947 100644 --- a/Mage.Sets/src/mage/cards/s/SupremePhantom.java +++ b/Mage.Sets/src/mage/cards/s/SupremePhantom.java @@ -33,7 +33,6 @@ public final class SupremePhantom extends CardImpl { // Other Spirits you control get +1/+1. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostControlledEffect( 1, 1, Duration.WhileOnBattlefield, filter, true diff --git a/Mage.Sets/src/mage/cards/s/SurgeMare.java b/Mage.Sets/src/mage/cards/s/SurgeMare.java index cd11baa5f3d..3350d109e47 100644 --- a/Mage.Sets/src/mage/cards/s/SurgeMare.java +++ b/Mage.Sets/src/mage/cards/s/SurgeMare.java @@ -41,7 +41,6 @@ public final class SurgeMare extends CardImpl { // Surge Mare can't be blocked by green creatures. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new CantBeBlockedByCreaturesSourceEffect( filter, Duration.WhileOnBattlefield ) diff --git a/Mage.Sets/src/mage/cards/s/SwarmbornGiant.java b/Mage.Sets/src/mage/cards/s/SwarmbornGiant.java index 3cd0f13715c..d8de4d067cb 100644 --- a/Mage.Sets/src/mage/cards/s/SwarmbornGiant.java +++ b/Mage.Sets/src/mage/cards/s/SwarmbornGiant.java @@ -44,7 +44,6 @@ public final class SwarmbornGiant extends CardImpl { // As long as Swarmborn Giant is monstrous, it has reach. Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(ReachAbility.getInstance(), Duration.WhileOnBattlefield), MonstrousCondition.instance, "As long as {this} is monstrous, it has reach")); diff --git a/Mage.Sets/src/mage/cards/t/TahngarthsRage.java b/Mage.Sets/src/mage/cards/t/TahngarthsRage.java index 12ca298887b..42624c8a2d6 100644 --- a/Mage.Sets/src/mage/cards/t/TahngarthsRage.java +++ b/Mage.Sets/src/mage/cards/t/TahngarthsRage.java @@ -40,7 +40,6 @@ public final class TahngarthsRage extends CardImpl { // Enchanted creature gets +3/+0 as long as it's attacking. Otherwise, it gets -2/-1. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostEnchantedEffect(3, 0, Duration.WhileOnBattlefield), new BoostEnchantedEffect(-2, -1, Duration.WhileOnBattlefield), diff --git a/Mage.Sets/src/mage/cards/t/TajicLegionsEdge.java b/Mage.Sets/src/mage/cards/t/TajicLegionsEdge.java index 34d58777766..eea26e59139 100644 --- a/Mage.Sets/src/mage/cards/t/TajicLegionsEdge.java +++ b/Mage.Sets/src/mage/cards/t/TajicLegionsEdge.java @@ -50,7 +50,6 @@ public final class TajicLegionsEdge extends CardImpl { // Prevent all noncombat damage that would be dealt to other creatures you control. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new PreventAllNonCombatDamageToAllEffect( Duration.WhileOnBattlefield, filter ) diff --git a/Mage.Sets/src/mage/cards/t/TendershootDryad.java b/Mage.Sets/src/mage/cards/t/TendershootDryad.java index 17da3ed05b7..a6a0471e0cb 100644 --- a/Mage.Sets/src/mage/cards/t/TendershootDryad.java +++ b/Mage.Sets/src/mage/cards/t/TendershootDryad.java @@ -44,7 +44,6 @@ public final class TendershootDryad extends CardImpl { // Saprolings you control get +2/+2 as long as you have the city's blessing. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter), CitysBlessingCondition.instance, diff --git a/Mage.Sets/src/mage/cards/t/TeysaKarlov.java b/Mage.Sets/src/mage/cards/t/TeysaKarlov.java index 8cf1752bc29..1ccd4409919 100644 --- a/Mage.Sets/src/mage/cards/t/TeysaKarlov.java +++ b/Mage.Sets/src/mage/cards/t/TeysaKarlov.java @@ -37,7 +37,6 @@ public final class TeysaKarlov extends CardImpl { // Creature tokens you control have vigilance and lifelink. Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityControlledEffect( VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/t/TezzeretsStrider.java b/Mage.Sets/src/mage/cards/t/TezzeretsStrider.java index 528ca79b88a..c8550bc53c8 100644 --- a/Mage.Sets/src/mage/cards/t/TezzeretsStrider.java +++ b/Mage.Sets/src/mage/cards/t/TezzeretsStrider.java @@ -36,7 +36,6 @@ public final class TezzeretsStrider extends CardImpl { // As long as you control a Tezzeret planeswalker, Tezzeret's Strider has menace. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect( new MenaceAbility(true), diff --git a/Mage.Sets/src/mage/cards/t/ThoughtboundPhantasm.java b/Mage.Sets/src/mage/cards/t/ThoughtboundPhantasm.java index 9e252c6024d..28cf83312b8 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtboundPhantasm.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtboundPhantasm.java @@ -38,7 +38,6 @@ public final class ThoughtboundPhantasm extends CardImpl { // As long as Thoughtbound Phantasm has three or more +1/+1 counters on it, it can attack as though it didn't have defender. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalAsThoughEffect( new CanAttackAsThoughItDidntHaveDefenderSourceEffect( Duration.WhileOnBattlefield diff --git a/Mage.Sets/src/mage/cards/t/TibaltRakishInstigator.java b/Mage.Sets/src/mage/cards/t/TibaltRakishInstigator.java index bec81abee2f..20a8427df4d 100644 --- a/Mage.Sets/src/mage/cards/t/TibaltRakishInstigator.java +++ b/Mage.Sets/src/mage/cards/t/TibaltRakishInstigator.java @@ -25,7 +25,6 @@ public final class TibaltRakishInstigator extends CardImpl { // Your opponents can't gain life. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new CantGainLifeAllEffect( Duration.WhileOnBattlefield, TargetController.OPPONENT diff --git a/Mage.Sets/src/mage/cards/t/TlincalliHunter.java b/Mage.Sets/src/mage/cards/t/TlincalliHunter.java index fc03ac2d409..9cf8845dc43 100644 --- a/Mage.Sets/src/mage/cards/t/TlincalliHunter.java +++ b/Mage.Sets/src/mage/cards/t/TlincalliHunter.java @@ -40,7 +40,6 @@ public final class TlincalliHunter extends AdventureCard { // Once each turn, you may pay {0} rather than pay the mana cost for a creature spell you cast from exile. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new TlincalliHunterAddAltCostEffect())); // Retrieve Prey diff --git a/Mage.Sets/src/mage/cards/t/TrollbredGuardian.java b/Mage.Sets/src/mage/cards/t/TrollbredGuardian.java index 45790ecabf2..b4042b97f53 100644 --- a/Mage.Sets/src/mage/cards/t/TrollbredGuardian.java +++ b/Mage.Sets/src/mage/cards/t/TrollbredGuardian.java @@ -34,7 +34,6 @@ public final class TrollbredGuardian extends CardImpl { // Each creature you control with a +1/+1 counter on it has trample. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityAllEffect( TrampleAbility.getInstance(), Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/t/TuskguardCaptain.java b/Mage.Sets/src/mage/cards/t/TuskguardCaptain.java index f1efa67572b..6714adca015 100644 --- a/Mage.Sets/src/mage/cards/t/TuskguardCaptain.java +++ b/Mage.Sets/src/mage/cards/t/TuskguardCaptain.java @@ -34,7 +34,6 @@ public final class TuskguardCaptain extends CardImpl { this.addAbility(new OutlastAbility(new ManaCostsImpl<>("{G}"))); // Each creature you control with a +1/+1 counter on it has trample. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityAllEffect( TrampleAbility.getInstance(), Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/t/TuvasaTheSunlit.java b/Mage.Sets/src/mage/cards/t/TuvasaTheSunlit.java index e13d4e1a56b..6ef6fb0264c 100644 --- a/Mage.Sets/src/mage/cards/t/TuvasaTheSunlit.java +++ b/Mage.Sets/src/mage/cards/t/TuvasaTheSunlit.java @@ -43,7 +43,6 @@ public final class TuvasaTheSunlit extends CardImpl { DynamicValue value = new PermanentsOnBattlefieldCount(filter); Ability ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostSourceEffect( value, value, Duration.WhileOnBattlefield ).setText("{this} gets +1/+1 for each enchantment you control") diff --git a/Mage.Sets/src/mage/cards/u/UrbanUtopia.java b/Mage.Sets/src/mage/cards/u/UrbanUtopia.java index 1de58fe0dbf..4e352e7c97a 100644 --- a/Mage.Sets/src/mage/cards/u/UrbanUtopia.java +++ b/Mage.Sets/src/mage/cards/u/UrbanUtopia.java @@ -44,7 +44,6 @@ public final class UrbanUtopia extends CardImpl { // Enchanted land has "{T}: Add one mana of any color." this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityAttachedEffect( new AnyColorManaAbility(), AttachmentType.AURA ).setText("Enchanted land has " diff --git a/Mage.Sets/src/mage/cards/v/ValiantKnight.java b/Mage.Sets/src/mage/cards/v/ValiantKnight.java index 23dcf0f1cf2..c1a1717e7f9 100644 --- a/Mage.Sets/src/mage/cards/v/ValiantKnight.java +++ b/Mage.Sets/src/mage/cards/v/ValiantKnight.java @@ -35,7 +35,6 @@ public final class ValiantKnight extends CardImpl { // Other Knights you control get +1/+1. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostControlledEffect( 1, 1, Duration.WhileOnBattlefield, filter, true diff --git a/Mage.Sets/src/mage/cards/v/VelaTheNightClad.java b/Mage.Sets/src/mage/cards/v/VelaTheNightClad.java index 68f63371231..9209518a31e 100644 --- a/Mage.Sets/src/mage/cards/v/VelaTheNightClad.java +++ b/Mage.Sets/src/mage/cards/v/VelaTheNightClad.java @@ -43,7 +43,6 @@ public final class VelaTheNightClad extends CardImpl { this.addAbility(IntimidateAbility.getInstance()); // Other creatures you control have intimidate. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityControlledEffect(IntimidateAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, true))); // Whenever Vela the Night-Clad or another creature you control leaves the battlefield, each opponent loses 1 life. diff --git a/Mage.Sets/src/mage/cards/v/VigorsporeWurm.java b/Mage.Sets/src/mage/cards/v/VigorsporeWurm.java index 4bd89193fb7..0fc430b9541 100644 --- a/Mage.Sets/src/mage/cards/v/VigorsporeWurm.java +++ b/Mage.Sets/src/mage/cards/v/VigorsporeWurm.java @@ -50,7 +50,6 @@ public final class VigorsporeWurm extends CardImpl { // Vigorspore Wurm can't be blocked by more than one creature. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new CantBeBlockedByMoreThanOneSourceEffect() )); } diff --git a/Mage.Sets/src/mage/cards/v/VineMare.java b/Mage.Sets/src/mage/cards/v/VineMare.java index 6b3a4ca4e7d..1dcc9cc46ff 100644 --- a/Mage.Sets/src/mage/cards/v/VineMare.java +++ b/Mage.Sets/src/mage/cards/v/VineMare.java @@ -40,7 +40,6 @@ public final class VineMare extends CardImpl { // Vine Mare can't be blocked by black creatures. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new CantBeBlockedByCreaturesSourceEffect( filter, Duration.WhileOnBattlefield ) diff --git a/Mage.Sets/src/mage/cards/v/VividFlyingFish.java b/Mage.Sets/src/mage/cards/v/VividFlyingFish.java index 79167e2f6c1..5aaa50cecfe 100644 --- a/Mage.Sets/src/mage/cards/v/VividFlyingFish.java +++ b/Mage.Sets/src/mage/cards/v/VividFlyingFish.java @@ -30,7 +30,6 @@ public final class VividFlyingFish extends CardImpl { // Vivid Flying Fish has flying as long as it's attacking. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect( FlyingAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/w/WargRider.java b/Mage.Sets/src/mage/cards/w/WargRider.java index eb072cc2f9c..2839819f8f1 100644 --- a/Mage.Sets/src/mage/cards/w/WargRider.java +++ b/Mage.Sets/src/mage/cards/w/WargRider.java @@ -44,7 +44,6 @@ public final class WargRider extends CardImpl { // Other Orcs and Goblins you control have menace. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityControlledEffect( new MenaceAbility(false), Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/w/WitheringHex.java b/Mage.Sets/src/mage/cards/w/WitheringHex.java index b05e0558442..d307cecaf75 100644 --- a/Mage.Sets/src/mage/cards/w/WitheringHex.java +++ b/Mage.Sets/src/mage/cards/w/WitheringHex.java @@ -47,7 +47,6 @@ public final class WitheringHex extends CardImpl { // Enchanted creature gets -1/-1 for each plague counter on Withering Hex. DynamicValue value = new MultipliedValue(new CountersSourceCount(CounterType.PLAGUE), -1); this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostEnchantedEffect(value, value, Duration.WhileOnBattlefield) .setText("Enchanted creature gets -1/-1 for each plague counter on {this}.") )); diff --git a/Mage.Sets/src/mage/cards/w/WoollyMammoths.java b/Mage.Sets/src/mage/cards/w/WoollyMammoths.java index f0e2b8bd4ba..2d4b8d62d67 100644 --- a/Mage.Sets/src/mage/cards/w/WoollyMammoths.java +++ b/Mage.Sets/src/mage/cards/w/WoollyMammoths.java @@ -41,7 +41,6 @@ public final class WoollyMammoths extends CardImpl { // Woolly Mammoths has trample as long as you control a snow land. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect( TrampleAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/z/ZeganaUtopianSpeaker.java b/Mage.Sets/src/mage/cards/z/ZeganaUtopianSpeaker.java index d08011209a9..220c79c1331 100644 --- a/Mage.Sets/src/mage/cards/z/ZeganaUtopianSpeaker.java +++ b/Mage.Sets/src/mage/cards/z/ZeganaUtopianSpeaker.java @@ -46,7 +46,6 @@ public final class ZeganaUtopianSpeaker extends CardImpl { // Each creature you control with a +1/+1 counter on it has trample. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityAllEffect( TrampleAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_EACH_CONTROLLED_CREATURE_P1P1) diff --git a/Mage/src/main/java/mage/game/permanent/token/ElephantResurgenceToken.java b/Mage/src/main/java/mage/game/permanent/token/ElephantResurgenceToken.java index 94bbab7c4ad..2e69435c3b4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElephantResurgenceToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElephantResurgenceToken.java @@ -25,7 +25,6 @@ public final class ElephantResurgenceToken extends TokenImpl { toughness = new MageInt(0); this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new SetBasePowerToughnessSourceEffect(new CardsInControllerGraveyardCount(new FilterCreatureCard())) .setText("This creature's power and toughness are each equal to the number of creature cards in its controller's graveyard.") )); diff --git a/Mage/src/main/java/mage/game/permanent/token/SoundTheCallToken.java b/Mage/src/main/java/mage/game/permanent/token/SoundTheCallToken.java index f4f5d344879..1f0d5e31bbd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SoundTheCallToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SoundTheCallToken.java @@ -34,7 +34,6 @@ public final class SoundTheCallToken extends TokenImpl { DynamicValue value = new CardsInAllGraveyardsCount(filter); this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostSourceEffect(value, value, Duration.WhileOnBattlefield) .setText("This creature gets +1/+1 for each card named Sound the Call in each graveyard.") ));