diff --git a/Mage.Sets/src/mage/cards/b/BINGO.java b/Mage.Sets/src/mage/cards/b/BINGO.java index f227e0abf0b..3d680111570 100644 --- a/Mage.Sets/src/mage/cards/b/BINGO.java +++ b/Mage.Sets/src/mage/cards/b/BINGO.java @@ -52,7 +52,7 @@ public final class BINGO extends CardImpl { // B-I-N-G-O gets +9/+9 for each set of three numbers in a row with chip counters on them. BingoCount count = new BingoCount(); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); } private BINGO(final BINGO card) { diff --git a/Mage.Sets/src/mage/cards/b/BackwoodsSurvivalists.java b/Mage.Sets/src/mage/cards/b/BackwoodsSurvivalists.java index e043d4f2b56..bbc0de902b5 100644 --- a/Mage.Sets/src/mage/cards/b/BackwoodsSurvivalists.java +++ b/Mage.Sets/src/mage/cards/b/BackwoodsSurvivalists.java @@ -31,7 +31,7 @@ public final class BackwoodsSurvivalists extends CardImpl { // Delirium — Backwoods Survivalists gets +1/+1 and has trample as long as there are four or more card types among cards in your graveyard. ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), DeliriumCondition.instance, "Delirium — {this} gets +1/+1"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance()), DeliriumCondition.instance, "and has trample as long as there are four or more card types among cards in your graveyard.")); ability.addHint(CardTypesInGraveyardHint.YOU); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BadMoon.java b/Mage.Sets/src/mage/cards/b/BadMoon.java index f8ce094bcf8..a1ee41f0f2a 100644 --- a/Mage.Sets/src/mage/cards/b/BadMoon.java +++ b/Mage.Sets/src/mage/cards/b/BadMoon.java @@ -30,7 +30,7 @@ public final class BadMoon extends CardImpl { // Black creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); } diff --git a/Mage.Sets/src/mage/cards/b/BalanWanderingKnight.java b/Mage.Sets/src/mage/cards/b/BalanWanderingKnight.java index 05c23b8e032..34ad281c55f 100644 --- a/Mage.Sets/src/mage/cards/b/BalanWanderingKnight.java +++ b/Mage.Sets/src/mage/cards/b/BalanWanderingKnight.java @@ -39,7 +39,7 @@ public final class BalanWanderingKnight extends CardImpl { // Balan, Wandering Knight has double strike as long as two or more Equipment are attached to it. ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(DoubleStrikeAbility.getInstance()), EquippedMultipleSourceCondition.instance, rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // {1}{W}: Attach all Equipment you control to Balan. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BalanWanderingKnightEffect(), new ManaCostsImpl<>("{1}{W}"))); diff --git a/Mage.Sets/src/mage/cards/b/BalefireLiege.java b/Mage.Sets/src/mage/cards/b/BalefireLiege.java index 15cf5e99b4d..5bc0ea8ac83 100644 --- a/Mage.Sets/src/mage/cards/b/BalefireLiege.java +++ b/Mage.Sets/src/mage/cards/b/BalefireLiege.java @@ -44,8 +44,8 @@ public final class BalefireLiege extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(4); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterRedCreature, true))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterWhiteCreature, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterRedCreature, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterWhiteCreature, true))); Ability ability = new SpellCastControllerTriggeredAbility(new DamageTargetEffect(3), filterRedSpell, false); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BalefulEidolon.java b/Mage.Sets/src/mage/cards/b/BalefulEidolon.java index 08c1fa152ec..2fd6a0676c6 100644 --- a/Mage.Sets/src/mage/cards/b/BalefulEidolon.java +++ b/Mage.Sets/src/mage/cards/b/BalefulEidolon.java @@ -31,7 +31,7 @@ public final class BalefulEidolon extends CardImpl { // Deathtouch this.addAbility(DeathtouchAbility.getInstance()); // Enchanted creature gets +1/+1 and has deathtouch. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1,1, Duration.WhileOnBattlefield)); + Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(1,1, Duration.WhileOnBattlefield)); ability.addEffect(new GainAbilityAttachedEffect(DeathtouchAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield,"and has deathtouch")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BallynockCohort.java b/Mage.Sets/src/mage/cards/b/BallynockCohort.java index 539e3f0a082..204bd9a6f1d 100644 --- a/Mage.Sets/src/mage/cards/b/BallynockCohort.java +++ b/Mage.Sets/src/mage/cards/b/BallynockCohort.java @@ -51,7 +51,7 @@ public final class BallynockCohort extends CardImpl { // Ballynock Cohort gets +1/+1 as long as you control another white creature. Condition condition = new PermanentsOnTheBattlefieldCondition(filter); Effect effect = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), condition, rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/b/BallyrushBanneret.java b/Mage.Sets/src/mage/cards/b/BallyrushBanneret.java index 4fc376a1cd3..1d8fd979bd5 100644 --- a/Mage.Sets/src/mage/cards/b/BallyrushBanneret.java +++ b/Mage.Sets/src/mage/cards/b/BallyrushBanneret.java @@ -35,7 +35,7 @@ public final class BallyrushBanneret extends CardImpl { this.toughness = new MageInt(1); // Kithkin spells and Soldier spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); } private BallyrushBanneret(final BallyrushBanneret card) { diff --git a/Mage.Sets/src/mage/cards/b/BalothPup.java b/Mage.Sets/src/mage/cards/b/BalothPup.java index cf9059761c1..179ec558a52 100644 --- a/Mage.Sets/src/mage/cards/b/BalothPup.java +++ b/Mage.Sets/src/mage/cards/b/BalothPup.java @@ -32,7 +32,7 @@ public final class BalothPup extends CardImpl { // Baloth Pup has trample as long as it has a +1/+1 counter on it. Effect effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance()), new SourceHasCounterCondition(CounterType.P1P1), rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private BalothPup(final BalothPup card) { diff --git a/Mage.Sets/src/mage/cards/b/BalthorTheDefiled.java b/Mage.Sets/src/mage/cards/b/BalthorTheDefiled.java index 3566fbf9aba..190272d1ef8 100644 --- a/Mage.Sets/src/mage/cards/b/BalthorTheDefiled.java +++ b/Mage.Sets/src/mage/cards/b/BalthorTheDefiled.java @@ -37,7 +37,7 @@ public final class BalthorTheDefiled extends CardImpl { this.toughness = new MageInt(2); // Minion creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.MINION, "Minion creatures"), false))); // {B}{B}{B}, Exile Balthor the Defiled: Each player returns all black and all red creature cards from their graveyard to the battlefield. diff --git a/Mage.Sets/src/mage/cards/b/BantSureblade.java b/Mage.Sets/src/mage/cards/b/BantSureblade.java index fe889bf15dc..c68f8e140a3 100644 --- a/Mage.Sets/src/mage/cards/b/BantSureblade.java +++ b/Mage.Sets/src/mage/cards/b/BantSureblade.java @@ -41,7 +41,7 @@ public final class BantSureblade extends CardImpl { this.toughness = new MageInt(1); // As long as you control another multicolored permanent, Bant Sureblade gets +1/+1 and has first strike. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1,1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "As long as you control another multicolored permanent, {this} gets +1/+1")); diff --git a/Mage.Sets/src/mage/cards/b/BaralChiefOfCompliance.java b/Mage.Sets/src/mage/cards/b/BaralChiefOfCompliance.java index edcef1d2ec2..76fc9d1cc9f 100644 --- a/Mage.Sets/src/mage/cards/b/BaralChiefOfCompliance.java +++ b/Mage.Sets/src/mage/cards/b/BaralChiefOfCompliance.java @@ -40,7 +40,7 @@ public final class BaralChiefOfCompliance extends CardImpl { this.toughness = new MageInt(3); // Instant and sorcery spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); // Whenever a spell or ability you control counters a spell, you may draw a card. If you do, discard a card. this.addAbility(new SpellCounteredControllerTriggeredAbility(new DrawDiscardControllerEffect(true))); diff --git a/Mage.Sets/src/mage/cards/b/BarbedBattlegear.java b/Mage.Sets/src/mage/cards/b/BarbedBattlegear.java index 6202b258c1d..4c5f28c4c9c 100644 --- a/Mage.Sets/src/mage/cards/b/BarbedBattlegear.java +++ b/Mage.Sets/src/mage/cards/b/BarbedBattlegear.java @@ -26,7 +26,7 @@ public final class BarbedBattlegear extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +4/-1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(4, -1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(4, -1))); // Equip {2} this.addAbility(new EquipAbility(Outcome.Neutral, new GenericManaCost(2), new TargetControlledCreaturePermanent(), false)); diff --git a/Mage.Sets/src/mage/cards/b/BarbedField.java b/Mage.Sets/src/mage/cards/b/BarbedField.java index 90b9b7ede8d..fd18ef3b1ed 100644 --- a/Mage.Sets/src/mage/cards/b/BarbedField.java +++ b/Mage.Sets/src/mage/cards/b/BarbedField.java @@ -39,7 +39,7 @@ public final class BarbedField extends CardImpl { ability.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted land has \"{T}: This land deals 1 damage to any target.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private BarbedField(final BarbedField card) { diff --git a/Mage.Sets/src/mage/cards/b/BarbedSliver.java b/Mage.Sets/src/mage/cards/b/BarbedSliver.java index 0b8a258bb3e..c9c75a84cc3 100644 --- a/Mage.Sets/src/mage/cards/b/BarbedSliver.java +++ b/Mage.Sets/src/mage/cards/b/BarbedSliver.java @@ -28,7 +28,7 @@ public final class BarbedSliver extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn).setText("this creature gets +1/+0 until end of turn"), + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn).setText("this creature gets +1/+0 until end of turn"), new GenericManaCost(2)), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS, false))); } diff --git a/Mage.Sets/src/mage/cards/b/BarrowBlade.java b/Mage.Sets/src/mage/cards/b/BarrowBlade.java index 547c9b141e1..e0fbfcbd410 100644 --- a/Mage.Sets/src/mage/cards/b/BarrowBlade.java +++ b/Mage.Sets/src/mage/cards/b/BarrowBlade.java @@ -23,7 +23,7 @@ public final class BarrowBlade extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 1))); // Whenever equipped creature blocks or becomes blocked by a creature, that creature loses all abilities until end of turn. this.addAbility(new BlocksOrBlockedByCreatureAttachedTriggeredAbility( @@ -44,4 +44,4 @@ public final class BarrowBlade extends CardImpl { public BarrowBlade copy() { return new BarrowBlade(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/b/BartelRuneaxe.java b/Mage.Sets/src/mage/cards/b/BartelRuneaxe.java index 53ecf14104e..07d483ce5b0 100644 --- a/Mage.Sets/src/mage/cards/b/BartelRuneaxe.java +++ b/Mage.Sets/src/mage/cards/b/BartelRuneaxe.java @@ -31,7 +31,7 @@ public final class BartelRuneaxe extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); // Bartel Runeaxe can't be the target of Aura spells. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BartelRuneaxeEffect())); + this.addAbility(new SimpleStaticAbility(new BartelRuneaxeEffect())); } private BartelRuneaxe(final BartelRuneaxe card) { diff --git a/Mage.Sets/src/mage/cards/b/BasalSliver.java b/Mage.Sets/src/mage/cards/b/BasalSliver.java index c32e87fa6e5..d5ea89e1aeb 100644 --- a/Mage.Sets/src/mage/cards/b/BasalSliver.java +++ b/Mage.Sets/src/mage/cards/b/BasalSliver.java @@ -37,7 +37,7 @@ public final class BasalSliver extends CardImpl { // All Slivers have "Sacrifice this permanent: Add {B}{B}." Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(2), new SacrificeSourceCost()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( ability, Duration.WhileOnBattlefield, filter, "All Slivers have \"Sacrifice this permanent: Add {B}{B}.\""))); } diff --git a/Mage.Sets/src/mage/cards/b/BasaltMonolith.java b/Mage.Sets/src/mage/cards/b/BasaltMonolith.java index 57a2046f7bb..b5561ae21b8 100644 --- a/Mage.Sets/src/mage/cards/b/BasaltMonolith.java +++ b/Mage.Sets/src/mage/cards/b/BasaltMonolith.java @@ -25,7 +25,7 @@ public final class BasaltMonolith extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // Basalt Monolith doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // {tap}: Add {C}{C}{C}. this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(3), new TapSourceCost())); // {3}: Untap Basalt Monolith. diff --git a/Mage.Sets/src/mage/cards/b/BasandraBattleSeraph.java b/Mage.Sets/src/mage/cards/b/BasandraBattleSeraph.java index 57b3ee98727..d493a3bbc66 100644 --- a/Mage.Sets/src/mage/cards/b/BasandraBattleSeraph.java +++ b/Mage.Sets/src/mage/cards/b/BasandraBattleSeraph.java @@ -35,7 +35,7 @@ public final class BasandraBattleSeraph extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Players can't cast spells during combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BasandraBattleSeraphEffect())); + this.addAbility(new SimpleStaticAbility(new BasandraBattleSeraphEffect())); // {R}: Target creature attacks this turn if able. Effect effect = new AttacksIfAbleTargetEffect(Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/cards/b/BastionProtector.java b/Mage.Sets/src/mage/cards/b/BastionProtector.java index ababacd673b..39670e9fe3b 100644 --- a/Mage.Sets/src/mage/cards/b/BastionProtector.java +++ b/Mage.Sets/src/mage/cards/b/BastionProtector.java @@ -37,7 +37,7 @@ public final class BastionProtector extends CardImpl { this.toughness = new MageInt(3); // Commander creatures you control get +2/+2 and have indestructible. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter)); + Ability ability = new SimpleStaticAbility(new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter)); Effect effect = new GainAbilityControlledEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield, filter); effect.setText("and have indestructible"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/b/BatteredGolem.java b/Mage.Sets/src/mage/cards/b/BatteredGolem.java index 2ff5b7cbb5f..6c88d6218df 100644 --- a/Mage.Sets/src/mage/cards/b/BatteredGolem.java +++ b/Mage.Sets/src/mage/cards/b/BatteredGolem.java @@ -28,7 +28,7 @@ public final class BatteredGolem extends CardImpl { this.toughness = new MageInt(2); // Battered Golem doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // Whenever an artifact enters the battlefield, you may untap Battered Golem. this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new FilterArtifactPermanent("an artifact"), true)); } diff --git a/Mage.Sets/src/mage/cards/b/BatteringWurm.java b/Mage.Sets/src/mage/cards/b/BatteringWurm.java index 0371c0cd8f1..ddc32801f5e 100644 --- a/Mage.Sets/src/mage/cards/b/BatteringWurm.java +++ b/Mage.Sets/src/mage/cards/b/BatteringWurm.java @@ -27,7 +27,7 @@ public final class BatteringWurm extends CardImpl { this.addAbility(new BloodthirstAbility(1)); // Creatures with power less than Battering Wurm's power can't block it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByCreaturesWithLessPowerEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByCreaturesWithLessPowerEffect())); } private BatteringWurm(final BatteringWurm card) { diff --git a/Mage.Sets/src/mage/cards/b/Batterskull.java b/Mage.Sets/src/mage/cards/b/Batterskull.java index 707743af465..11ef76bfe46 100644 --- a/Mage.Sets/src/mage/cards/b/Batterskull.java +++ b/Mage.Sets/src/mage/cards/b/Batterskull.java @@ -31,9 +31,9 @@ public final class Batterskull extends CardImpl { this.addAbility(new LivingWeaponAbility()); // Equipped creature gets +4/+4 and has vigilance and lifelink. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(4, 4))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.EQUIPMENT))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(4, 4))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.EQUIPMENT))); // {3}: Return Batterskull to its owner's hand. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new GenericManaCost(3))); diff --git a/Mage.Sets/src/mage/cards/b/BattleMastery.java b/Mage.Sets/src/mage/cards/b/BattleMastery.java index bf9a04053fc..75b25af14cd 100644 --- a/Mage.Sets/src/mage/cards/b/BattleMastery.java +++ b/Mage.Sets/src/mage/cards/b/BattleMastery.java @@ -29,7 +29,7 @@ public final class BattleMastery extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DoubleStrikeAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(DoubleStrikeAbility.getInstance(), AttachmentType.AURA))); } private BattleMastery(final BattleMastery card) { diff --git a/Mage.Sets/src/mage/cards/b/BattlefieldThaumaturge.java b/Mage.Sets/src/mage/cards/b/BattlefieldThaumaturge.java index 85fcfe7d66e..b44fcf8ddea 100644 --- a/Mage.Sets/src/mage/cards/b/BattlefieldThaumaturge.java +++ b/Mage.Sets/src/mage/cards/b/BattlefieldThaumaturge.java @@ -37,7 +37,7 @@ public final class BattlefieldThaumaturge extends CardImpl { this.toughness = new MageInt(1); // Each instant and sorcery spell you cast costs 1 less to cast for each creature it targets. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BattlefieldThaumaturgeSpellsCostReductionEffect())); + this.addAbility(new SimpleStaticAbility(new BattlefieldThaumaturgeSpellsCostReductionEffect())); // Heroic - Whenever you cast a spell that targets Battlefield Thaumaturge, Battlefield Thaumaturge gains hexproof until end of turn. this.addAbility(new HeroicAbility(new GainAbilitySourceEffect(HexproofAbility.getInstance(), Duration.EndOfTurn))); diff --git a/Mage.Sets/src/mage/cards/b/BattlefrontKrushok.java b/Mage.Sets/src/mage/cards/b/BattlefrontKrushok.java index afc317aa324..0a0bae295e3 100644 --- a/Mage.Sets/src/mage/cards/b/BattlefrontKrushok.java +++ b/Mage.Sets/src/mage/cards/b/BattlefrontKrushok.java @@ -29,7 +29,7 @@ public final class BattlefrontKrushok extends CardImpl { this.toughness = new MageInt(4); // Battlefront Krushok can't be blocked by more than one creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByMoreThanOneSourceEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByMoreThanOneSourceEffect())); // Each creature you control with a +1/+1 counter on it can't be blocked by more than one creature. this.addAbility(new SimpleStaticAbility( diff --git a/Mage.Sets/src/mage/cards/b/BattlegroundGeist.java b/Mage.Sets/src/mage/cards/b/BattlegroundGeist.java index ffed5d1467e..a8048844b2b 100644 --- a/Mage.Sets/src/mage/cards/b/BattlegroundGeist.java +++ b/Mage.Sets/src/mage/cards/b/BattlegroundGeist.java @@ -35,7 +35,7 @@ public final class BattlegroundGeist extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Other Spirit creatures you control get +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, filter, true))); } private BattlegroundGeist(final BattlegroundGeist card) { diff --git a/Mage.Sets/src/mage/cards/b/BattletideAlchemist.java b/Mage.Sets/src/mage/cards/b/BattletideAlchemist.java index 301bd12b158..779418b1cd0 100644 --- a/Mage.Sets/src/mage/cards/b/BattletideAlchemist.java +++ b/Mage.Sets/src/mage/cards/b/BattletideAlchemist.java @@ -30,7 +30,7 @@ public final class BattletideAlchemist extends CardImpl { this.toughness = new MageInt(4); // If a source would deal damage to a player, you may prevent X of that damage, where X is the number of Clerics you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BattletideAlchemistEffect())); + this.addAbility(new SimpleStaticAbility(new BattletideAlchemistEffect())); } private BattletideAlchemist(final BattletideAlchemist card) { diff --git a/Mage.Sets/src/mage/cards/b/BeastmasterAscension.java b/Mage.Sets/src/mage/cards/b/BeastmasterAscension.java index f12a8a69de9..f88ede4d892 100644 --- a/Mage.Sets/src/mage/cards/b/BeastmasterAscension.java +++ b/Mage.Sets/src/mage/cards/b/BeastmasterAscension.java @@ -28,7 +28,7 @@ public final class BeastmasterAscension extends CardImpl { this.addAbility(new AttacksCreatureYouControlTriggeredAbility(new AddCountersSourceEffect(CounterType.QUEST.createInstance()), true)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BeastmasterAscensionEffect())); + this.addAbility(new SimpleStaticAbility(new BeastmasterAscensionEffect())); } private BeastmasterAscension(final BeastmasterAscension card) { diff --git a/Mage.Sets/src/mage/cards/b/BeastsOfBogardan.java b/Mage.Sets/src/mage/cards/b/BeastsOfBogardan.java index 87210552f79..0b8803c26cd 100644 --- a/Mage.Sets/src/mage/cards/b/BeastsOfBogardan.java +++ b/Mage.Sets/src/mage/cards/b/BeastsOfBogardan.java @@ -41,7 +41,7 @@ public final class BeastsOfBogardan extends CardImpl { // Protection from red this.addAbility(ProtectionAbility.from(ObjectColor.RED)); // Beasts of Bogardan gets +1/+1 as long as an opponent controls a nontoken white permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new OpponentControlsPermanentCondition(controlFilter), "{this} gets +1/+1 as long as an opponent controls a nontoken white permanent"))); diff --git a/Mage.Sets/src/mage/cards/b/Bedlam.java b/Mage.Sets/src/mage/cards/b/Bedlam.java index f305f65a97b..84426a3331d 100644 --- a/Mage.Sets/src/mage/cards/b/Bedlam.java +++ b/Mage.Sets/src/mage/cards/b/Bedlam.java @@ -21,7 +21,7 @@ public final class Bedlam extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}{R}"); // Creatures can't block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAllEffect(StaticFilters.FILTER_PERMANENT_CREATURES, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CantBlockAllEffect(StaticFilters.FILTER_PERMANENT_CREATURES, Duration.WhileOnBattlefield))); } private Bedlam(final Bedlam card) { diff --git a/Mage.Sets/src/mage/cards/b/BehemothSledge.java b/Mage.Sets/src/mage/cards/b/BehemothSledge.java index 37dcd4c939e..158ed6dd5b1 100644 --- a/Mage.Sets/src/mage/cards/b/BehemothSledge.java +++ b/Mage.Sets/src/mage/cards/b/BehemothSledge.java @@ -25,7 +25,7 @@ public final class BehemothSledge extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+2 and has trample and lifelink. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2)); + Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(2, 2)); ability.addEffect(new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT).setText("and has trample")); ability.addEffect(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.EQUIPMENT).setText("and lifelink")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BelligerentSliver.java b/Mage.Sets/src/mage/cards/b/BelligerentSliver.java index 5d28573ed53..27cd53ae16d 100644 --- a/Mage.Sets/src/mage/cards/b/BelligerentSliver.java +++ b/Mage.Sets/src/mage/cards/b/BelligerentSliver.java @@ -36,7 +36,7 @@ public final class BelligerentSliver extends CardImpl { // Sliver creatures you control have menace. (They can't be blocked except by two or more creatures.)" Effect effect = new GainAbilityAllEffect(new MenaceAbility(), Duration.WhileOnBattlefield, filter); effect.setText("Sliver creatures you control have menace. (They can't be blocked except by two or more creatures.)"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private BelligerentSliver(final BelligerentSliver card) { diff --git a/Mage.Sets/src/mage/cards/b/BellowingTanglewurm.java b/Mage.Sets/src/mage/cards/b/BellowingTanglewurm.java index 607da3a7c6a..3cc38fea673 100644 --- a/Mage.Sets/src/mage/cards/b/BellowingTanglewurm.java +++ b/Mage.Sets/src/mage/cards/b/BellowingTanglewurm.java @@ -36,7 +36,7 @@ public final class BellowingTanglewurm extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); this.addAbility(IntimidateAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(IntimidateAbility.getInstance(), Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(IntimidateAbility.getInstance(), Duration.WhileOnBattlefield, filter, true))); } private BellowingTanglewurm(final BellowingTanglewurm card) { diff --git a/Mage.Sets/src/mage/cards/b/BenalishHonorGuard.java b/Mage.Sets/src/mage/cards/b/BenalishHonorGuard.java index 97ab5d73f36..6581c86cb68 100644 --- a/Mage.Sets/src/mage/cards/b/BenalishHonorGuard.java +++ b/Mage.Sets/src/mage/cards/b/BenalishHonorGuard.java @@ -38,7 +38,7 @@ public final class BenalishHonorGuard extends CardImpl { // Benalish Honor Guard gets +1/+0 for each legendary creature you control. PermanentsOnBattlefieldCount count = new PermanentsOnBattlefieldCount(filter); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(count, StaticValue.get(0), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(count, StaticValue.get(0), Duration.WhileOnBattlefield))); } private BenalishHonorGuard(final BenalishHonorGuard card) { diff --git a/Mage.Sets/src/mage/cards/b/BenalishMarshal.java b/Mage.Sets/src/mage/cards/b/BenalishMarshal.java index d95b521f742..ce39cd3965c 100644 --- a/Mage.Sets/src/mage/cards/b/BenalishMarshal.java +++ b/Mage.Sets/src/mage/cards/b/BenalishMarshal.java @@ -22,7 +22,7 @@ public final class BenalishMarshal extends CardImpl { toughness = new MageInt(3); // Other creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, true))); } diff --git a/Mage.Sets/src/mage/cards/b/BenevolentUnicorn.java b/Mage.Sets/src/mage/cards/b/BenevolentUnicorn.java index 42832ef07e4..8935c9d29b8 100644 --- a/Mage.Sets/src/mage/cards/b/BenevolentUnicorn.java +++ b/Mage.Sets/src/mage/cards/b/BenevolentUnicorn.java @@ -34,7 +34,7 @@ public final class BenevolentUnicorn extends CardImpl { this.toughness = new MageInt(2); // If a spell would deal damage to a permanent or player, it deals that much damage minus 1 to that permanent or player instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BenevolentUnicornEffect())); + this.addAbility(new SimpleStaticAbility(new BenevolentUnicornEffect())); } private BenevolentUnicorn(final BenevolentUnicorn card) { diff --git a/Mage.Sets/src/mage/cards/b/BespokeBattlegarb.java b/Mage.Sets/src/mage/cards/b/BespokeBattlegarb.java index 54a12da1b25..bad7c7acc0a 100644 --- a/Mage.Sets/src/mage/cards/b/BespokeBattlegarb.java +++ b/Mage.Sets/src/mage/cards/b/BespokeBattlegarb.java @@ -28,7 +28,7 @@ public final class BespokeBattlegarb extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 0, Duration.WhileOnBattlefield))); // Celebration -- At the beginning of combat on your turn, if two or more nonland permanents entered the battlefield under your control this turn, attach Bespoke Battlegarb to up to one target creature you control. Ability ability = new ConditionalInterveningIfTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/b/BiggerOnTheInside.java b/Mage.Sets/src/mage/cards/b/BiggerOnTheInside.java index f91c4b148b5..4e60439570c 100644 --- a/Mage.Sets/src/mage/cards/b/BiggerOnTheInside.java +++ b/Mage.Sets/src/mage/cards/b/BiggerOnTheInside.java @@ -58,7 +58,7 @@ public final class BiggerOnTheInside extends CardImpl { Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BiggerOnTheInsideEffect(), new TapSourceCost()); gainedAbility.addTarget(new TargetPlayer()); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, null, "permanent"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private BiggerOnTheInside(final BiggerOnTheInside card) { diff --git a/Mage.Sets/src/mage/cards/b/BindingGrasp.java b/Mage.Sets/src/mage/cards/b/BindingGrasp.java index fe202dfc6a7..084cadb339e 100644 --- a/Mage.Sets/src/mage/cards/b/BindingGrasp.java +++ b/Mage.Sets/src/mage/cards/b/BindingGrasp.java @@ -36,9 +36,9 @@ public final class BindingGrasp extends CardImpl { // At the beginning of your upkeep, sacrifice Binding Grasp unless you pay {1}{U}. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{1}{U}")))); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); // Enchanted creature gets +0/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(0, 1, Duration.WhileOnBattlefield))); } private BindingGrasp(final BindingGrasp card) { diff --git a/Mage.Sets/src/mage/cards/b/BitingTether.java b/Mage.Sets/src/mage/cards/b/BitingTether.java index d8b1434d909..369e494ae00 100644 --- a/Mage.Sets/src/mage/cards/b/BitingTether.java +++ b/Mage.Sets/src/mage/cards/b/BitingTether.java @@ -35,7 +35,7 @@ public final class BitingTether extends CardImpl { this.addAbility(ability); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); // At the beginning of your upkeep, put a -1/-1 counter on enchanted creature. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersAttachedEffect(CounterType.M1M1.createInstance(), "enchanted creature"))); diff --git a/Mage.Sets/src/mage/cards/b/BitterFeud.java b/Mage.Sets/src/mage/cards/b/BitterFeud.java index 76efa46184f..312b52ad319 100644 --- a/Mage.Sets/src/mage/cards/b/BitterFeud.java +++ b/Mage.Sets/src/mage/cards/b/BitterFeud.java @@ -36,7 +36,7 @@ public final class BitterFeud extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new BitterFeudEntersBattlefieldEffect())); // If a source controlled by one of the chosen players would deal damage to the other chosen player or a permanent that player controls, that source deals double that damage to that player or permanent instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BitterFeudEffect())); + this.addAbility(new SimpleStaticAbility(new BitterFeudEffect())); } private BitterFeud(final BitterFeud card) { diff --git a/Mage.Sets/src/mage/cards/b/BlackCarriage.java b/Mage.Sets/src/mage/cards/b/BlackCarriage.java index 5504f662fd5..78d9afde558 100644 --- a/Mage.Sets/src/mage/cards/b/BlackCarriage.java +++ b/Mage.Sets/src/mage/cards/b/BlackCarriage.java @@ -35,7 +35,7 @@ public final class BlackCarriage extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Black Carriage doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // Sacrifice a creature: Untap Black Carriage. Activate this ability only during your upkeep. this.addAbility(new ConditionalActivatedAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/b/BlackScarab.java b/Mage.Sets/src/mage/cards/b/BlackScarab.java index ad89a47bd87..63664b5eaa1 100644 --- a/Mage.Sets/src/mage/cards/b/BlackScarab.java +++ b/Mage.Sets/src/mage/cards/b/BlackScarab.java @@ -48,11 +48,11 @@ public final class BlackScarab extends CardImpl { // Enchanted creature can't be blocked by black creatures. Effect effect = new CantBeBlockedByCreaturesAttachedEffect(Duration.WhileOnBattlefield, filter, AttachmentType.AURA); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); this.addAbility(ability); // Enchanted creature gets +2/+2 as long as an opponent controls a black permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield), new OpponentControlsPermanentCondition(filter2), "Enchanted creature gets +2/+2 as long as an opponent controls a black permanent"))); diff --git a/Mage.Sets/src/mage/cards/b/BlackbladeReforged.java b/Mage.Sets/src/mage/cards/b/BlackbladeReforged.java index 7d6ad2c793e..4cf85be7bfe 100644 --- a/Mage.Sets/src/mage/cards/b/BlackbladeReforged.java +++ b/Mage.Sets/src/mage/cards/b/BlackbladeReforged.java @@ -36,7 +36,7 @@ public final class BlackbladeReforged extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+1 for each land you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(count, count)).addHint(new ValueHint("Lands you control", count))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(count, count)).addHint(new ValueHint("Lands you control", count))); // Equip legendary creature (3) this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3), new TargetControlledCreaturePermanent(filter), false)); diff --git a/Mage.Sets/src/mage/cards/b/BladeSplicer.java b/Mage.Sets/src/mage/cards/b/BladeSplicer.java index a6290b2378e..63c117c3057 100644 --- a/Mage.Sets/src/mage/cards/b/BladeSplicer.java +++ b/Mage.Sets/src/mage/cards/b/BladeSplicer.java @@ -38,7 +38,7 @@ public final class BladeSplicer extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new PhyrexianGolemToken()))); // Golem creatures you control have first strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter))); } private BladeSplicer(final BladeSplicer card) { diff --git a/Mage.Sets/src/mage/cards/b/BladegraftAspirant.java b/Mage.Sets/src/mage/cards/b/BladegraftAspirant.java index 49dbd0104d0..0bbc3ff48e5 100644 --- a/Mage.Sets/src/mage/cards/b/BladegraftAspirant.java +++ b/Mage.Sets/src/mage/cards/b/BladegraftAspirant.java @@ -42,7 +42,7 @@ public final class BladegraftAspirant extends CardImpl { this.addAbility(new MenaceAbility(false)); // Equipment spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); // Activated abilities of Equipment you control that target Bladegraft Aspirant cost {1} less to activate. diff --git a/Mage.Sets/src/mage/cards/b/BladeholdWarWhip.java b/Mage.Sets/src/mage/cards/b/BladeholdWarWhip.java index 9705acf5960..a3c22682573 100644 --- a/Mage.Sets/src/mage/cards/b/BladeholdWarWhip.java +++ b/Mage.Sets/src/mage/cards/b/BladeholdWarWhip.java @@ -39,7 +39,7 @@ public final class BladeholdWarWhip extends CardImpl { this.addAbility(ability); // Equipped creature has double strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DoubleStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(DoubleStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); // Equip {3}{R}{W} this.addAbility(new EquipAbility(Outcome.BoostCreature, new ManaCostsImpl<>("{3}{R}{W}"), false)); diff --git a/Mage.Sets/src/mage/cards/b/BladewingsThrall.java b/Mage.Sets/src/mage/cards/b/BladewingsThrall.java index fef8d468180..2d650fcfc82 100644 --- a/Mage.Sets/src/mage/cards/b/BladewingsThrall.java +++ b/Mage.Sets/src/mage/cards/b/BladewingsThrall.java @@ -33,7 +33,7 @@ public final class BladewingsThrall extends CardImpl { this.toughness = new MageInt(3); // Bladewing's Thrall has flying as long as you control a Dragon. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(new FilterControlledPermanent(SubType.DRAGON, "a Dragon")), RULE))); diff --git a/Mage.Sets/src/mage/cards/b/BlanchwoodArmor.java b/Mage.Sets/src/mage/cards/b/BlanchwoodArmor.java index 9927bb684b3..00eabb0939a 100644 --- a/Mage.Sets/src/mage/cards/b/BlanchwoodArmor.java +++ b/Mage.Sets/src/mage/cards/b/BlanchwoodArmor.java @@ -36,7 +36,7 @@ public final class BlanchwoodArmor extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(new PermanentsOnBattlefieldCount(filter), new PermanentsOnBattlefieldCount(filter), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(new PermanentsOnBattlefieldCount(filter), new PermanentsOnBattlefieldCount(filter), Duration.WhileOnBattlefield))); } private BlanchwoodArmor(final BlanchwoodArmor card) { diff --git a/Mage.Sets/src/mage/cards/b/BlazethornScarecrow.java b/Mage.Sets/src/mage/cards/b/BlazethornScarecrow.java index 1d3f1af3519..6ab3136bba9 100644 --- a/Mage.Sets/src/mage/cards/b/BlazethornScarecrow.java +++ b/Mage.Sets/src/mage/cards/b/BlazethornScarecrow.java @@ -44,11 +44,11 @@ public final class BlazethornScarecrow extends CardImpl { // Blazethorn Scarecrow has haste as long as you control a red creature. ContinuousEffect effect = new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), rule))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(effect, new PermanentsOnTheBattlefieldCondition(filter), rule))); // Blazethorn Scarecrow has wither as long as you control a green creature. ContinuousEffect effect2 = new GainAbilitySourceEffect(WitherAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect2, new PermanentsOnTheBattlefieldCondition(filter2), rule2))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(effect2, new PermanentsOnTheBattlefieldCondition(filter2), rule2))); } diff --git a/Mage.Sets/src/mage/cards/b/BlazingArchon.java b/Mage.Sets/src/mage/cards/b/BlazingArchon.java index fd1d14f6471..da8c89e24f9 100644 --- a/Mage.Sets/src/mage/cards/b/BlazingArchon.java +++ b/Mage.Sets/src/mage/cards/b/BlazingArchon.java @@ -29,7 +29,7 @@ public final class BlazingArchon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Creatures can't attack you. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackYouAllEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CantAttackYouAllEffect(Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/b/BlessedOrator.java b/Mage.Sets/src/mage/cards/b/BlessedOrator.java index 7340bba3eb2..afbb46b2a05 100644 --- a/Mage.Sets/src/mage/cards/b/BlessedOrator.java +++ b/Mage.Sets/src/mage/cards/b/BlessedOrator.java @@ -27,7 +27,7 @@ public final class BlessedOrator extends CardImpl { this.toughness = new MageInt(4); // Other creatures you control get +0/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, true))); } private BlessedOrator(final BlessedOrator card) { diff --git a/Mage.Sets/src/mage/cards/b/BlessingOfTheNephilim.java b/Mage.Sets/src/mage/cards/b/BlessingOfTheNephilim.java index 14244bcea16..689320209fb 100644 --- a/Mage.Sets/src/mage/cards/b/BlessingOfTheNephilim.java +++ b/Mage.Sets/src/mage/cards/b/BlessingOfTheNephilim.java @@ -37,7 +37,7 @@ public final class BlessingOfTheNephilim extends CardImpl { // Enchanted creature gets +1/+1 for each of its colors. DynamicValue numberOfColors = new EnchantedCreatureColorsCount(); Effect effect = new BoostEnchantedEffect(numberOfColors, numberOfColors, Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private BlessingOfTheNephilim(final BlessingOfTheNephilim card) { diff --git a/Mage.Sets/src/mage/cards/b/BlindWorship.java b/Mage.Sets/src/mage/cards/b/BlindWorship.java index 55566116726..063fc6b0282 100644 --- a/Mage.Sets/src/mage/cards/b/BlindWorship.java +++ b/Mage.Sets/src/mage/cards/b/BlindWorship.java @@ -39,7 +39,7 @@ public final class BlindWorship extends CardImpl { Ability attachedAbility = new AttacksTriggeredAbility(new BoostControlledEffect(SourcePermanentPowerValue.NOT_NEGATIVE, SourcePermanentPowerValue.NOT_NEGATIVE, Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURE, true), false); Effect gainAbilityEffect = new GainAbilityAttachedEffect(attachedAbility, AttachmentType.AURA); gainAbilityEffect.setText("Enchanted creature has \"Whenever this creature attacks, each other creature you control gets +X/+X until end of turn, where X is this creature's power\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, gainAbilityEffect)); + this.addAbility(new SimpleStaticAbility(gainAbilityEffect)); } diff --git a/Mage.Sets/src/mage/cards/b/BloodFunnel.java b/Mage.Sets/src/mage/cards/b/BloodFunnel.java index 779652bbb54..1dd735916a9 100644 --- a/Mage.Sets/src/mage/cards/b/BloodFunnel.java +++ b/Mage.Sets/src/mage/cards/b/BloodFunnel.java @@ -32,7 +32,7 @@ public final class BloodFunnel extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}"); // Noncreature spells you cast cost {2} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 2))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 2))); // Whenever you cast a noncreature spell, counter that spell unless you sacrifice a creature. Effect effect = new CounterUnlessPaysEffect(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); diff --git a/Mage.Sets/src/mage/cards/b/BloodMoon.java b/Mage.Sets/src/mage/cards/b/BloodMoon.java index 2a8b6ee791f..40b3f9a2b23 100644 --- a/Mage.Sets/src/mage/cards/b/BloodMoon.java +++ b/Mage.Sets/src/mage/cards/b/BloodMoon.java @@ -23,7 +23,7 @@ public final class BloodMoon extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); // Nonbasic lands are Mountains. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BloodMoonEffect())); + this.addAbility(new SimpleStaticAbility(new BloodMoonEffect())); } private BloodMoon(final BloodMoon card) { diff --git a/Mage.Sets/src/mage/cards/b/BloodScrivener.java b/Mage.Sets/src/mage/cards/b/BloodScrivener.java index d90ffecad16..3518b122750 100644 --- a/Mage.Sets/src/mage/cards/b/BloodScrivener.java +++ b/Mage.Sets/src/mage/cards/b/BloodScrivener.java @@ -30,7 +30,7 @@ public final class BloodScrivener extends CardImpl { this.toughness = new MageInt(1); // If you would draw a card while you have no cards in hand, instead draw two cards and lose 1 life. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BloodScrivenerReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new BloodScrivenerReplacementEffect())); } diff --git a/Mage.Sets/src/mage/cards/b/BloodSun.java b/Mage.Sets/src/mage/cards/b/BloodSun.java index aabd79a4215..57c3b169d85 100644 --- a/Mage.Sets/src/mage/cards/b/BloodSun.java +++ b/Mage.Sets/src/mage/cards/b/BloodSun.java @@ -30,7 +30,7 @@ public final class BloodSun extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); // All lands lose all abilities except mana abilities. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BloodSunEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BloodSunEffect(Duration.WhileOnBattlefield))); } private BloodSun(final BloodSun card) { diff --git a/Mage.Sets/src/mage/cards/b/BloodcrazedGoblin.java b/Mage.Sets/src/mage/cards/b/BloodcrazedGoblin.java index e98a69f885d..3a056fc56fe 100644 --- a/Mage.Sets/src/mage/cards/b/BloodcrazedGoblin.java +++ b/Mage.Sets/src/mage/cards/b/BloodcrazedGoblin.java @@ -29,7 +29,7 @@ public final class BloodcrazedGoblin extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BloodcrazedGoblinEffect())); + this.addAbility(new SimpleStaticAbility(new BloodcrazedGoblinEffect())); } private BloodcrazedGoblin(final BloodcrazedGoblin card) { diff --git a/Mage.Sets/src/mage/cards/b/BloodforgedBattleAxe.java b/Mage.Sets/src/mage/cards/b/BloodforgedBattleAxe.java index d50be0e4f9f..7be16f31ce1 100644 --- a/Mage.Sets/src/mage/cards/b/BloodforgedBattleAxe.java +++ b/Mage.Sets/src/mage/cards/b/BloodforgedBattleAxe.java @@ -32,7 +32,7 @@ public final class BloodforgedBattleAxe extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 0))); // Whenever equipped creature deals combat damage to a player, create a token that's a copy of Bloodforged War Axe. this.addAbility(new BloodforgedBattleAxeAbility()); diff --git a/Mage.Sets/src/mage/cards/b/Bloodghast.java b/Mage.Sets/src/mage/cards/b/Bloodghast.java index 2e832b9b9d8..b14159daa9e 100644 --- a/Mage.Sets/src/mage/cards/b/Bloodghast.java +++ b/Mage.Sets/src/mage/cards/b/Bloodghast.java @@ -32,7 +32,7 @@ public final class Bloodghast extends CardImpl { this.addAbility(new CantBlockAbility()); // Bloodghast has haste as long as an opponent has 10 or less life. ContinuousEffect effect = new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect, + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(effect, new LifeCompareCondition(TargetController.OPPONENT, ComparisonType.OR_LESS, 10), "{this} has haste as long as an opponent has 10 or less life"))); // Landfall — Whenever a land you control enters, you may return Bloodghast from your graveyard to the battlefield. diff --git a/Mage.Sets/src/mage/cards/b/BloodmarkMentor.java b/Mage.Sets/src/mage/cards/b/BloodmarkMentor.java index b2088e731a2..d4c66fc0db1 100644 --- a/Mage.Sets/src/mage/cards/b/BloodmarkMentor.java +++ b/Mage.Sets/src/mage/cards/b/BloodmarkMentor.java @@ -36,7 +36,7 @@ public final class BloodmarkMentor extends CardImpl { this.toughness = new MageInt(1); // Red creatures you control have first strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter))); } private BloodmarkMentor(final BloodmarkMentor card) { diff --git a/Mage.Sets/src/mage/cards/b/BloodsporeThrinax.java b/Mage.Sets/src/mage/cards/b/BloodsporeThrinax.java index 1a2bc183a64..6208b825a84 100644 --- a/Mage.Sets/src/mage/cards/b/BloodsporeThrinax.java +++ b/Mage.Sets/src/mage/cards/b/BloodsporeThrinax.java @@ -33,7 +33,7 @@ public final class BloodsporeThrinax extends CardImpl { this.addAbility(new DevourAbility(1)); // Each other creature you control enters the battlefield with an additional X +1/+1 counters on it, where X is the number of +1/+1 counters on Bloodspire Thrinax. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BloodsporeThrinaxEntersBattlefieldEffect())); + this.addAbility(new SimpleStaticAbility(new BloodsporeThrinaxEntersBattlefieldEffect())); } private BloodsporeThrinax(final BloodsporeThrinax card) { diff --git a/Mage.Sets/src/mage/cards/b/BloodswornSteward.java b/Mage.Sets/src/mage/cards/b/BloodswornSteward.java index 9801b696564..0bcfa741380 100644 --- a/Mage.Sets/src/mage/cards/b/BloodswornSteward.java +++ b/Mage.Sets/src/mage/cards/b/BloodswornSteward.java @@ -40,7 +40,7 @@ public final class BloodswornSteward extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Commander creatures you control get +2/+2 and have haste. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter)); + Ability ability = new SimpleStaticAbility(new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter)); Effect effect = new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter); effect.setText("and have haste"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/b/BlueScarab.java b/Mage.Sets/src/mage/cards/b/BlueScarab.java index 97f8f587032..72c77add772 100644 --- a/Mage.Sets/src/mage/cards/b/BlueScarab.java +++ b/Mage.Sets/src/mage/cards/b/BlueScarab.java @@ -48,11 +48,11 @@ public final class BlueScarab extends CardImpl { // Enchanted creature can't be blocked by blue creatures. Effect effect = new CantBeBlockedByCreaturesAttachedEffect(Duration.WhileOnBattlefield, filter, AttachmentType.AURA); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); this.addAbility(ability); // Enchanted creature gets +2/+2 as long as an opponent controls a blue permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield), new OpponentControlsPermanentCondition(filter2), "Enchanted creature gets +2/+2 as long as an opponent controls a blue permanent"))); diff --git a/Mage.Sets/src/mage/cards/b/BlurSliver.java b/Mage.Sets/src/mage/cards/b/BlurSliver.java index 6ce764dfcec..c795ac4d602 100644 --- a/Mage.Sets/src/mage/cards/b/BlurSliver.java +++ b/Mage.Sets/src/mage/cards/b/BlurSliver.java @@ -28,7 +28,7 @@ public final class BlurSliver extends CardImpl { this.toughness = new MageInt(2); // Sliver creatures you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent(SubType.SLIVER, "Sliver creatures you control")))); diff --git a/Mage.Sets/src/mage/cards/b/BoarUmbra.java b/Mage.Sets/src/mage/cards/b/BoarUmbra.java index 3c77f3e7a16..d4ee1a2319b 100644 --- a/Mage.Sets/src/mage/cards/b/BoarUmbra.java +++ b/Mage.Sets/src/mage/cards/b/BoarUmbra.java @@ -33,7 +33,7 @@ public final class BoarUmbra extends CardImpl { this.addAbility(ability); // Enchanted creature gets +3/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); // Umbra armor this.addAbility(new UmbraArmorAbility()); diff --git a/Mage.Sets/src/mage/cards/b/BoartuskLiege.java b/Mage.Sets/src/mage/cards/b/BoartuskLiege.java index d0dbca04bba..f2e100d061e 100644 --- a/Mage.Sets/src/mage/cards/b/BoartuskLiege.java +++ b/Mage.Sets/src/mage/cards/b/BoartuskLiege.java @@ -39,9 +39,9 @@ public final class BoartuskLiege extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Other red creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterRed, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterRed, true))); // Other green creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterGreen, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterGreen, true))); } private BoartuskLiege(final BoartuskLiege card) { diff --git a/Mage.Sets/src/mage/cards/b/BogSerpent.java b/Mage.Sets/src/mage/cards/b/BogSerpent.java index ea66f12f86e..e56063147da 100644 --- a/Mage.Sets/src/mage/cards/b/BogSerpent.java +++ b/Mage.Sets/src/mage/cards/b/BogSerpent.java @@ -28,7 +28,7 @@ public final class BogSerpent extends CardImpl { this.toughness = new MageInt(5); // Bog Serpent can't attack unless defending player controls a Swamp. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.SWAMP, "a Swamp")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.SWAMP, "a Swamp")))); // When you control no Swamps, sacrifice Bog Serpent. this.addAbility(new ControlsPermanentsControllerTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/b/BoggartSpriteChaser.java b/Mage.Sets/src/mage/cards/b/BoggartSpriteChaser.java index adcb2533f6a..e4208cec87b 100644 --- a/Mage.Sets/src/mage/cards/b/BoggartSpriteChaser.java +++ b/Mage.Sets/src/mage/cards/b/BoggartSpriteChaser.java @@ -36,7 +36,7 @@ public final class BoggartSpriteChaser extends CardImpl { FilterPermanent filter = new FilterPermanent(SubType.FAERIE, "Faerie"); Effect effect = new BoostSourceWhileControlsEffect(filter, 1, 1); effect.setText("As long as you control a Faerie, {this} gets +1/+1"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); ability.addEffect(new ConditionalContinuousEffect( new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "and has flying")); diff --git a/Mage.Sets/src/mage/cards/b/BondsOfQuicksilver.java b/Mage.Sets/src/mage/cards/b/BondsOfQuicksilver.java index 7e8701b5dba..50abbf96a79 100644 --- a/Mage.Sets/src/mage/cards/b/BondsOfQuicksilver.java +++ b/Mage.Sets/src/mage/cards/b/BondsOfQuicksilver.java @@ -40,7 +40,7 @@ public final class BondsOfQuicksilver extends CardImpl { this.addAbility(ability); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); } diff --git a/Mage.Sets/src/mage/cards/b/BoneSaw.java b/Mage.Sets/src/mage/cards/b/BoneSaw.java index 7e873c41178..6fc407aeed3 100644 --- a/Mage.Sets/src/mage/cards/b/BoneSaw.java +++ b/Mage.Sets/src/mage/cards/b/BoneSaw.java @@ -23,7 +23,7 @@ public final class BoneSaw extends CardImpl { public BoneSaw(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{0}"); this.subtype.add(SubType.EQUIPMENT); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 0))); this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1))); } diff --git a/Mage.Sets/src/mage/cards/b/Bonesplitter.java b/Mage.Sets/src/mage/cards/b/Bonesplitter.java index 6069f3f37f9..8ba756d6fc6 100644 --- a/Mage.Sets/src/mage/cards/b/Bonesplitter.java +++ b/Mage.Sets/src/mage/cards/b/Bonesplitter.java @@ -23,7 +23,7 @@ public final class Bonesplitter extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 0))); // Equip {1} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1), false)); diff --git a/Mage.Sets/src/mage/cards/b/BontusMonument.java b/Mage.Sets/src/mage/cards/b/BontusMonument.java index bcf823b7e54..5f707a24b1c 100644 --- a/Mage.Sets/src/mage/cards/b/BontusMonument.java +++ b/Mage.Sets/src/mage/cards/b/BontusMonument.java @@ -38,7 +38,7 @@ public final class BontusMonument extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // Black creature spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); // Whenever you cast a creature spell, each opponent loses 1 life and you gain 1 life. Ability ability = new SpellCastControllerTriggeredAbility(new LoseLifeOpponentsEffect(1), StaticFilters.FILTER_SPELL_A_CREATURE, false); diff --git a/Mage.Sets/src/mage/cards/b/BoonOfEmrakul.java b/Mage.Sets/src/mage/cards/b/BoonOfEmrakul.java index e0a36bebe42..a62a9baec8f 100644 --- a/Mage.Sets/src/mage/cards/b/BoonOfEmrakul.java +++ b/Mage.Sets/src/mage/cards/b/BoonOfEmrakul.java @@ -31,7 +31,7 @@ public final class BoonOfEmrakul extends CardImpl { this.addAbility(ability); // Enchanted creature gets +3/-3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, -3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(3, -3, Duration.WhileOnBattlefield))); } private BoonOfEmrakul(final BoonOfEmrakul card) { diff --git a/Mage.Sets/src/mage/cards/b/BoonReflection.java b/Mage.Sets/src/mage/cards/b/BoonReflection.java index 9e963f0bcbe..b377bebe77a 100644 --- a/Mage.Sets/src/mage/cards/b/BoonReflection.java +++ b/Mage.Sets/src/mage/cards/b/BoonReflection.java @@ -24,7 +24,7 @@ public final class BoonReflection extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{W}"); // If you would gain life, you gain twice that much life instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoonReflectionEffect())); + this.addAbility(new SimpleStaticAbility(new BoonReflectionEffect())); } private BoonReflection(final BoonReflection card) { diff --git a/Mage.Sets/src/mage/cards/b/BoonSatyr.java b/Mage.Sets/src/mage/cards/b/BoonSatyr.java index 3c62ace58e8..c90ef65a50a 100644 --- a/Mage.Sets/src/mage/cards/b/BoonSatyr.java +++ b/Mage.Sets/src/mage/cards/b/BoonSatyr.java @@ -32,7 +32,7 @@ public final class BoonSatyr extends CardImpl { // Bestow {3}{G}{G} this.addAbility(new BestowAbility(this, "{3}{G}{G}")); // Enchanted creature gets +4/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(4,2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(4,2, Duration.WhileOnBattlefield))); } private BoonSatyr(final BoonSatyr card) { diff --git a/Mage.Sets/src/mage/cards/b/BoskBanneret.java b/Mage.Sets/src/mage/cards/b/BoskBanneret.java index bc5d0630125..1144dfe4fe9 100644 --- a/Mage.Sets/src/mage/cards/b/BoskBanneret.java +++ b/Mage.Sets/src/mage/cards/b/BoskBanneret.java @@ -35,7 +35,7 @@ public final class BoskBanneret extends CardImpl { this.toughness = new MageInt(3); // Treefolk spells and Shaman spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); } private BoskBanneret(final BoskBanneret card) { diff --git a/Mage.Sets/src/mage/cards/b/BouncingBeebles.java b/Mage.Sets/src/mage/cards/b/BouncingBeebles.java index 9e7d3ebec56..932de87ccf5 100644 --- a/Mage.Sets/src/mage/cards/b/BouncingBeebles.java +++ b/Mage.Sets/src/mage/cards/b/BouncingBeebles.java @@ -33,7 +33,7 @@ public final class BouncingBeebles extends CardImpl { new CantBeBlockedSourceEffect(), new DefendingPlayerControlsSourceAttackingCondition(new FilterArtifactPermanent())); effect.setText("{this} can't be blocked as long as defending player controls an artifact"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private BouncingBeebles(final BouncingBeebles card) { diff --git a/Mage.Sets/src/mage/cards/b/BoundInSilence.java b/Mage.Sets/src/mage/cards/b/BoundInSilence.java index edb7ec78b05..89effe1f65b 100644 --- a/Mage.Sets/src/mage/cards/b/BoundInSilence.java +++ b/Mage.Sets/src/mage/cards/b/BoundInSilence.java @@ -31,7 +31,7 @@ public final class BoundInSilence extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack or block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantAttackBlockAttachedEffect(AttachmentType.AURA))); } private BoundInSilence(final BoundInSilence card) { diff --git a/Mage.Sets/src/mage/cards/b/BountySpotter.java b/Mage.Sets/src/mage/cards/b/BountySpotter.java index d2818f63054..3345880dc9a 100644 --- a/Mage.Sets/src/mage/cards/b/BountySpotter.java +++ b/Mage.Sets/src/mage/cards/b/BountySpotter.java @@ -33,7 +33,7 @@ public final class BountySpotter extends CardImpl { this.toughness = new MageInt(2); // Bounty Spotter doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // {T}: Put a bounty counter on target creature an opponent controls. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.BOUNTY.createInstance()), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/b/BowerPassage.java b/Mage.Sets/src/mage/cards/b/BowerPassage.java index e6dc5bd216f..72df348c547 100644 --- a/Mage.Sets/src/mage/cards/b/BowerPassage.java +++ b/Mage.Sets/src/mage/cards/b/BowerPassage.java @@ -24,7 +24,7 @@ public final class BowerPassage extends CardImpl { // Creatures with flying can't block creatures you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BowerPassageEffect())); + this.addAbility(new SimpleStaticAbility(new BowerPassageEffect())); } private BowerPassage(final BowerPassage card) { diff --git a/Mage.Sets/src/mage/cards/b/Brainwash.java b/Mage.Sets/src/mage/cards/b/Brainwash.java index 8739d170403..2e73e6fab70 100644 --- a/Mage.Sets/src/mage/cards/b/Brainwash.java +++ b/Mage.Sets/src/mage/cards/b/Brainwash.java @@ -33,7 +33,7 @@ public final class Brainwash extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack unless its controller pays {3}. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessPaysAttachedEffect(new ManaCostsImpl<>("{3}"), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessPaysAttachedEffect(new ManaCostsImpl<>("{3}"), AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/b/BrandOfIllOmen.java b/Mage.Sets/src/mage/cards/b/BrandOfIllOmen.java index 9b13aba3bd4..5cf0a45a4d9 100644 --- a/Mage.Sets/src/mage/cards/b/BrandOfIllOmen.java +++ b/Mage.Sets/src/mage/cards/b/BrandOfIllOmen.java @@ -41,7 +41,7 @@ public final class BrandOfIllOmen extends CardImpl { this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{R}"))); // Enchanted creature's controller can't cast creature spells. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BrandOfIllOmenEffect())); + this.addAbility(new SimpleStaticAbility(new BrandOfIllOmenEffect())); } diff --git a/Mage.Sets/src/mage/cards/b/BrandedBrawlers.java b/Mage.Sets/src/mage/cards/b/BrandedBrawlers.java index 509eab88bc9..907970014ca 100644 --- a/Mage.Sets/src/mage/cards/b/BrandedBrawlers.java +++ b/Mage.Sets/src/mage/cards/b/BrandedBrawlers.java @@ -39,10 +39,10 @@ public final class BrandedBrawlers extends CardImpl { this.toughness = new MageInt(2); // Branded Brawlers can't attack if defending player controls an untapped land. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackIfDefenderControlsPermanent(filter))); + this.addAbility(new SimpleStaticAbility(new CantAttackIfDefenderControlsPermanent(filter))); // Branded Brawlers can't block if you control an untapped land. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BrandedBrawlersCantBlockEffect(filter))); + this.addAbility(new SimpleStaticAbility(new BrandedBrawlersCantBlockEffect(filter))); } private BrandedBrawlers(final BrandedBrawlers card) { diff --git a/Mage.Sets/src/mage/cards/b/BrassGnat.java b/Mage.Sets/src/mage/cards/b/BrassGnat.java index e953259c031..3e61dccac2f 100644 --- a/Mage.Sets/src/mage/cards/b/BrassGnat.java +++ b/Mage.Sets/src/mage/cards/b/BrassGnat.java @@ -31,7 +31,7 @@ public final class BrassGnat extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Brass Gnat doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // At the beginning of your upkeep, you may pay {1}. If you do, untap Brass Gnat. this.addAbility(new BeginningOfUpkeepTriggeredAbility( new DoIfCostPaid(new UntapSourceEffect(), new GenericManaCost(1)) diff --git a/Mage.Sets/src/mage/cards/b/BrassHerald.java b/Mage.Sets/src/mage/cards/b/BrassHerald.java index 4f5dd3c4766..440b934c16a 100644 --- a/Mage.Sets/src/mage/cards/b/BrassHerald.java +++ b/Mage.Sets/src/mage/cards/b/BrassHerald.java @@ -37,7 +37,7 @@ public final class BrassHerald extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new BrassHeraldEntersEffect())); // Creatures of the chosen type get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllOfChosenSubtypeEffect(1, 1, Duration.WhileOnBattlefield, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllOfChosenSubtypeEffect(1, 1, Duration.WhileOnBattlefield, false))); } private BrassHerald(final BrassHerald card) { diff --git a/Mage.Sets/src/mage/cards/b/BrassMan.java b/Mage.Sets/src/mage/cards/b/BrassMan.java index 5d625029a0d..5e56a966663 100644 --- a/Mage.Sets/src/mage/cards/b/BrassMan.java +++ b/Mage.Sets/src/mage/cards/b/BrassMan.java @@ -29,7 +29,7 @@ public final class BrassMan extends CardImpl { this.toughness = new MageInt(3); // Brass Man doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // At the beginning of your upkeep, you may pay {1}. If you do, untap Brass Man. this.addAbility(new BeginningOfUpkeepTriggeredAbility( new DoIfCostPaid(new UntapSourceEffect(), new GenericManaCost(1)) diff --git a/Mage.Sets/src/mage/cards/b/BrassclawOrcs.java b/Mage.Sets/src/mage/cards/b/BrassclawOrcs.java index c4f97ef7869..4a9f4ba04b8 100644 --- a/Mage.Sets/src/mage/cards/b/BrassclawOrcs.java +++ b/Mage.Sets/src/mage/cards/b/BrassclawOrcs.java @@ -33,7 +33,7 @@ public final class BrassclawOrcs extends CardImpl { this.toughness = new MageInt(2); // Brassclaw Orcs can't block creatures with power 2 or greater. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockCreaturesSourceEffect(filter))); + this.addAbility(new SimpleStaticAbility(new CantBlockCreaturesSourceEffect(filter))); } diff --git a/Mage.Sets/src/mage/cards/b/Bravado.java b/Mage.Sets/src/mage/cards/b/Bravado.java index 8b261c03a54..5d8114d786d 100644 --- a/Mage.Sets/src/mage/cards/b/Bravado.java +++ b/Mage.Sets/src/mage/cards/b/Bravado.java @@ -36,7 +36,7 @@ public final class Bravado extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1 for each other creature you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BravadoBoostEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new BravadoBoostEnchantedEffect())); } private Bravado(final Bravado card) { diff --git a/Mage.Sets/src/mage/cards/b/BraveTheSands.java b/Mage.Sets/src/mage/cards/b/BraveTheSands.java index 41427ab3a12..2bcc675c293 100644 --- a/Mage.Sets/src/mage/cards/b/BraveTheSands.java +++ b/Mage.Sets/src/mage/cards/b/BraveTheSands.java @@ -24,10 +24,10 @@ public final class BraveTheSands extends CardImpl { // Creatures you control have vigilance. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Creatures")))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Creatures")))); // Each creature you control can block an additional creature each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureAllEffect(1, new FilterControlledCreaturePermanent("Each creature you control"), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureAllEffect(1, new FilterControlledCreaturePermanent("Each creature you control"), Duration.WhileOnBattlefield))); } private BraveTheSands(final BraveTheSands card) { diff --git a/Mage.Sets/src/mage/cards/b/BreakerOfArmies.java b/Mage.Sets/src/mage/cards/b/BreakerOfArmies.java index ad007e88b77..f5826acee5c 100644 --- a/Mage.Sets/src/mage/cards/b/BreakerOfArmies.java +++ b/Mage.Sets/src/mage/cards/b/BreakerOfArmies.java @@ -25,7 +25,7 @@ public final class BreakerOfArmies extends CardImpl { this.toughness = new MageInt(8); // All creatures able to block Breaker of Armies do so. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAllSourceEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAllSourceEffect(Duration.WhileOnBattlefield))); } private BreakerOfArmies(final BreakerOfArmies card) { diff --git a/Mage.Sets/src/mage/cards/b/BreathOfDreams.java b/Mage.Sets/src/mage/cards/b/BreathOfDreams.java index b386cdcfe9a..14961993bd4 100644 --- a/Mage.Sets/src/mage/cards/b/BreathOfDreams.java +++ b/Mage.Sets/src/mage/cards/b/BreathOfDreams.java @@ -34,7 +34,7 @@ public final class BreathOfDreams extends CardImpl { this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{U}"))); // Green creatures have "Cumulative upkeep {1}." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}")), Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}")), Duration.WhileOnBattlefield, filter))); } private BreathOfDreams(final BreathOfDreams card) { diff --git a/Mage.Sets/src/mage/cards/b/BriarShield.java b/Mage.Sets/src/mage/cards/b/BriarShield.java index f5606220c67..d8b4743be75 100644 --- a/Mage.Sets/src/mage/cards/b/BriarShield.java +++ b/Mage.Sets/src/mage/cards/b/BriarShield.java @@ -32,7 +32,7 @@ public final class BriarShield extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); // Sacrifice Briar Shield: Enchanted creature gets +3/+3 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.EndOfTurn), new SacrificeSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/b/BriarberryCohort.java b/Mage.Sets/src/mage/cards/b/BriarberryCohort.java index edbe30cab86..37b06ae6e8d 100644 --- a/Mage.Sets/src/mage/cards/b/BriarberryCohort.java +++ b/Mage.Sets/src/mage/cards/b/BriarberryCohort.java @@ -51,7 +51,7 @@ public final class BriarberryCohort extends CardImpl { // Briarberry Cohort gets +1/+1 as long as you control another blue creature. Condition condition = new PermanentsOnTheBattlefieldCondition(filter); Effect effect = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), condition, rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/b/BrighthearthBanneret.java b/Mage.Sets/src/mage/cards/b/BrighthearthBanneret.java index 54c5fedb3ea..cb8a95ac6e6 100644 --- a/Mage.Sets/src/mage/cards/b/BrighthearthBanneret.java +++ b/Mage.Sets/src/mage/cards/b/BrighthearthBanneret.java @@ -36,7 +36,7 @@ public final class BrighthearthBanneret extends CardImpl { this.toughness = new MageInt(1); // Elemental spells and Warrior spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); // Reinforce 1-{1}{R} this.addAbility(new ReinforceAbility(1, new ManaCostsImpl<>("{1}{R}"))); diff --git a/Mage.Sets/src/mage/cards/b/BrilliantHalo.java b/Mage.Sets/src/mage/cards/b/BrilliantHalo.java index f814b252ada..0f04bab6c71 100644 --- a/Mage.Sets/src/mage/cards/b/BrilliantHalo.java +++ b/Mage.Sets/src/mage/cards/b/BrilliantHalo.java @@ -33,7 +33,7 @@ public final class BrilliantHalo extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield))); // When Brilliant Halo is put into a graveyard from the battlefield, return Brilliant Halo to its owner's hand. this.addAbility(new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new ReturnToHandSourceEffect())); } diff --git a/Mage.Sets/src/mage/cards/b/BristlingBoar.java b/Mage.Sets/src/mage/cards/b/BristlingBoar.java index b71ccf7d0b6..98fd0e503ab 100644 --- a/Mage.Sets/src/mage/cards/b/BristlingBoar.java +++ b/Mage.Sets/src/mage/cards/b/BristlingBoar.java @@ -24,7 +24,7 @@ public final class BristlingBoar extends CardImpl { this.toughness = new MageInt(3); // Bristling Boar can't be blocked by more than one creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByMoreThanOneSourceEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByMoreThanOneSourceEffect())); } private BristlingBoar(final BristlingBoar card) { diff --git a/Mage.Sets/src/mage/cards/b/Broodwarden.java b/Mage.Sets/src/mage/cards/b/Broodwarden.java index 50db1fe1bea..cadb69d1941 100644 --- a/Mage.Sets/src/mage/cards/b/Broodwarden.java +++ b/Mage.Sets/src/mage/cards/b/Broodwarden.java @@ -33,7 +33,7 @@ public final class Broodwarden extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); // Eldrazi Spawn creatures you control get +2/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(2, 1, Duration.WhileOnBattlefield, filter, false))); } private Broodwarden(final Broodwarden card) { diff --git a/Mage.Sets/src/mage/cards/b/BrudicladTelchorEngineer.java b/Mage.Sets/src/mage/cards/b/BrudicladTelchorEngineer.java index be87db6713d..eb39673f1a5 100644 --- a/Mage.Sets/src/mage/cards/b/BrudicladTelchorEngineer.java +++ b/Mage.Sets/src/mage/cards/b/BrudicladTelchorEngineer.java @@ -44,7 +44,7 @@ public final class BrudicladTelchorEngineer extends CardImpl { this.toughness = new MageInt(4); // Creature tokens you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); // At the beginning of combat on your turn, create a 2/1 blue Myr artifact creature token. Then you may choose a token you control. If you do, each other token you control becomes a copy of that token. this.addAbility(new BeginningOfCombatTriggeredAbility(new BrudicladTelchorEngineerEffect())); diff --git a/Mage.Sets/src/mage/cards/b/BrutalSuppression.java b/Mage.Sets/src/mage/cards/b/BrutalSuppression.java index 3410e5134ea..29baaf407d5 100644 --- a/Mage.Sets/src/mage/cards/b/BrutalSuppression.java +++ b/Mage.Sets/src/mage/cards/b/BrutalSuppression.java @@ -25,7 +25,7 @@ public final class BrutalSuppression extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{R}"); // Activated abilities of nontoken Rebels cost an additional "Sacrifice a land" to activate. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BrutalSuppressionAdditionalCostEffect())); + this.addAbility(new SimpleStaticAbility(new BrutalSuppressionAdditionalCostEffect())); } private BrutalSuppression(final BrutalSuppression card) { diff --git a/Mage.Sets/src/mage/cards/b/BubbleMatrix.java b/Mage.Sets/src/mage/cards/b/BubbleMatrix.java index 99ab139bf7a..8fd4a477445 100644 --- a/Mage.Sets/src/mage/cards/b/BubbleMatrix.java +++ b/Mage.Sets/src/mage/cards/b/BubbleMatrix.java @@ -20,7 +20,7 @@ public final class BubbleMatrix extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // Prevent all damage that would be dealt to creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventAllDamageToAllEffect(Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES))); + this.addAbility(new SimpleStaticAbility(new PreventAllDamageToAllEffect(Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES))); } private BubbleMatrix(final BubbleMatrix card) { diff --git a/Mage.Sets/src/mage/cards/b/BubbleSmuggler.java b/Mage.Sets/src/mage/cards/b/BubbleSmuggler.java index 7e305c24e69..6e921cba2c3 100644 --- a/Mage.Sets/src/mage/cards/b/BubbleSmuggler.java +++ b/Mage.Sets/src/mage/cards/b/BubbleSmuggler.java @@ -36,7 +36,7 @@ public final class BubbleSmuggler extends CardImpl { // As Bubble Smuggler is turned face up, put four +1/+1 counters on it. Effect effect = new AddCountersSourceEffect(CounterType.P1P1.createInstance(4)); effect.setText("put four +1/+1 counters on it"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new AsTurnedFaceUpEffect(effect, false)); + Ability ability = new SimpleStaticAbility(new AsTurnedFaceUpEffect(effect, false)); ability.setWorksFaceDown(true); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BubblingBeebles.java b/Mage.Sets/src/mage/cards/b/BubblingBeebles.java index 2a8fbef44b2..c7c99cf0287 100644 --- a/Mage.Sets/src/mage/cards/b/BubblingBeebles.java +++ b/Mage.Sets/src/mage/cards/b/BubblingBeebles.java @@ -33,7 +33,7 @@ public final class BubblingBeebles extends CardImpl { new CantBeBlockedSourceEffect(), new DefendingPlayerControlsSourceAttackingCondition(StaticFilters.FILTER_PERMANENT_ENCHANTMENT)); effect.setText("{this} can't be blocked as long as defending player controls an enchantment"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private BubblingBeebles(final BubblingBeebles card) { diff --git a/Mage.Sets/src/mage/cards/b/Buoyancy.java b/Mage.Sets/src/mage/cards/b/Buoyancy.java index 6b619cb403f..55b20dcdc29 100644 --- a/Mage.Sets/src/mage/cards/b/Buoyancy.java +++ b/Mage.Sets/src/mage/cards/b/Buoyancy.java @@ -37,7 +37,7 @@ public final class Buoyancy extends CardImpl { this.addAbility(ability); // Enchanted creature has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); } private Buoyancy(final Buoyancy card) { diff --git a/Mage.Sets/src/mage/cards/b/BurningAnger.java b/Mage.Sets/src/mage/cards/b/BurningAnger.java index 8215745859e..bb80db5080c 100644 --- a/Mage.Sets/src/mage/cards/b/BurningAnger.java +++ b/Mage.Sets/src/mage/cards/b/BurningAnger.java @@ -43,7 +43,7 @@ public final class BurningAnger extends CardImpl { effect.setText("{this} deals damage equal to its power to any target"); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); gainedAbility.addTarget(new TargetAnyTarget()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{T}: This creature deals damage equal to its power to any target.\""))); } diff --git a/Mage.Sets/src/mage/cards/b/ButchersCleaver.java b/Mage.Sets/src/mage/cards/b/ButchersCleaver.java index 4a04642d72c..edfd66a7031 100644 --- a/Mage.Sets/src/mage/cards/b/ButchersCleaver.java +++ b/Mage.Sets/src/mage/cards/b/ButchersCleaver.java @@ -27,7 +27,7 @@ public final class ButchersCleaver extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +3/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(3, 0))); // As long as equipped creature is a Human, it has lifelink. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,