refactor: SimpleStaticAbility default zone (separate line)

2024-11-16 22:19:12 -05:00 · 2024-11-16 22:19:12 -05:00 · ca6d0302b7
commit ca6d0302b7
parent 39512d75ac
105 changed files with 0 additions and 110 deletions
--- 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,
--- 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(
--- 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,
--- 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(),
--- 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
--- 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
--- 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(),
--- 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()));

    }
--- 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)
--- 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)));
    }

--- 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()
        ));

--- 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,
--- 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()));

    }
--- 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"
--- 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")));
--- 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"));
--- 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),
--- 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
--- 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,
--- 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(),
--- 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()
        ));
    }
--- 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")
--- 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,
--- 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"));
--- 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"
--- 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
--- 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
--- 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")
        ));
--- 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
--- 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(),
--- 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),
--- 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),
--- 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));
--- 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
--- 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)
        ));

--- 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,
--- 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(),
--- 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
--- 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
--- 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()
        ));

--- 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)
        ));
    }
--- 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),
--- 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
--- 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)
        ));

--- 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(),
--- 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)
        ));

--- 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
--- 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
                )
--- 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(
--- 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,
--- 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
--- 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,
--- 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")));

    }
--- 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(),
--- 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()
        ));

--- 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(
--- 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,
--- 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,
--- 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)
        ));
    }
--- 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),
--- 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
--- 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
                )
--- 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(
--- 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,
--- 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,
--- 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,
--- 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)
--- 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),
--- 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)
--- 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")
        ));
--- 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(
--- 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,
--- 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. " +
--- 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,
--- 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"));
--- 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(),
--- 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"
--- 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
--- 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.")
        ));
--- 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
--- 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
                )
--- 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"));
--- 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),
--- 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
                )
--- 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,
--- 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,
--- 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),
--- 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
--- 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
--- 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
--- 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,
--- 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,
--- 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")
--- 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 "
--- 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
--- 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.
--- 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()
        ));
    }
--- 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
                )
--- 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(),
--- 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,
--- a/Show more
+++ b/Show more