diff --git a/Mage.Sets/src/mage/cards/e/EarnestFellowship.java b/Mage.Sets/src/mage/cards/e/EarnestFellowship.java index 5e4cc1501cf..02a8f0e676b 100644 --- a/Mage.Sets/src/mage/cards/e/EarnestFellowship.java +++ b/Mage.Sets/src/mage/cards/e/EarnestFellowship.java @@ -30,7 +30,7 @@ public final class EarnestFellowship extends CardImpl { // Each creature has protection from its colors. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EarnestFellowshipEffect())); + this.addAbility(new SimpleStaticAbility(new EarnestFellowshipEffect())); } private EarnestFellowship(final EarnestFellowship card) { diff --git a/Mage.Sets/src/mage/cards/e/EarthServant.java b/Mage.Sets/src/mage/cards/e/EarthServant.java index 12d90a47432..86b789ac2d5 100644 --- a/Mage.Sets/src/mage/cards/e/EarthServant.java +++ b/Mage.Sets/src/mage/cards/e/EarthServant.java @@ -32,7 +32,7 @@ public final class EarthServant extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter, 0), + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter, 0), new PermanentsOnBattlefieldCount(filter, 1), Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/e/EarthSurge.java b/Mage.Sets/src/mage/cards/e/EarthSurge.java index d5b03d78177..7e45dc5a39f 100644 --- a/Mage.Sets/src/mage/cards/e/EarthSurge.java +++ b/Mage.Sets/src/mage/cards/e/EarthSurge.java @@ -30,7 +30,7 @@ public final class EarthSurge extends CardImpl { //Each land gets +2/+2 as long as it's a creature. Effect effect = new BoostAllEffect(2, 2, Duration.WhileOnBattlefield, filter, true); effect.setText("Each land gets +2/+2 as long as it\'s a creature"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private EarthSurge(final EarthSurge card) { diff --git a/Mage.Sets/src/mage/cards/e/EaterOfVirtue.java b/Mage.Sets/src/mage/cards/e/EaterOfVirtue.java index 7b7b830edf0..fdc8088aa17 100644 --- a/Mage.Sets/src/mage/cards/e/EaterOfVirtue.java +++ b/Mage.Sets/src/mage/cards/e/EaterOfVirtue.java @@ -56,10 +56,10 @@ public final class EaterOfVirtue extends CardImpl { this.addAbility(new DiesAttachedTriggeredAbility(new EaterOfVirtueExileEffect(), "equipped creature", false, true, SetTargetPointer.CARD)); // 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))); // As long as a card exiled with Eater of Virtue has flying, equipped creature has flying. The same is true for first strike, double strike, deathtouch, haste, hexproof, indestructible, lifelink, menace, protection, reach, trample, and vigilance. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EaterOfVirtueGainAbilityAttachedEffect())); + this.addAbility(new SimpleStaticAbility(new EaterOfVirtueGainAbilityAttachedEffect())); // Equip {1} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(1), false)); diff --git a/Mage.Sets/src/mage/cards/e/EchoBaseCommando.java b/Mage.Sets/src/mage/cards/e/EchoBaseCommando.java index dec9d161deb..b1f0f605eac 100644 --- a/Mage.Sets/src/mage/cards/e/EchoBaseCommando.java +++ b/Mage.Sets/src/mage/cards/e/EchoBaseCommando.java @@ -40,7 +40,7 @@ public final class EchoBaseCommando extends CardImpl { this.addAbility(new ProtectionAbility(filter)); // Activated abilities of creatures your opponent controls cost {2} more to activate. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EchoBaseCommandoEffect())); + this.addAbility(new SimpleStaticAbility(new EchoBaseCommandoEffect())); } diff --git a/Mage.Sets/src/mage/cards/e/EchoCirclet.java b/Mage.Sets/src/mage/cards/e/EchoCirclet.java index a8765b7b7a0..eba9756b02b 100644 --- a/Mage.Sets/src/mage/cards/e/EchoCirclet.java +++ b/Mage.Sets/src/mage/cards/e/EchoCirclet.java @@ -25,7 +25,7 @@ public final class EchoCirclet extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature can block an additional creature each combat. (static abilit of equipment, no ability that will be gained to equiped creature!) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EchoCircletEffect())); + this.addAbility(new SimpleStaticAbility(new EchoCircletEffect())); // Equip {1} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(1), new TargetControlledCreaturePermanent(), false)); diff --git a/Mage.Sets/src/mage/cards/e/EdgeOfTheDivinity.java b/Mage.Sets/src/mage/cards/e/EdgeOfTheDivinity.java index 013be003915..9d1a0ab9be0 100644 --- a/Mage.Sets/src/mage/cards/e/EdgeOfTheDivinity.java +++ b/Mage.Sets/src/mage/cards/e/EdgeOfTheDivinity.java @@ -37,10 +37,10 @@ public final class EdgeOfTheDivinity extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As long as enchanted creature is white, it gets +1/+2. - SimpleStaticAbility whiteAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 2), new EnchantedCreatureColorCondition(ObjectColor.WHITE), "As long as enchanted creature is white, it gets +1/+2")); + SimpleStaticAbility whiteAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 2), new EnchantedCreatureColorCondition(ObjectColor.WHITE), "As long as enchanted creature is white, it gets +1/+2")); this.addAbility(whiteAbility); // As long as enchanted creature is black, it gets +2/+1. - SimpleStaticAbility blackAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(2, 1), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "As long as enchanted creature is black, it gets +2/+1")); + SimpleStaticAbility blackAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEnchantedEffect(2, 1), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "As long as enchanted creature is black, it gets +2/+1")); this.addAbility(blackAbility); } diff --git a/Mage.Sets/src/mage/cards/e/Edgewalker.java b/Mage.Sets/src/mage/cards/e/Edgewalker.java index c29aca99390..8dc24078183 100644 --- a/Mage.Sets/src/mage/cards/e/Edgewalker.java +++ b/Mage.Sets/src/mage/cards/e/Edgewalker.java @@ -32,7 +32,7 @@ public final class Edgewalker extends CardImpl { this.toughness = new MageInt(2); // Cleric spells you cast cost {W}{B} less to cast. This effect reduces only the amount of colored mana you pay. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, new ManaCostsImpl<>("{W}{B}")))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, new ManaCostsImpl<>("{W}{B}")))); } private Edgewalker(final Edgewalker card) { diff --git a/Mage.Sets/src/mage/cards/e/EelUmbra.java b/Mage.Sets/src/mage/cards/e/EelUmbra.java index c3a45cac530..a568eb5eccd 100644 --- a/Mage.Sets/src/mage/cards/e/EelUmbra.java +++ b/Mage.Sets/src/mage/cards/e/EelUmbra.java @@ -40,7 +40,7 @@ public final class EelUmbra extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); // Umbra armor this.addAbility(new UmbraArmorAbility()); diff --git a/Mage.Sets/src/mage/cards/e/EidolonOfCountlessBattles.java b/Mage.Sets/src/mage/cards/e/EidolonOfCountlessBattles.java index 84d371d943d..c7ded67f660 100644 --- a/Mage.Sets/src/mage/cards/e/EidolonOfCountlessBattles.java +++ b/Mage.Sets/src/mage/cards/e/EidolonOfCountlessBattles.java @@ -45,7 +45,7 @@ public final class EidolonOfCountlessBattles extends CardImpl { PermanentsOnBattlefieldCount amount = new PermanentsOnBattlefieldCount(filter, 1); Effect effect = new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield); effect.setText("{this} and enchanted creature each get +1/+1 for each creature you control"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new BoostEnchantedEffect(amount, amount, Duration.WhileOnBattlefield); effect.setText("and +1/+1 for each Aura you control"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/e/EidolonOfRhetoric.java b/Mage.Sets/src/mage/cards/e/EidolonOfRhetoric.java index ee4bf3c653e..cd824e1e040 100644 --- a/Mage.Sets/src/mage/cards/e/EidolonOfRhetoric.java +++ b/Mage.Sets/src/mage/cards/e/EidolonOfRhetoric.java @@ -26,7 +26,7 @@ public final class EidolonOfRhetoric extends CardImpl { this.toughness = new MageInt(4); // Each player can't cast more than one spell each turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantCastMoreThanOneSpellEffect(TargetController.ANY))); + this.addAbility(new SimpleStaticAbility(new CantCastMoreThanOneSpellEffect(TargetController.ANY))); } private EidolonOfRhetoric(final EidolonOfRhetoric card) { diff --git a/Mage.Sets/src/mage/cards/e/ElaborateFirecannon.java b/Mage.Sets/src/mage/cards/e/ElaborateFirecannon.java index 335466a9809..f96d87e576c 100644 --- a/Mage.Sets/src/mage/cards/e/ElaborateFirecannon.java +++ b/Mage.Sets/src/mage/cards/e/ElaborateFirecannon.java @@ -29,7 +29,7 @@ public final class ElaborateFirecannon extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // Elaborate Firecannon doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // {4}, {T}: Elaborate Firecannon deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{4}")); diff --git a/Mage.Sets/src/mage/cards/e/EladamriLordOfLeaves.java b/Mage.Sets/src/mage/cards/e/EladamriLordOfLeaves.java index 5c6cc3a7874..14621d68615 100644 --- a/Mage.Sets/src/mage/cards/e/EladamriLordOfLeaves.java +++ b/Mage.Sets/src/mage/cards/e/EladamriLordOfLeaves.java @@ -35,8 +35,8 @@ public final class EladamriLordOfLeaves extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new ForestwalkAbility(), Duration.WhileOnBattlefield, filterCreatures, true))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, filterPermanents, true))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(new ForestwalkAbility(), Duration.WhileOnBattlefield, filterCreatures, true))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, filterPermanents, true))); } private EladamriLordOfLeaves(final EladamriLordOfLeaves card) { diff --git a/Mage.Sets/src/mage/cards/e/ElandUmbra.java b/Mage.Sets/src/mage/cards/e/ElandUmbra.java index 0f3b9d14a3c..9e2a3de7c05 100644 --- a/Mage.Sets/src/mage/cards/e/ElandUmbra.java +++ b/Mage.Sets/src/mage/cards/e/ElandUmbra.java @@ -36,7 +36,7 @@ public final class ElandUmbra extends CardImpl { this.addAbility(ability); // Enchanted creature gets +0/+4. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0, 4, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(0, 4, Duration.WhileOnBattlefield))); // Umbra armor this.addAbility(new UmbraArmorAbility()); diff --git a/Mage.Sets/src/mage/cards/e/ElbrusTheBindingBlade.java b/Mage.Sets/src/mage/cards/e/ElbrusTheBindingBlade.java index 46a39195b04..3b3e67f5c3b 100644 --- a/Mage.Sets/src/mage/cards/e/ElbrusTheBindingBlade.java +++ b/Mage.Sets/src/mage/cards/e/ElbrusTheBindingBlade.java @@ -35,7 +35,7 @@ public final class ElbrusTheBindingBlade extends CardImpl { this.addAbility(new TransformAbility()); // Equipped creature gets +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 0))); // When equipped creature deals combat damage to a player, unattach Elbrus, the Binding Blade, then transform it. this.addAbility(new DealsDamageToAPlayerAttachedTriggeredAbility(new ElbrusTheBindingBladeEffect(), "equipped", false)); // Equip {1} diff --git a/Mage.Sets/src/mage/cards/e/ElderscaleWurm.java b/Mage.Sets/src/mage/cards/e/ElderscaleWurm.java index 83f241238b9..c28f7b7a87b 100644 --- a/Mage.Sets/src/mage/cards/e/ElderscaleWurm.java +++ b/Mage.Sets/src/mage/cards/e/ElderscaleWurm.java @@ -39,7 +39,7 @@ public final class ElderscaleWurm extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new ElderscaleWurmSetLifeEffect(), false)); // As long as you have 7 or more life, damage that would reduce your life total to less than 7 reduces it to 7 instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ElderscaleWurmReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new ElderscaleWurmReplacementEffect())); } private ElderscaleWurm(final ElderscaleWurm card) { diff --git a/Mage.Sets/src/mage/cards/e/EldraziAggressor.java b/Mage.Sets/src/mage/cards/e/EldraziAggressor.java index f5ac7fec13c..2904f8c3b3f 100644 --- a/Mage.Sets/src/mage/cards/e/EldraziAggressor.java +++ b/Mage.Sets/src/mage/cards/e/EldraziAggressor.java @@ -45,7 +45,7 @@ public final class EldraziAggressor extends CardImpl { // Eldrazi Aggressor has haste as long as you control another colorless creature. Effect effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(HasteAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private EldraziAggressor(final EldraziAggressor card) { diff --git a/Mage.Sets/src/mage/cards/e/EldraziConscription.java b/Mage.Sets/src/mage/cards/e/EldraziConscription.java index 3f399afb241..800997d164c 100644 --- a/Mage.Sets/src/mage/cards/e/EldraziConscription.java +++ b/Mage.Sets/src/mage/cards/e/EldraziConscription.java @@ -37,7 +37,7 @@ public final class EldraziConscription extends CardImpl { this.addAbility(ability); // Enchanted creature gets +10/+10 and has trample and annihilator 2 - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(10, 10, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(10, 10, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA); effect.setText("and has trample"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/e/ElementalMastery.java b/Mage.Sets/src/mage/cards/e/ElementalMastery.java index 6fbfaa8898a..51a9ca43438 100644 --- a/Mage.Sets/src/mage/cards/e/ElementalMastery.java +++ b/Mage.Sets/src/mage/cards/e/ElementalMastery.java @@ -43,7 +43,7 @@ public final class ElementalMastery extends CardImpl { // Enchanted creature has "{tap}: create X 1/1 red Elemental creature tokens with haste, where X is this creature's power. Exile them at the beginning of the next end step." Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ElementalMasteryEffect(), new TapSourceCost()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability2, AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability2, AttachmentType.AURA))); } private ElementalMastery(final ElementalMastery card) { diff --git a/Mage.Sets/src/mage/cards/e/ElephantGrass.java b/Mage.Sets/src/mage/cards/e/ElephantGrass.java index 5df6c63dd45..903399da926 100644 --- a/Mage.Sets/src/mage/cards/e/ElephantGrass.java +++ b/Mage.Sets/src/mage/cards/e/ElephantGrass.java @@ -38,7 +38,7 @@ public final class ElephantGrass extends CardImpl { this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}"))); // Black creatures can't attack you. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackYouAllEffect(Duration.WhileOnBattlefield, filterBlack))); + this.addAbility(new SimpleStaticAbility(new CantAttackYouAllEffect(Duration.WhileOnBattlefield, filterBlack))); // Nonblack creatures can't attack you unless their controller pays {2} for each creature they control that's attacking you. this.addAbility(new SimpleStaticAbility( diff --git a/Mage.Sets/src/mage/cards/e/ElephantGuide.java b/Mage.Sets/src/mage/cards/e/ElephantGuide.java index 065aa17cf50..3019c843bab 100644 --- a/Mage.Sets/src/mage/cards/e/ElephantGuide.java +++ b/Mage.Sets/src/mage/cards/e/ElephantGuide.java @@ -39,7 +39,7 @@ public final class ElephantGuide 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))); // When enchanted creature dies, create a 3/3 green Elephant creature token. this.addAbility(new DiesAttachedTriggeredAbility(new CreateTokenEffect(new ElephantToken()),"enchanted creature")); } diff --git a/Mage.Sets/src/mage/cards/e/EleshNornGrandCenobite.java b/Mage.Sets/src/mage/cards/e/EleshNornGrandCenobite.java index b6c8493719e..e640ce0d677 100644 --- a/Mage.Sets/src/mage/cards/e/EleshNornGrandCenobite.java +++ b/Mage.Sets/src/mage/cards/e/EleshNornGrandCenobite.java @@ -35,10 +35,10 @@ public final class EleshNornGrandCenobite extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Other creatures you control get +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, true))); // Creatures your opponents control get -2/-2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostOpponentsEffect(-2, -2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostOpponentsEffect(-2, -2, Duration.WhileOnBattlefield))); } private EleshNornGrandCenobite(final EleshNornGrandCenobite card) { diff --git a/Mage.Sets/src/mage/cards/e/ElgaudShieldmate.java b/Mage.Sets/src/mage/cards/e/ElgaudShieldmate.java index dcde2f4946b..13b30b0d345 100644 --- a/Mage.Sets/src/mage/cards/e/ElgaudShieldmate.java +++ b/Mage.Sets/src/mage/cards/e/ElgaudShieldmate.java @@ -32,7 +32,7 @@ public final class ElgaudShieldmate extends CardImpl { this.addAbility(new SoulbondAbility()); // As long as Elgaud Shieldmate is paired with another creature, both creatures have hexproof. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(HexproofAbility.getInstance(), ruleText))); + this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(HexproofAbility.getInstance(), ruleText))); } private ElgaudShieldmate(final ElgaudShieldmate card) { diff --git a/Mage.Sets/src/mage/cards/e/ElugeTheShorelessSea.java b/Mage.Sets/src/mage/cards/e/ElugeTheShorelessSea.java index bfe5524a816..8b87b566f72 100644 --- a/Mage.Sets/src/mage/cards/e/ElugeTheShorelessSea.java +++ b/Mage.Sets/src/mage/cards/e/ElugeTheShorelessSea.java @@ -79,7 +79,7 @@ public final class ElugeTheShorelessSea extends CardImpl { // The first instant or sorcery spell you cast each turn costs {U} (or {1}) less to cast for each land you // control with a flood counter on it. Effect effect = new SpellsCostReductionControllerEffect(spellFilter, new ManaCostsImpl<>("{U}"), new PermanentsOnBattlefieldCount(floodLandFilter), true); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect), + this.addAbility(new SimpleStaticAbility(effect), new ElugeTheShorelessSeaWatcher()); } @@ -173,4 +173,4 @@ class ElugeTheShorelessSeaWatcher extends Watcher { public int getInstantOrSorcerySpellsCastThisTurn(UUID playerId) { return playerInstantOrSorcerySpells.getOrDefault(playerId, 0); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/e/ElvishBard.java b/Mage.Sets/src/mage/cards/e/ElvishBard.java index f84960b6dc2..2504dabc6bc 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishBard.java +++ b/Mage.Sets/src/mage/cards/e/ElvishBard.java @@ -27,7 +27,7 @@ public final class ElvishBard extends CardImpl { this.toughness = new MageInt(4); // All creatures able to block Elvish Bard do so. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAllSourceEffect())); + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAllSourceEffect())); } private ElvishBard(final ElvishBard card) { diff --git a/Mage.Sets/src/mage/cards/e/EmbalmersTools.java b/Mage.Sets/src/mage/cards/e/EmbalmersTools.java index f3b2b44504c..2db95b909a5 100644 --- a/Mage.Sets/src/mage/cards/e/EmbalmersTools.java +++ b/Mage.Sets/src/mage/cards/e/EmbalmersTools.java @@ -37,7 +37,7 @@ public final class EmbalmersTools extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // Activated abilities of creature cards in your graveyard cost {1} less to activate. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EmbalmersToolsEffect())); + this.addAbility(new SimpleStaticAbility(new EmbalmersToolsEffect())); // Tap an untapped Zombie you control: Target player puts the top card of their library into their graveyard. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(1), new TapTargetCost(new TargetControlledPermanent(filter))); diff --git a/Mage.Sets/src/mage/cards/e/EmbermawHellion.java b/Mage.Sets/src/mage/cards/e/EmbermawHellion.java index a7b0086f8d9..904d0889e12 100644 --- a/Mage.Sets/src/mage/cards/e/EmbermawHellion.java +++ b/Mage.Sets/src/mage/cards/e/EmbermawHellion.java @@ -36,7 +36,7 @@ public final class EmbermawHellion extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // If another red source you control would deal damage to a permanent or player, it deals that much damage plus 1 to that permanent or player instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EmbermawHellionEffect())); + this.addAbility(new SimpleStaticAbility(new EmbermawHellionEffect())); } private EmbermawHellion(final EmbermawHellion card) { diff --git a/Mage.Sets/src/mage/cards/e/EmbodimentOfFury.java b/Mage.Sets/src/mage/cards/e/EmbodimentOfFury.java index 038bfc178f1..97a42b03ab0 100644 --- a/Mage.Sets/src/mage/cards/e/EmbodimentOfFury.java +++ b/Mage.Sets/src/mage/cards/e/EmbodimentOfFury.java @@ -44,7 +44,7 @@ public final class EmbodimentOfFury extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Land creatures you control have trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filterLandCreatures))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filterLandCreatures))); // Landfall — Whenever a land you control enters, you may have target land you control // become a 3/3 Elemental creature with haste until end of turn. It's still a land. diff --git a/Mage.Sets/src/mage/cards/e/EmbodimentOfInsight.java b/Mage.Sets/src/mage/cards/e/EmbodimentOfInsight.java index 1c6c3678823..8003a5c302a 100644 --- a/Mage.Sets/src/mage/cards/e/EmbodimentOfInsight.java +++ b/Mage.Sets/src/mage/cards/e/EmbodimentOfInsight.java @@ -44,7 +44,7 @@ public final class EmbodimentOfInsight extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Land creatures you control have vigilance. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filterLandCreatures))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filterLandCreatures))); // Landfall — Whenever a land enters the battlefield under you control, you may have target land you control // become a 3/3 Elemental creature with haste until end of turn. It's still a land. diff --git a/Mage.Sets/src/mage/cards/e/EmbraalBruiser.java b/Mage.Sets/src/mage/cards/e/EmbraalBruiser.java index e8da1ad0391..17c99a944b5 100644 --- a/Mage.Sets/src/mage/cards/e/EmbraalBruiser.java +++ b/Mage.Sets/src/mage/cards/e/EmbraalBruiser.java @@ -33,7 +33,7 @@ public final class EmbraalBruiser extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); // Embraal Bruiser has menace as long as you control an artifact. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilitySourceEffect(new MenaceAbility()), new PermanentsOnTheBattlefieldCondition(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT), "{this} has menace as long as you control an artifact"))); diff --git a/Mage.Sets/src/mage/cards/e/EmeraldMedallion.java b/Mage.Sets/src/mage/cards/e/EmeraldMedallion.java index 6ffa4e00c12..73878468f3b 100644 --- a/Mage.Sets/src/mage/cards/e/EmeraldMedallion.java +++ b/Mage.Sets/src/mage/cards/e/EmeraldMedallion.java @@ -27,7 +27,7 @@ public final class EmeraldMedallion extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // Green 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 EmeraldMedallion(final EmeraldMedallion card) { diff --git a/Mage.Sets/src/mage/cards/e/EmpyrialArchangel.java b/Mage.Sets/src/mage/cards/e/EmpyrialArchangel.java index 58e387313cf..919ce9fa105 100644 --- a/Mage.Sets/src/mage/cards/e/EmpyrialArchangel.java +++ b/Mage.Sets/src/mage/cards/e/EmpyrialArchangel.java @@ -36,7 +36,7 @@ public final class EmpyrialArchangel extends CardImpl { this.addAbility(FlyingAbility.getInstance()); this.addAbility(ShroudAbility.getInstance()); // All damage that would be dealt to you is dealt to Empyrial Archangel instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EmpyrialArchangelEffect())); + this.addAbility(new SimpleStaticAbility(new EmpyrialArchangelEffect())); } private EmpyrialArchangel(final EmpyrialArchangel card) { diff --git a/Mage.Sets/src/mage/cards/e/EmpyrialArmor.java b/Mage.Sets/src/mage/cards/e/EmpyrialArmor.java index d6e425b0d64..8ddd1e03472 100644 --- a/Mage.Sets/src/mage/cards/e/EmpyrialArmor.java +++ b/Mage.Sets/src/mage/cards/e/EmpyrialArmor.java @@ -39,7 +39,7 @@ public final class EmpyrialArmor extends CardImpl { // Enchanted creature gets +1/+1 for each card in your hand. DynamicValue xValue = CardsInControllerHandCount.instance; - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(xValue, xValue, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(xValue, xValue, Duration.WhileOnBattlefield))); } private EmpyrialArmor(final EmpyrialArmor card) { diff --git a/Mage.Sets/src/mage/cards/e/EmpyrialPlate.java b/Mage.Sets/src/mage/cards/e/EmpyrialPlate.java index f4e231058f0..8437ac9dbed 100644 --- a/Mage.Sets/src/mage/cards/e/EmpyrialPlate.java +++ b/Mage.Sets/src/mage/cards/e/EmpyrialPlate.java @@ -25,7 +25,7 @@ public final class EmpyrialPlate extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+1 for each card in your hand. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(CardsInControllerHandCount.instance, CardsInControllerHandCount.instance))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(CardsInControllerHandCount.instance, CardsInControllerHandCount.instance))); // Equip {2} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2), false)); diff --git a/Mage.Sets/src/mage/cards/e/EncaseInIce.java b/Mage.Sets/src/mage/cards/e/EncaseInIce.java index 5c0d1dba1d2..9dc67bbfc9c 100644 --- a/Mage.Sets/src/mage/cards/e/EncaseInIce.java +++ b/Mage.Sets/src/mage/cards/e/EncaseInIce.java @@ -53,7 +53,7 @@ public final class EncaseInIce extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); } private EncaseInIce(final EncaseInIce card) { diff --git a/Mage.Sets/src/mage/cards/e/Encrust.java b/Mage.Sets/src/mage/cards/e/Encrust.java index e1e70836fae..a9311eb9027 100644 --- a/Mage.Sets/src/mage/cards/e/Encrust.java +++ b/Mage.Sets/src/mage/cards/e/Encrust.java @@ -37,7 +37,7 @@ public final class Encrust extends CardImpl { this.addAbility(ability); // Enchanted permanent doesn't untap during its controller's untap step and its activated abilities can't be activated. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect("permanent")); + ability = new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect("permanent")); Effect effect = new CantActivateAbilitiesAttachedEffect(); effect.setText("and its activated abilities can't be activated"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/e/Endbringer.java b/Mage.Sets/src/mage/cards/e/Endbringer.java index 6063b189670..1c1f5370270 100644 --- a/Mage.Sets/src/mage/cards/e/Endbringer.java +++ b/Mage.Sets/src/mage/cards/e/Endbringer.java @@ -34,7 +34,7 @@ public final class Endbringer extends CardImpl { this.toughness = new MageInt(5); // Untap Endbringer during each other player's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new UntapSourceDuringEachOtherPlayersUntapStepEffect())); + this.addAbility(new SimpleStaticAbility(new UntapSourceDuringEachOtherPlayersUntapStepEffect())); // {T}: Endbringer deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/e/EndlessScream.java b/Mage.Sets/src/mage/cards/e/EndlessScream.java index 7979a9eee57..828966eea25 100644 --- a/Mage.Sets/src/mage/cards/e/EndlessScream.java +++ b/Mage.Sets/src/mage/cards/e/EndlessScream.java @@ -41,7 +41,7 @@ public final class EndlessScream extends CardImpl { // Endless Scream enters the battlefield with X scream counters on it. this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.SCREAM.createInstance()))); // Enchanted creature gets +1/+0 for each scream counter on Endless Scream. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(new CountersSourceCount(CounterType.SCREAM), StaticValue.get(0), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(new CountersSourceCount(CounterType.SCREAM), StaticValue.get(0), Duration.WhileOnBattlefield))); } private EndlessScream(final EndlessScream card) { diff --git a/Mage.Sets/src/mage/cards/e/EndlessWhispers.java b/Mage.Sets/src/mage/cards/e/EndlessWhispers.java index 97c3403a9aa..4f4afcbfb45 100644 --- a/Mage.Sets/src/mage/cards/e/EndlessWhispers.java +++ b/Mage.Sets/src/mage/cards/e/EndlessWhispers.java @@ -41,7 +41,7 @@ public final class EndlessWhispers extends CardImpl { effect = new GainAbilityAllEffect(gainAbility, Duration.WhileOnBattlefield, new FilterCreaturePermanent("Each creature")); effect.setText("Each creature has \"When this creature dies, choose target opponent. That player puts this card from its owner's graveyard onto the battlefield under their control at the beginning of the next end step.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/e/EnergyField.java b/Mage.Sets/src/mage/cards/e/EnergyField.java index 2c5fba7fdfe..22955540fbd 100644 --- a/Mage.Sets/src/mage/cards/e/EnergyField.java +++ b/Mage.Sets/src/mage/cards/e/EnergyField.java @@ -30,7 +30,7 @@ public final class EnergyField extends CardImpl { // Prevent all damage that would be dealt to you by sources you don't control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EnergyFieldEffect())); + this.addAbility(new SimpleStaticAbility(new EnergyFieldEffect())); // When a card is put into your graveyard from anywhere, sacrifice Energy Field. this.addAbility(new PutCardIntoGraveFromAnywhereAllTriggeredAbility( new SacrificeSourceEffect(), false, TargetController.YOU)); diff --git a/Mage.Sets/src/mage/cards/e/Enfeeblement.java b/Mage.Sets/src/mage/cards/e/Enfeeblement.java index 77847a935fa..0075da1a1ad 100644 --- a/Mage.Sets/src/mage/cards/e/Enfeeblement.java +++ b/Mage.Sets/src/mage/cards/e/Enfeeblement.java @@ -31,7 +31,7 @@ public final class Enfeeblement extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-2, -2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-2, -2, Duration.WhileOnBattlefield))); } private Enfeeblement(final Enfeeblement card) { diff --git a/Mage.Sets/src/mage/cards/e/EngineeredPlague.java b/Mage.Sets/src/mage/cards/e/EngineeredPlague.java index 31700302610..586523aeea9 100644 --- a/Mage.Sets/src/mage/cards/e/EngineeredPlague.java +++ b/Mage.Sets/src/mage/cards/e/EngineeredPlague.java @@ -25,7 +25,7 @@ public final class EngineeredPlague extends CardImpl { // As Engineered Plague enters the battlefield, choose a creature type. this.addAbility(new AsEntersBattlefieldAbility(new ChooseCreatureTypeEffect(Outcome.UnboostCreature))); // All 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 EngineeredPlague(final EngineeredPlague card) { diff --git a/Mage.Sets/src/mage/cards/e/EnragingLicid.java b/Mage.Sets/src/mage/cards/e/EnragingLicid.java index b066ea98865..3e7145beb67 100644 --- a/Mage.Sets/src/mage/cards/e/EnragingLicid.java +++ b/Mage.Sets/src/mage/cards/e/EnragingLicid.java @@ -32,7 +32,7 @@ public final class EnragingLicid extends CardImpl { this.addAbility(new LicidAbility(new ColoredManaCost(ColoredManaSymbol.R), new ColoredManaCost(ColoredManaSymbol.R))); // Enchanted creature has haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA))); } private EnragingLicid(final EnragingLicid card) { diff --git a/Mage.Sets/src/mage/cards/e/Enslave.java b/Mage.Sets/src/mage/cards/e/Enslave.java index 72328da0b75..8d1d35635e0 100644 --- a/Mage.Sets/src/mage/cards/e/Enslave.java +++ b/Mage.Sets/src/mage/cards/e/Enslave.java @@ -35,7 +35,7 @@ public final class Enslave 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, enchanted creature deals 1 damage to its owner. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new EnslaveEffect())); diff --git a/Mage.Sets/src/mage/cards/e/EnsnaringBridge.java b/Mage.Sets/src/mage/cards/e/EnsnaringBridge.java index a5eb318b6a2..f8027a245a4 100644 --- a/Mage.Sets/src/mage/cards/e/EnsnaringBridge.java +++ b/Mage.Sets/src/mage/cards/e/EnsnaringBridge.java @@ -23,7 +23,7 @@ public final class EnsnaringBridge extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // Creatures with power greater than the number of cards in your hand can't attack. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EnsnaringBridgeRestrictionEffect())); + this.addAbility(new SimpleStaticAbility(new EnsnaringBridgeRestrictionEffect())); } private EnsnaringBridge(final EnsnaringBridge card) { diff --git a/Mage.Sets/src/mage/cards/e/EnsoulArtifact.java b/Mage.Sets/src/mage/cards/e/EnsoulArtifact.java index df75c675e74..5bf6fca06d3 100644 --- a/Mage.Sets/src/mage/cards/e/EnsoulArtifact.java +++ b/Mage.Sets/src/mage/cards/e/EnsoulArtifact.java @@ -37,7 +37,7 @@ public final class EnsoulArtifact extends CardImpl { this.addAbility(ability); // Enchanted artifact is a creature with base power and toughness 5/5 in addition to its other types. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BecomesCreatureAttachedEffect(new CreatureToken(5, 5), "Enchanted artifact is a creature with base power and toughness 5/5 in addition to its other types", Duration.WhileOnBattlefield) )); diff --git a/Mage.Sets/src/mage/cards/e/EnsouledScimitar.java b/Mage.Sets/src/mage/cards/e/EnsouledScimitar.java index 0f346edd43b..ea021fdc840 100644 --- a/Mage.Sets/src/mage/cards/e/EnsouledScimitar.java +++ b/Mage.Sets/src/mage/cards/e/EnsouledScimitar.java @@ -32,7 +32,7 @@ public final class EnsouledScimitar extends CardImpl { // {3}: Ensouled Scimitar becomes a 1/5 Spirit artifact creature with flying until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new EnsouledScimitarToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{3}"))); // Equipped creature gets +1/+5. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 5))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 5))); // Equip {2} this.addAbility(new EquipAbility(Outcome.BoostCreature, new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/e/Entangler.java b/Mage.Sets/src/mage/cards/e/Entangler.java index 516cdbfba83..f17560fc8e9 100644 --- a/Mage.Sets/src/mage/cards/e/Entangler.java +++ b/Mage.Sets/src/mage/cards/e/Entangler.java @@ -42,7 +42,7 @@ public final class Entangler extends CardImpl { SimpleStaticAbility blockAbility = new SimpleStaticAbility(Zone.BATTLEFIELD,new CanBlockAdditionalCreatureEffect(0)); Effect effect = new GainAbilityAttachedEffect(blockAbility,AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("Enchanted creature can block any number of creatures."); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private Entangler(final Entangler card) { diff --git a/Mage.Sets/src/mage/cards/e/EntanglingVines.java b/Mage.Sets/src/mage/cards/e/EntanglingVines.java index 63a1c0449b3..394f004d1bc 100644 --- a/Mage.Sets/src/mage/cards/e/EntanglingVines.java +++ b/Mage.Sets/src/mage/cards/e/EntanglingVines.java @@ -41,7 +41,7 @@ public final class EntanglingVines extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); } private EntanglingVines(final EntanglingVines card) { diff --git a/Mage.Sets/src/mage/cards/e/EntourageOfTrest.java b/Mage.Sets/src/mage/cards/e/EntourageOfTrest.java index bd84dde45c9..029225503d1 100644 --- a/Mage.Sets/src/mage/cards/e/EntourageOfTrest.java +++ b/Mage.Sets/src/mage/cards/e/EntourageOfTrest.java @@ -34,7 +34,7 @@ public final class EntourageOfTrest extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new BecomesMonarchSourceEffect()).addHint(MonarchHint.instance)); // Entourage of Trest can block an additional creature each combat as long as you're the monarch. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new CanBlockAdditionalCreatureEffect(1), MonarchIsSourceControllerCondition.instance, "{this} can block an additional creature each combat as long as you're the monarch"))); } diff --git a/Mage.Sets/src/mage/cards/e/EonHub.java b/Mage.Sets/src/mage/cards/e/EonHub.java index 387ac2cacab..f6eb35912f0 100644 --- a/Mage.Sets/src/mage/cards/e/EonHub.java +++ b/Mage.Sets/src/mage/cards/e/EonHub.java @@ -25,7 +25,7 @@ public final class EonHub extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); // Players skip their upkeep steps. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipUpkeepStepEffect())); + this.addAbility(new SimpleStaticAbility(new SkipUpkeepStepEffect())); } private EonHub(final EonHub card) { diff --git a/Mage.Sets/src/mage/cards/e/EpharasEnlightenment.java b/Mage.Sets/src/mage/cards/e/EpharasEnlightenment.java index 4424f68b590..641cf5972bb 100644 --- a/Mage.Sets/src/mage/cards/e/EpharasEnlightenment.java +++ b/Mage.Sets/src/mage/cards/e/EpharasEnlightenment.java @@ -44,7 +44,7 @@ public final class EpharasEnlightenment extends CardImpl { // When Ephara's Enlightenment enters the battlefield, put a +1/+1 counter on enchanted creature. this.addAbility(new EntersBattlefieldTriggeredAbility(new AddCountersAttachedEffect(CounterType.P1P1.createInstance(), "enchanted creature"), false)); // Enchanted creature has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); // Whenever a creature you control enters, you may return Ephara's Enlightenment to its owner's hand. this.addAbility(new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), diff --git a/Mage.Sets/src/mage/cards/e/EpharasRadiance.java b/Mage.Sets/src/mage/cards/e/EpharasRadiance.java index e002319132f..4c2a8cfa41c 100644 --- a/Mage.Sets/src/mage/cards/e/EpharasRadiance.java +++ b/Mage.Sets/src/mage/cards/e/EpharasRadiance.java @@ -37,7 +37,7 @@ public final class EpharasRadiance extends CardImpl { // Enchanted creature has "{1}{W}, {T}: You gain 3 life." ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(3), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new TapSourceCost()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.AURA, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability, AttachmentType.AURA, Duration.WhileOnBattlefield))); } private EpharasRadiance(final EpharasRadiance card) { diff --git a/Mage.Sets/src/mage/cards/e/EpiphanyStorm.java b/Mage.Sets/src/mage/cards/e/EpiphanyStorm.java index 05ac33b21c3..4625f9c41d6 100644 --- a/Mage.Sets/src/mage/cards/e/EpiphanyStorm.java +++ b/Mage.Sets/src/mage/cards/e/EpiphanyStorm.java @@ -44,7 +44,7 @@ public final class EpiphanyStorm extends CardImpl { Ability drawAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{R}")); drawAbility.addCost(new TapSourceCost()); drawAbility.addCost(new DiscardCardCost()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(drawAbility, AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(drawAbility, AttachmentType.AURA))); } private EpiphanyStorm(final EpiphanyStorm card) { diff --git a/Mage.Sets/src/mage/cards/e/EquestrianSkill.java b/Mage.Sets/src/mage/cards/e/EquestrianSkill.java index 0273b7e1661..130970fcc7f 100644 --- a/Mage.Sets/src/mage/cards/e/EquestrianSkill.java +++ b/Mage.Sets/src/mage/cards/e/EquestrianSkill.java @@ -34,9 +34,9 @@ public final class EquestrianSkill extends CardImpl { Ability ability = new EnchantAbility(auraTarget); 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))); // As long as enchanted creature is a Human, it has trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield), new EnchantedCreatureSubtypeCondition(SubType.HUMAN), "As long as enchanted creature is a Human, it has trample" diff --git a/Mage.Sets/src/mage/cards/e/ErebossEmissary.java b/Mage.Sets/src/mage/cards/e/ErebossEmissary.java index 7162ecddc7c..0d8289c5e83 100644 --- a/Mage.Sets/src/mage/cards/e/ErebossEmissary.java +++ b/Mage.Sets/src/mage/cards/e/ErebossEmissary.java @@ -43,7 +43,7 @@ public final class ErebossEmissary extends CardImpl { new DiscardTargetCost(new TargetCardInHand(StaticFilters.FILTER_CARD_CREATURE)))); // 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 ErebossEmissary(final ErebossEmissary card) { diff --git a/Mage.Sets/src/mage/cards/e/Errantry.java b/Mage.Sets/src/mage/cards/e/Errantry.java index 0494aabe560..add6e432457 100644 --- a/Mage.Sets/src/mage/cards/e/Errantry.java +++ b/Mage.Sets/src/mage/cards/e/Errantry.java @@ -37,7 +37,7 @@ public final class Errantry extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+0 and can only attack alone. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 0, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(3, 0, Duration.WhileOnBattlefield)); Effect effect = new CanAttackOnlyAloneEffect(); effect.setText("and can only attack alone"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/e/EsperStormblade.java b/Mage.Sets/src/mage/cards/e/EsperStormblade.java index c9ae008bc62..64176b4cf2f 100644 --- a/Mage.Sets/src/mage/cards/e/EsperStormblade.java +++ b/Mage.Sets/src/mage/cards/e/EsperStormblade.java @@ -45,7 +45,7 @@ public final class EsperStormblade extends CardImpl { this.toughness = new MageInt(1); // As long as you control another multicolored permanent, Esper Stormblade gets +1/+1 and has flying. - 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/e/EssenceFlare.java b/Mage.Sets/src/mage/cards/e/EssenceFlare.java index fbf0e2d7a7e..24cdf03177f 100644 --- a/Mage.Sets/src/mage/cards/e/EssenceFlare.java +++ b/Mage.Sets/src/mage/cards/e/EssenceFlare.java @@ -37,7 +37,7 @@ public final class EssenceFlare extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 0))); // At the beginning of the upkeep of enchanted creature's controller, put a -0/-1 counter on that creature. this.addAbility(new BeginningOfUpkeepTriggeredAbility(TargetController.CONTROLLER_ATTACHED_TO, new AddCountersAttachedEffect(CounterType.M0M1.createInstance(), "that creature"), false)); diff --git a/Mage.Sets/src/mage/cards/e/EssenceLeak.java b/Mage.Sets/src/mage/cards/e/EssenceLeak.java index e480c12ba1a..8669f909706 100644 --- a/Mage.Sets/src/mage/cards/e/EssenceLeak.java +++ b/Mage.Sets/src/mage/cards/e/EssenceLeak.java @@ -45,7 +45,7 @@ public final class EssenceLeak extends CardImpl { // As long as enchanted permanent is red or green, it has "At the beginning of your upkeep, sacrifice this permanent unless you pay its mana cost." Ability sacAbility =new BeginningOfUpkeepTriggeredAbility(new EssenceLeakEffect()); ContinuousEffect isRedOrGreenAbility = new GainAbilityAttachedEffect(sacAbility, AttachmentType.AURA); - SimpleStaticAbility ifRedOrGreenAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(isRedOrGreenAbility, + SimpleStaticAbility ifRedOrGreenAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(isRedOrGreenAbility, new OrCondition(new EnchantedCreatureColorCondition(ObjectColor.RED), new EnchantedCreatureColorCondition(ObjectColor.GREEN)), "As long as enchanted permanent is red or green, it has \"At the beginning of your upkeep, sacrifice this permanent unless you pay its mana cost.\"")); this.addAbility(ifRedOrGreenAbility); diff --git a/Mage.Sets/src/mage/cards/e/EssenceOfTheWild.java b/Mage.Sets/src/mage/cards/e/EssenceOfTheWild.java index 13f2915b7b7..8727d8cbdd2 100644 --- a/Mage.Sets/src/mage/cards/e/EssenceOfTheWild.java +++ b/Mage.Sets/src/mage/cards/e/EssenceOfTheWild.java @@ -26,7 +26,7 @@ public final class EssenceOfTheWild extends CardImpl { this.toughness = new MageInt(6); // Creatures you control enter the battlefield as a copy of Essence of the Wild. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EssenceOfTheWildEffect())); + this.addAbility(new SimpleStaticAbility(new EssenceOfTheWildEffect())); } private EssenceOfTheWild(final EssenceOfTheWild card) { diff --git a/Mage.Sets/src/mage/cards/e/EternalThirst.java b/Mage.Sets/src/mage/cards/e/EternalThirst.java index c07dac54a8f..932c9dc259a 100644 --- a/Mage.Sets/src/mage/cards/e/EternalThirst.java +++ b/Mage.Sets/src/mage/cards/e/EternalThirst.java @@ -39,7 +39,7 @@ public final class EternalThirst extends CardImpl { // Enchanted creature has lifelink Effect effect = new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA); effect.setText("Enchanted creature has lifelink"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); // and "Whenever a creature an opponent controls dies, put a +1/+1 counter on this creature." effect = new GainAbilityAttachedEffect(new DiesCreatureTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false, StaticFilters.FILTER_OPPONENTS_PERMANENT_A_CREATURE), AttachmentType.AURA); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/e/EternalWarrior.java b/Mage.Sets/src/mage/cards/e/EternalWarrior.java index f2c14cea107..4bc0dc8e5c2 100644 --- a/Mage.Sets/src/mage/cards/e/EternalWarrior.java +++ b/Mage.Sets/src/mage/cards/e/EternalWarrior.java @@ -36,7 +36,7 @@ public final class EternalWarrior extends CardImpl { this.addAbility(ability); // Enchant creature has vigilance - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA))); } private EternalWarrior(final EternalWarrior card) { diff --git a/Mage.Sets/src/mage/cards/e/EternitySnare.java b/Mage.Sets/src/mage/cards/e/EternitySnare.java index 11a596adc8e..284fd2fb39b 100644 --- a/Mage.Sets/src/mage/cards/e/EternitySnare.java +++ b/Mage.Sets/src/mage/cards/e/EternitySnare.java @@ -40,7 +40,7 @@ public final class EternitySnare extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); } private EternitySnare(final EternitySnare card) { diff --git a/Mage.Sets/src/mage/cards/e/EtherealWhiskergill.java b/Mage.Sets/src/mage/cards/e/EtherealWhiskergill.java index 20c52023519..4d64ac11593 100644 --- a/Mage.Sets/src/mage/cards/e/EtherealWhiskergill.java +++ b/Mage.Sets/src/mage/cards/e/EtherealWhiskergill.java @@ -29,7 +29,7 @@ public final class EtherealWhiskergill extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Ethereal Whiskergill can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); } private EtherealWhiskergill(final EtherealWhiskergill card) { diff --git a/Mage.Sets/src/mage/cards/e/EtherswornCanonist.java b/Mage.Sets/src/mage/cards/e/EtherswornCanonist.java index 7d21845c47f..fad19a9e952 100644 --- a/Mage.Sets/src/mage/cards/e/EtherswornCanonist.java +++ b/Mage.Sets/src/mage/cards/e/EtherswornCanonist.java @@ -33,7 +33,7 @@ public final class EtherswornCanonist extends CardImpl { this.toughness = new MageInt(2); // Each player who has cast a nonartifact spell this turn can't cast additional nonartifact spells. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EtherswornCanonistReplacementEffect()), new EtherswornCanonistWatcher()); + this.addAbility(new SimpleStaticAbility(new EtherswornCanonistReplacementEffect()), new EtherswornCanonistWatcher()); } private EtherswornCanonist(final EtherswornCanonist card) { diff --git a/Mage.Sets/src/mage/cards/e/EvanescentIntellect.java b/Mage.Sets/src/mage/cards/e/EvanescentIntellect.java index 890c1fc129d..351dfbcf06f 100644 --- a/Mage.Sets/src/mage/cards/e/EvanescentIntellect.java +++ b/Mage.Sets/src/mage/cards/e/EvanescentIntellect.java @@ -39,7 +39,7 @@ public final class EvanescentIntellect extends CardImpl { ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(3), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.AURA, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability, AttachmentType.AURA, Duration.WhileOnBattlefield))); } private EvanescentIntellect(final EvanescentIntellect card) { diff --git a/Mage.Sets/src/mage/cards/e/EverflameEidolon.java b/Mage.Sets/src/mage/cards/e/EverflameEidolon.java index d09adc7a3e0..7f7527c0eca 100644 --- a/Mage.Sets/src/mage/cards/e/EverflameEidolon.java +++ b/Mage.Sets/src/mage/cards/e/EverflameEidolon.java @@ -36,7 +36,7 @@ public final class EverflameEidolon extends CardImpl { // {R}: Everflame Eidolon gets +1/+0 until end of turn. If it's an Aura, enchanted creature gets +1/+0 until end of turn instead. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new EverflameEidolonEffect(), new ManaCostsImpl<>("{R}"))); // Enchanted creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); } private EverflameEidolon(final EverflameEidolon card) { diff --git a/Mage.Sets/src/mage/cards/e/Evermind.java b/Mage.Sets/src/mage/cards/e/Evermind.java index 53e6f6a9a84..52d71c1bed6 100644 --- a/Mage.Sets/src/mage/cards/e/Evermind.java +++ b/Mage.Sets/src/mage/cards/e/Evermind.java @@ -26,7 +26,7 @@ public final class Evermind extends CardImpl { this.color.setBlue(true); // (Nonexistent mana costs can't be paid.) - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new InfoEffect("(Nonexistent mana costs can't be paid.)")); + Ability ability = new SimpleStaticAbility(new InfoEffect("(Nonexistent mana costs can't be paid.)")); ability.setRuleAtTheTop(true); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EvilEyeOfOrmsByGore.java b/Mage.Sets/src/mage/cards/e/EvilEyeOfOrmsByGore.java index 490279aaebf..33dc7febde1 100644 --- a/Mage.Sets/src/mage/cards/e/EvilEyeOfOrmsByGore.java +++ b/Mage.Sets/src/mage/cards/e/EvilEyeOfOrmsByGore.java @@ -36,7 +36,7 @@ public final class EvilEyeOfOrmsByGore extends CardImpl { this.toughness = new MageInt(6); // Non-Eye creatures you control can't attack. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAllEffect(Duration.WhileOnBattlefield, cantAttackFilter))); + this.addAbility(new SimpleStaticAbility(new CantAttackAllEffect(Duration.WhileOnBattlefield, cantAttackFilter))); // Evil Eye of Orms-by-Gore can't be blocked except by Walls. this.addAbility(new SimpleEvasionAbility(new CantBeBlockedByCreaturesSourceEffect(cantBeBlockedByFilter, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/e/EvilEyeOfUrborg.java b/Mage.Sets/src/mage/cards/e/EvilEyeOfUrborg.java index 01452b51c52..9f4543819e4 100644 --- a/Mage.Sets/src/mage/cards/e/EvilEyeOfUrborg.java +++ b/Mage.Sets/src/mage/cards/e/EvilEyeOfUrborg.java @@ -33,7 +33,7 @@ public final class EvilEyeOfUrborg extends CardImpl { this.toughness = new MageInt(3); // Non-Eye creatures you control can't attack. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAllEffect(Duration.WhileOnBattlefield, cantAttackFilter))); + this.addAbility(new SimpleStaticAbility(new CantAttackAllEffect(Duration.WhileOnBattlefield, cantAttackFilter))); // Whenever Evil Eye of Urborg becomes blocked by a creature, destroy that creature. this.addAbility(new BecomesBlockedByCreatureTriggeredAbility(new DestroyTargetEffect(), false)); diff --git a/Mage.Sets/src/mage/cards/e/EvilPresence.java b/Mage.Sets/src/mage/cards/e/EvilPresence.java index 8f8caa54ad4..95ae47fd84b 100644 --- a/Mage.Sets/src/mage/cards/e/EvilPresence.java +++ b/Mage.Sets/src/mage/cards/e/EvilPresence.java @@ -33,7 +33,7 @@ public final class EvilPresence extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted land is a Swamp. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesBasicLandEnchantedEffect(SubType.SWAMP))); + this.addAbility(new SimpleStaticAbility(new BecomesBasicLandEnchantedEffect(SubType.SWAMP))); } private EvilPresence(final EvilPresence card) { diff --git a/Mage.Sets/src/mage/cards/e/ExaltedDragon.java b/Mage.Sets/src/mage/cards/e/ExaltedDragon.java index fea3c6f2219..5ee216075e6 100644 --- a/Mage.Sets/src/mage/cards/e/ExaltedDragon.java +++ b/Mage.Sets/src/mage/cards/e/ExaltedDragon.java @@ -37,7 +37,7 @@ public final class ExaltedDragon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Exalted Dragon can't attack unless you sacrifice a land. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ExaltedDragonCostToAttackBlockEffect())); + this.addAbility(new SimpleStaticAbility(new ExaltedDragonCostToAttackBlockEffect())); } private ExaltedDragon(final ExaltedDragon card) { diff --git a/Mage.Sets/src/mage/cards/e/ExavaRakdosBloodWitch.java b/Mage.Sets/src/mage/cards/e/ExavaRakdosBloodWitch.java index 883cea588eb..88312183b57 100644 --- a/Mage.Sets/src/mage/cards/e/ExavaRakdosBloodWitch.java +++ b/Mage.Sets/src/mage/cards/e/ExavaRakdosBloodWitch.java @@ -36,7 +36,7 @@ public final class ExavaRakdosBloodWitch extends CardImpl { // Unleash this.addAbility(new UnleashAbility()); // Each other creature you control with a +1/+1 counter on it has haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_OTHER_CONTROLLED_CREATURE_P1P1, diff --git a/Mage.Sets/src/mage/cards/e/ExcaliburSwordOfEden.java b/Mage.Sets/src/mage/cards/e/ExcaliburSwordOfEden.java index fe2a24e51dd..40a00e27ba1 100644 --- a/Mage.Sets/src/mage/cards/e/ExcaliburSwordOfEden.java +++ b/Mage.Sets/src/mage/cards/e/ExcaliburSwordOfEden.java @@ -52,7 +52,7 @@ public final class ExcaliburSwordOfEden extends CardImpl { ); // Equipped creature gets +10/+0 and has vigilance. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(10, 0)); + Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(10, 0)); ability.addEffect(new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.EQUIPMENT).setText("and has vigilance")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/ExclusionRitual.java b/Mage.Sets/src/mage/cards/e/ExclusionRitual.java index b41ee9dd0b1..8c5b9ad086c 100644 --- a/Mage.Sets/src/mage/cards/e/ExclusionRitual.java +++ b/Mage.Sets/src/mage/cards/e/ExclusionRitual.java @@ -40,7 +40,7 @@ public final class ExclusionRitual extends CardImpl { ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability.setAbilityWord(AbilityWord.IMPRINT)); // Players can't cast spells with the same name as the exiled card. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ExclusionRitualReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new ExclusionRitualReplacementEffect())); } private ExclusionRitual(final ExclusionRitual card) { diff --git a/Mage.Sets/src/mage/cards/e/Excruciator.java b/Mage.Sets/src/mage/cards/e/Excruciator.java index 3ec3f99b1b2..4d7524d8141 100644 --- a/Mage.Sets/src/mage/cards/e/Excruciator.java +++ b/Mage.Sets/src/mage/cards/e/Excruciator.java @@ -30,7 +30,7 @@ public final class Excruciator extends CardImpl { this.toughness = new MageInt(7); // Damage that would be dealt by Excruciator can't be prevented. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ExcruciatorEffect())); + this.addAbility(new SimpleStaticAbility(new ExcruciatorEffect())); } private Excruciator(final Excruciator card) { diff --git a/Mage.Sets/src/mage/cards/e/ExecutionersHood.java b/Mage.Sets/src/mage/cards/e/ExecutionersHood.java index 31bb5feba56..8ceeecba4c4 100644 --- a/Mage.Sets/src/mage/cards/e/ExecutionersHood.java +++ b/Mage.Sets/src/mage/cards/e/ExecutionersHood.java @@ -26,7 +26,7 @@ public final class ExecutionersHood extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has intimidate. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(IntimidateAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(IntimidateAbility.getInstance(), AttachmentType.EQUIPMENT))); // Equip {2} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); } diff --git a/Mage.Sets/src/mage/cards/e/ExoskeletalArmor.java b/Mage.Sets/src/mage/cards/e/ExoskeletalArmor.java index 7bdfff85721..cfd4cf96602 100644 --- a/Mage.Sets/src/mage/cards/e/ExoskeletalArmor.java +++ b/Mage.Sets/src/mage/cards/e/ExoskeletalArmor.java @@ -39,7 +39,7 @@ public final class ExoskeletalArmor extends CardImpl { CardsInAllGraveyardsCount count = new CardsInAllGraveyardsCount(StaticFilters.FILTER_CARD_CREATURES); Effect effect = new BoostEnchantedEffect(count, count, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +X/+X, where X is the number of creature cards in all graveyards"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private ExoskeletalArmor(final ExoskeletalArmor card) { diff --git a/Mage.Sets/src/mage/cards/e/ExoticCurse.java b/Mage.Sets/src/mage/cards/e/ExoticCurse.java index 92fab7e1af7..0851411f1c2 100644 --- a/Mage.Sets/src/mage/cards/e/ExoticCurse.java +++ b/Mage.Sets/src/mage/cards/e/ExoticCurse.java @@ -34,7 +34,7 @@ public final class ExoticCurse extends CardImpl { // Domain - Enchanted creature gets -1/-1 for each basic land type among lands you control. DynamicValue unboost = new SignInversionDynamicValue(DomainValue.REGULAR); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(unboost, unboost, Duration.WhileOnBattlefield)); + Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(unboost, unboost, Duration.WhileOnBattlefield)); ability.setAbilityWord(AbilityWord.DOMAIN); this.addAbility(ability.addHint(DomainHint.instance)); } diff --git a/Mage.Sets/src/mage/cards/e/ExperimentKraj.java b/Mage.Sets/src/mage/cards/e/ExperimentKraj.java index f25835e285d..c208a7ac2d3 100644 --- a/Mage.Sets/src/mage/cards/e/ExperimentKraj.java +++ b/Mage.Sets/src/mage/cards/e/ExperimentKraj.java @@ -35,7 +35,7 @@ public final class ExperimentKraj extends CardImpl { this.toughness = new MageInt(6); // Experiment Kraj has all activated abilities of each other creature with a +1/+1 counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ExperimentKrajEffect())); + this.addAbility(new SimpleStaticAbility(new ExperimentKrajEffect())); // {tap}: Put a +1/+1 counter on target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/e/ExquisiteArchangel.java b/Mage.Sets/src/mage/cards/e/ExquisiteArchangel.java index 7821b7ee120..45670ba24d2 100644 --- a/Mage.Sets/src/mage/cards/e/ExquisiteArchangel.java +++ b/Mage.Sets/src/mage/cards/e/ExquisiteArchangel.java @@ -37,7 +37,7 @@ public final class ExquisiteArchangel extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // If you would lose the game, instead exile Exquisite Archangel and your life total becomes equal to your starting life total. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ExquisiteArchangelEffect())); + this.addAbility(new SimpleStaticAbility(new ExquisiteArchangelEffect())); } diff --git a/Mage.Sets/src/mage/cards/e/ExtricatorOfFlesh.java b/Mage.Sets/src/mage/cards/e/ExtricatorOfFlesh.java index 96aba193e73..5b176a45956 100644 --- a/Mage.Sets/src/mage/cards/e/ExtricatorOfFlesh.java +++ b/Mage.Sets/src/mage/cards/e/ExtricatorOfFlesh.java @@ -46,7 +46,7 @@ public final class ExtricatorOfFlesh extends CardImpl { this.nightCard = true; // Eldrazi you control have vigilance - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect( VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filterEldrazi))); // {2}, {T}, Sacrifice a non-Eldrazi creature: Create a 3/2 colorless Eldrazi Horror creature token. diff --git a/Mage.Sets/src/mage/cards/e/EyeOfUgin.java b/Mage.Sets/src/mage/cards/e/EyeOfUgin.java index 5bfd94ba16c..f6382c38d5f 100644 --- a/Mage.Sets/src/mage/cards/e/EyeOfUgin.java +++ b/Mage.Sets/src/mage/cards/e/EyeOfUgin.java @@ -39,7 +39,7 @@ public final class EyeOfUgin extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // Colorless Eldrazi spells you cast cost {2} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filterSpells, 2))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filterSpells, 2))); // {7}, {tap}: Search your library for a colorless creature card, reveal it, and put it into your hand. Then shuffle your library. Ability searchAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/e/EzurisBrigade.java b/Mage.Sets/src/mage/cards/e/EzurisBrigade.java index 70c285bf42d..e5bc886ce92 100644 --- a/Mage.Sets/src/mage/cards/e/EzurisBrigade.java +++ b/Mage.Sets/src/mage/cards/e/EzurisBrigade.java @@ -32,7 +32,7 @@ public final class EzurisBrigade extends CardImpl { // Metalcraft — As long as you control three or more artifacts, Ezuri’s Brigade gets +4/+4 and has trample. ContinuousEffect boostSource = new BoostSourceEffect(4, 4, Duration.WhileOnBattlefield); ConditionalContinuousEffect effect = new ConditionalContinuousEffect(boostSource, MetalcraftCondition.instance, rule); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield), MetalcraftCondition.instance, "and has trample")); ability.setAbilityWord(AbilityWord.METALCRAFT); ability.addHint(MetalcraftHint.instance); diff --git a/Mage.Sets/src/mage/cards/f/FaceOfDivinity.java b/Mage.Sets/src/mage/cards/f/FaceOfDivinity.java index 4dbdf91f625..926a8035310 100644 --- a/Mage.Sets/src/mage/cards/f/FaceOfDivinity.java +++ b/Mage.Sets/src/mage/cards/f/FaceOfDivinity.java @@ -38,14 +38,14 @@ public final class FaceOfDivinity extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // As long as another Aura is attached to enchanted creature, it has first strike and lifelink. Effect effect1 = new ConditionalContinuousEffect(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA), FaceOfDivinityCondition.instance, "As long as another Aura is attached to enchanted creature, it has first strike"); Effect effect2 = new ConditionalContinuousEffect(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA), FaceOfDivinityCondition.instance, "and lifelink"); - Ability abilityBoost = new SimpleStaticAbility(Zone.BATTLEFIELD, effect1); + Ability abilityBoost = new SimpleStaticAbility(effect1); abilityBoost.addEffect(effect2); this.addAbility(abilityBoost); } @@ -88,5 +88,3 @@ enum FaceOfDivinityCondition implements Condition { return "another Aura is attached to enchanted creature"; } } - - diff --git a/Mage.Sets/src/mage/cards/f/FaerieNoble.java b/Mage.Sets/src/mage/cards/f/FaerieNoble.java index 8a7074d25db..8d5afad5300 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieNoble.java +++ b/Mage.Sets/src/mage/cards/f/FaerieNoble.java @@ -38,7 +38,7 @@ public final class FaerieNoble extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Other Faerie creatures you control get +0/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, filter, true))); // {tap}: Other Faerie creatures you control get +1/+0 until end of turn. Effect effect = new BoostControlledEffect(1, 0, Duration.EndOfTurn, filter, true); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/f/FaithsFetters.java b/Mage.Sets/src/mage/cards/f/FaithsFetters.java index 4c22aecddbd..63b2a8e1091 100644 --- a/Mage.Sets/src/mage/cards/f/FaithsFetters.java +++ b/Mage.Sets/src/mage/cards/f/FaithsFetters.java @@ -43,7 +43,7 @@ public final class FaithsFetters extends CardImpl { // Enchanted permanent's activated abilities can't be activated unless they're mana abilities. If enchanted permanent is a creature, it can't attack or block. Effect effect = new CantAttackBlockAttachedEffect(AttachmentType.AURA); effect.setText("Enchanted permanent can't attack or block,"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); ability.addEffect(new FaithsFettersEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FalkenrathGorger.java b/Mage.Sets/src/mage/cards/f/FalkenrathGorger.java index a5ba41d8c4c..e4156ea35e1 100644 --- a/Mage.Sets/src/mage/cards/f/FalkenrathGorger.java +++ b/Mage.Sets/src/mage/cards/f/FalkenrathGorger.java @@ -43,7 +43,7 @@ public final class FalkenrathGorger extends CardImpl { * from Falkenrath Gorger. */ // Each Vampire creature card you own that isn't on the battlefield has madness. Its madness cost is equal to its mana cost. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FalkenrathGorgerEffect())); + this.addAbility(new SimpleStaticAbility(new FalkenrathGorgerEffect())); } private FalkenrathGorger(final FalkenrathGorger card) { diff --git a/Mage.Sets/src/mage/cards/f/FamiliarGround.java b/Mage.Sets/src/mage/cards/f/FamiliarGround.java index 749958e8e86..b30f55cde2d 100644 --- a/Mage.Sets/src/mage/cards/f/FamiliarGround.java +++ b/Mage.Sets/src/mage/cards/f/FamiliarGround.java @@ -21,7 +21,7 @@ public final class FamiliarGround extends CardImpl { // Each creature you control can't be blocked by more than one creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByMoreThanOneAllEffect(StaticFilters.FILTER_CONTROLLED_CREATURE))); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByMoreThanOneAllEffect(StaticFilters.FILTER_CONTROLLED_CREATURE))); } private FamiliarGround(final FamiliarGround card) { diff --git a/Mage.Sets/src/mage/cards/f/FamishedPaladin.java b/Mage.Sets/src/mage/cards/f/FamishedPaladin.java index f14fe25957e..23c06713c01 100644 --- a/Mage.Sets/src/mage/cards/f/FamishedPaladin.java +++ b/Mage.Sets/src/mage/cards/f/FamishedPaladin.java @@ -27,7 +27,7 @@ public final class FamishedPaladin extends CardImpl { this.toughness = new MageInt(3); // Famished Paladin doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // Whenever you gain life, untap Famished Paladin. this.addAbility(new GainLifeControllerTriggeredAbility(new UntapSourceEffect(), false)); } diff --git a/Mage.Sets/src/mage/cards/f/Farmstead.java b/Mage.Sets/src/mage/cards/f/Farmstead.java index 0ff0e850985..37b61ff1c68 100644 --- a/Mage.Sets/src/mage/cards/f/Farmstead.java +++ b/Mage.Sets/src/mage/cards/f/Farmstead.java @@ -40,7 +40,7 @@ public final class Farmstead extends CardImpl { ); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted land has \"At the beginning of your upkeep, you may pay {W}{W}. If you do, you gain 1 life.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private Farmstead(final Farmstead card) { diff --git a/Mage.Sets/src/mage/cards/f/Fastbond.java b/Mage.Sets/src/mage/cards/f/Fastbond.java index ea180834bab..c735fbcfc42 100644 --- a/Mage.Sets/src/mage/cards/f/Fastbond.java +++ b/Mage.Sets/src/mage/cards/f/Fastbond.java @@ -26,7 +26,7 @@ public final class Fastbond extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{G}"); // You may play any number of additional lands on each of your turns. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayAdditionalLandsControllerEffect(Integer.MAX_VALUE, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new PlayAdditionalLandsControllerEffect(Integer.MAX_VALUE, Duration.WhileOnBattlefield))); // Whenever you play a land, if it wasn't the first land you played this turn, Fastbond deals 1 damage to you. this.addAbility(new PlayALandTriggeredAbility()); } diff --git a/Mage.Sets/src/mage/cards/f/Fasting.java b/Mage.Sets/src/mage/cards/f/Fasting.java index b67a87ef443..b46ca01c300 100644 --- a/Mage.Sets/src/mage/cards/f/Fasting.java +++ b/Mage.Sets/src/mage/cards/f/Fasting.java @@ -37,7 +37,7 @@ public final class Fasting extends CardImpl { this.addAbility(ability); // If you would begin your draw step, you may skip that step instead. If you do, you gain 2 life. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FastingReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new FastingReplacementEffect())); // When you draw a card, destroy Fasting. this.addAbility(new DrawCardControllerTriggeredAbility(new DestroySourceEffect(), false)); diff --git a/Mage.Sets/src/mage/cards/f/FavorOfTheMighty.java b/Mage.Sets/src/mage/cards/f/FavorOfTheMighty.java index 943d8077196..7e434ef6d0c 100644 --- a/Mage.Sets/src/mage/cards/f/FavorOfTheMighty.java +++ b/Mage.Sets/src/mage/cards/f/FavorOfTheMighty.java @@ -31,7 +31,7 @@ public final class FavorOfTheMighty extends CardImpl { this.subtype.add(SubType.GIANT); // Each creature with the highest converted mana cost has protection from all colors. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FavorOfTheMightyEffect())); + this.addAbility(new SimpleStaticAbility(new FavorOfTheMightyEffect())); } private FavorOfTheMighty(final FavorOfTheMighty card) { diff --git a/Mage.Sets/src/mage/cards/f/FavorOfTheOverbeing.java b/Mage.Sets/src/mage/cards/f/FavorOfTheOverbeing.java index 0bd0df63850..fe97ba9e3ae 100644 --- a/Mage.Sets/src/mage/cards/f/FavorOfTheOverbeing.java +++ b/Mage.Sets/src/mage/cards/f/FavorOfTheOverbeing.java @@ -41,11 +41,11 @@ public final class FavorOfTheOverbeing extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As long as enchanted creature is green, it gets +1/+1 and has vigilance. - SimpleStaticAbility greenAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.GREEN), "As long as enchanted creature is green, it gets +1/+1")); + SimpleStaticAbility greenAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.GREEN), "As long as enchanted creature is green, it gets +1/+1")); greenAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.GREEN), "and has vigilance")); this.addAbility(greenAbility); // As long as enchanted creature is blue, it gets +1/+1 and has flying. - SimpleStaticAbility blueAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLUE), "As long as enchanted creature is blue, it gets +1/+1")); + SimpleStaticAbility blueAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLUE), "As long as enchanted creature is blue, it gets +1/+1")); blueAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.BLUE), "and has flying")); this.addAbility(blueAbility); } diff --git a/Mage.Sets/src/mage/cards/f/Fear.java b/Mage.Sets/src/mage/cards/f/Fear.java index a7ed049fc7c..7abf44624a8 100644 --- a/Mage.Sets/src/mage/cards/f/Fear.java +++ b/Mage.Sets/src/mage/cards/f/Fear.java @@ -36,7 +36,7 @@ public final class Fear extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has fear. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FearAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FearAbility.getInstance(), AttachmentType.AURA))); } private Fear(final Fear card) { diff --git a/Mage.Sets/src/mage/cards/f/FearsomeTemper.java b/Mage.Sets/src/mage/cards/f/FearsomeTemper.java index 753989475a9..78da48253ae 100644 --- a/Mage.Sets/src/mage/cards/f/FearsomeTemper.java +++ b/Mage.Sets/src/mage/cards/f/FearsomeTemper.java @@ -39,7 +39,7 @@ public final class FearsomeTemper extends CardImpl { // Enchanted creature gets +2/+2 and has "{2}{R}: Target creature can't block this creature this turn." Effect effect = new BoostEnchantedEffect(2,2, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +2/+2"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); Ability grantedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedByTargetSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}")); grantedAbility.addTarget(new TargetCreaturePermanent()); effect = new GainAbilityAttachedEffect(grantedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield); diff --git a/Mage.Sets/src/mage/cards/f/FeastOfTheUnicorn.java b/Mage.Sets/src/mage/cards/f/FeastOfTheUnicorn.java index e12778852c3..4a7eb8803e9 100644 --- a/Mage.Sets/src/mage/cards/f/FeastOfTheUnicorn.java +++ b/Mage.Sets/src/mage/cards/f/FeastOfTheUnicorn.java @@ -35,7 +35,7 @@ public final class FeastOfTheUnicorn extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +4/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(4, 0, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(4, 0, Duration.WhileOnBattlefield))); } private FeastOfTheUnicorn(final FeastOfTheUnicorn card) { diff --git a/Mage.Sets/src/mage/cards/f/FeastingHobbit.java b/Mage.Sets/src/mage/cards/f/FeastingHobbit.java index a326576dbd2..f8dbd8c91ad 100644 --- a/Mage.Sets/src/mage/cards/f/FeastingHobbit.java +++ b/Mage.Sets/src/mage/cards/f/FeastingHobbit.java @@ -30,7 +30,7 @@ public final class FeastingHobbit extends CardImpl { this.addAbility(new DevourAbility(3, StaticFilters.FILTER_CONTROLLED_FOOD)); // Creatures with power less than Feasting Hobbit's power can't block it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByCreaturesWithLessPowerEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByCreaturesWithLessPowerEffect())); } private FeastingHobbit(final FeastingHobbit card) { diff --git a/Mage.Sets/src/mage/cards/f/Feebleness.java b/Mage.Sets/src/mage/cards/f/Feebleness.java index e4f80309739..0676f4e2e86 100644 --- a/Mage.Sets/src/mage/cards/f/Feebleness.java +++ b/Mage.Sets/src/mage/cards/f/Feebleness.java @@ -37,7 +37,7 @@ public final class Feebleness extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -2/-1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-2, -1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-2, -1, Duration.WhileOnBattlefield))); } private Feebleness(final Feebleness card) { diff --git a/Mage.Sets/src/mage/cards/f/FelhideBrawler.java b/Mage.Sets/src/mage/cards/f/FelhideBrawler.java index bc1a772569d..1e05868e34b 100644 --- a/Mage.Sets/src/mage/cards/f/FelhideBrawler.java +++ b/Mage.Sets/src/mage/cards/f/FelhideBrawler.java @@ -34,7 +34,7 @@ public final class FelhideBrawler extends CardImpl { this.toughness = new MageInt(2); // Felhide Brawler can't block unless you control another Minotaur. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockUnlessYouControlSourceEffect(filter))); + this.addAbility(new SimpleStaticAbility(new CantBlockUnlessYouControlSourceEffect(filter))); } private FelhideBrawler(final FelhideBrawler card) { diff --git a/Mage.Sets/src/mage/cards/f/FelhidePetrifier.java b/Mage.Sets/src/mage/cards/f/FelhidePetrifier.java index c826513a78d..40dbf54847b 100644 --- a/Mage.Sets/src/mage/cards/f/FelhidePetrifier.java +++ b/Mage.Sets/src/mage/cards/f/FelhidePetrifier.java @@ -31,7 +31,7 @@ public final class FelhidePetrifier extends CardImpl { // Deathtouch this.addAbility(DeathtouchAbility.getInstance()); // Other Minotaur creatures you control have deathtouch. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect( DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.MINOTAUR,"Minotaur creatures"), true) diff --git a/Mage.Sets/src/mage/cards/f/FelidarUmbra.java b/Mage.Sets/src/mage/cards/f/FelidarUmbra.java index 0377f10113b..729f7299394 100644 --- a/Mage.Sets/src/mage/cards/f/FelidarUmbra.java +++ b/Mage.Sets/src/mage/cards/f/FelidarUmbra.java @@ -41,7 +41,7 @@ public final class FelidarUmbra extends CardImpl { this.addAbility(ability); // Enchanted creature has lifelink. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA))); // {1}{W}: Attach Felidar Umbra to target creature you control. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttachEffect(Outcome.Detriment, "Attach {this} to target creature you control"), new ManaCostsImpl<>("{1}{W}")); diff --git a/Mage.Sets/src/mage/cards/f/FelineSovereign.java b/Mage.Sets/src/mage/cards/f/FelineSovereign.java index a2201d40efa..305f05d98fa 100644 --- a/Mage.Sets/src/mage/cards/f/FelineSovereign.java +++ b/Mage.Sets/src/mage/cards/f/FelineSovereign.java @@ -44,7 +44,7 @@ public final class FelineSovereign extends CardImpl { this.toughness = new MageInt(3); // Other Cats you control get +1/+1 and have protection from Dogs. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterCat, true)); + Ability ability = new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterCat, true)); // Effect effect = new GainAbilityAllEffect(new ProtectionAbility(filterProtectionFromDogs), Duration.WhileOnBattlefield, filterCat, true); effect.setText("and have protection from Dogs"); diff --git a/Mage.Sets/src/mage/cards/f/FellFlagship.java b/Mage.Sets/src/mage/cards/f/FellFlagship.java index 267504e362a..4596f0f4b45 100644 --- a/Mage.Sets/src/mage/cards/f/FellFlagship.java +++ b/Mage.Sets/src/mage/cards/f/FellFlagship.java @@ -36,7 +36,7 @@ public final class FellFlagship extends CardImpl { this.toughness = new MageInt(3); // Pirates you control get +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, filter))); // Whenever Fell Flagship deals combat damage to a player, that player discards a card. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DiscardTargetEffect(1, false), false, true)); diff --git a/Mage.Sets/src/mage/cards/f/FencersMagemark.java b/Mage.Sets/src/mage/cards/f/FencersMagemark.java index e646bdfd7cb..612c81d4bfd 100644 --- a/Mage.Sets/src/mage/cards/f/FencersMagemark.java +++ b/Mage.Sets/src/mage/cards/f/FencersMagemark.java @@ -41,7 +41,7 @@ public final class FencersMagemark extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Creatures you control that are enchanted get +1/+1 and have first strike. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1,1, Duration.WhileOnBattlefield, filter, false)); + ability = new SimpleStaticAbility(new BoostAllEffect(1,1, Duration.WhileOnBattlefield, filter, false)); Effect effect = new GainAbilityAllEffect(FirstStrikeAbility.getInstance(),Duration.WhileOnBattlefield,filter, " and have first strike"); ability.addEffect(effect); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FeralInvocation.java b/Mage.Sets/src/mage/cards/f/FeralInvocation.java index ee5d4a0aa43..1ad0848f9c1 100644 --- a/Mage.Sets/src/mage/cards/f/FeralInvocation.java +++ b/Mage.Sets/src/mage/cards/f/FeralInvocation.java @@ -38,7 +38,7 @@ public final class FeralInvocation extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2,2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2,2, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/f/FerozsBan.java b/Mage.Sets/src/mage/cards/f/FerozsBan.java index 94216031e14..929b822add7 100644 --- a/Mage.Sets/src/mage/cards/f/FerozsBan.java +++ b/Mage.Sets/src/mage/cards/f/FerozsBan.java @@ -23,7 +23,7 @@ public final class FerozsBan extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{6}"); // Creature spells cost {2} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostIncreasingAllEffect(2, filter, TargetController.ANY))); + this.addAbility(new SimpleStaticAbility(new SpellsCostIncreasingAllEffect(2, filter, TargetController.ANY))); } private FerozsBan(final FerozsBan card) { diff --git a/Mage.Sets/src/mage/cards/f/Fervor.java b/Mage.Sets/src/mage/cards/f/Fervor.java index bb9514e88fe..513b02b245e 100644 --- a/Mage.Sets/src/mage/cards/f/Fervor.java +++ b/Mage.Sets/src/mage/cards/f/Fervor.java @@ -22,7 +22,7 @@ public final class Fervor extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); // Creatures you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect( HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, false))); } diff --git a/Mage.Sets/src/mage/cards/f/FibrousEntangler.java b/Mage.Sets/src/mage/cards/f/FibrousEntangler.java index 45323d737de..ac64f9a2e07 100644 --- a/Mage.Sets/src/mage/cards/f/FibrousEntangler.java +++ b/Mage.Sets/src/mage/cards/f/FibrousEntangler.java @@ -33,10 +33,10 @@ public final class FibrousEntangler extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); // Fibrous Entangler must be blocked if able. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAtLeastOneSourceEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAtLeastOneSourceEffect(Duration.WhileOnBattlefield))); // Fibrous Entangler can block an additional creature each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(Duration.WhileOnBattlefield, 1))); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect(Duration.WhileOnBattlefield, 1))); } private FibrousEntangler(final FibrousEntangler card) { diff --git a/Mage.Sets/src/mage/cards/f/FieldOfDreams.java b/Mage.Sets/src/mage/cards/f/FieldOfDreams.java index ca253ecff36..f6227dad864 100644 --- a/Mage.Sets/src/mage/cards/f/FieldOfDreams.java +++ b/Mage.Sets/src/mage/cards/f/FieldOfDreams.java @@ -21,7 +21,7 @@ public final class FieldOfDreams extends CardImpl { this.supertype.add(SuperType.WORLD); // Players play with the top card of their libraries revealed. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithTheTopCardRevealedEffect(true))); + this.addAbility(new SimpleStaticAbility(new PlayWithTheTopCardRevealedEffect(true))); } private FieldOfDreams(final FieldOfDreams card) { diff --git a/Mage.Sets/src/mage/cards/f/FiendslayerPaladin.java b/Mage.Sets/src/mage/cards/f/FiendslayerPaladin.java index 5f2ef3ba47d..53bdec74ab9 100644 --- a/Mage.Sets/src/mage/cards/f/FiendslayerPaladin.java +++ b/Mage.Sets/src/mage/cards/f/FiendslayerPaladin.java @@ -42,7 +42,7 @@ public final class FiendslayerPaladin extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // Fiendslayer Paladin can't be the target of black or red spells your opponents control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FiendslayerPaladinEffect())); + this.addAbility(new SimpleStaticAbility(new FiendslayerPaladinEffect())); } diff --git a/Mage.Sets/src/mage/cards/f/FinalIteration.java b/Mage.Sets/src/mage/cards/f/FinalIteration.java index 89767168fcb..7ef4c765c72 100644 --- a/Mage.Sets/src/mage/cards/f/FinalIteration.java +++ b/Mage.Sets/src/mage/cards/f/FinalIteration.java @@ -50,7 +50,7 @@ public final class FinalIteration extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Wizards you control get +2/+1 and have flying. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 1, Duration.WhileOnBattlefield, filter, false)); + Ability ability = new SimpleStaticAbility(new BoostControlledEffect(2, 1, Duration.WhileOnBattlefield, filter, false)); Effect effect = new GainAbilityAllEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, filter, false); effect.setText("and have flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/f/FireServant.java b/Mage.Sets/src/mage/cards/f/FireServant.java index a788e1a42e3..fa337592b13 100644 --- a/Mage.Sets/src/mage/cards/f/FireServant.java +++ b/Mage.Sets/src/mage/cards/f/FireServant.java @@ -33,7 +33,7 @@ public final class FireServant extends CardImpl { this.toughness = new MageInt(3); // If a red instant or sorcery spell you control would deal damage, it deals double that damage instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FireServantEffect())); + this.addAbility(new SimpleStaticAbility(new FireServantEffect())); } private FireServant(final FireServant card) { diff --git a/Mage.Sets/src/mage/cards/f/FireWhip.java b/Mage.Sets/src/mage/cards/f/FireWhip.java index 5e87e556597..a5a419fb5ca 100644 --- a/Mage.Sets/src/mage/cards/f/FireWhip.java +++ b/Mage.Sets/src/mage/cards/f/FireWhip.java @@ -39,7 +39,7 @@ public final class FireWhip extends CardImpl { // Enchanted creature has "{t}: This creature deals 1 damage to any target." Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability1.addTarget(new TargetAnyTarget()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability1, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{T}: This creature deals 1 damage to any target.\""))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability1, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{T}: This creature deals 1 damage to any target.\""))); // Sacrifice Fire Whip: Fire Whip deals 1 damage to any target. Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeSourceCost()); ability2.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/f/FiresOfYavimaya.java b/Mage.Sets/src/mage/cards/f/FiresOfYavimaya.java index c383ff9d101..e8776bb3246 100644 --- a/Mage.Sets/src/mage/cards/f/FiresOfYavimaya.java +++ b/Mage.Sets/src/mage/cards/f/FiresOfYavimaya.java @@ -27,7 +27,7 @@ public final class FiresOfYavimaya extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{R}{G}"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_CONTROLLED_CREATURES, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_CONTROLLED_CREATURES, false))); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/Fireshrieker.java b/Mage.Sets/src/mage/cards/f/Fireshrieker.java index af034ef564d..76c0c70de8c 100644 --- a/Mage.Sets/src/mage/cards/f/Fireshrieker.java +++ b/Mage.Sets/src/mage/cards/f/Fireshrieker.java @@ -26,7 +26,7 @@ public final class Fireshrieker extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // 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 {2} this.addAbility(new EquipAbility(Outcome.AddAbility, new ManaCostsImpl<>("{2}"))); diff --git a/Mage.Sets/src/mage/cards/f/FiresongAndSunspeaker.java b/Mage.Sets/src/mage/cards/f/FiresongAndSunspeaker.java index 9966bf2722e..39ef82a2e5d 100644 --- a/Mage.Sets/src/mage/cards/f/FiresongAndSunspeaker.java +++ b/Mage.Sets/src/mage/cards/f/FiresongAndSunspeaker.java @@ -46,7 +46,7 @@ public final class FiresongAndSunspeaker extends CardImpl { // Red instant and sorcery spells you control have lifelink. Effect effect = new GainAbilityControlledSpellsEffect(LifelinkAbility.getInstance(), filter); effect.setText("Red instant and sorcery spells you control have lifelink"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // Whenever a white instant or sorcery spell causes you to gain life, Firesong and Sunspeaker deals 3 damage to target creature or player. this.addAbility(new FiresongAndSunspeakerTriggeredAbility()); } diff --git a/Mage.Sets/src/mage/cards/f/FirewakeSliver.java b/Mage.Sets/src/mage/cards/f/FirewakeSliver.java index 6029250a192..8457630204d 100644 --- a/Mage.Sets/src/mage/cards/f/FirewakeSliver.java +++ b/Mage.Sets/src/mage/cards/f/FirewakeSliver.java @@ -42,13 +42,13 @@ public final class FirewakeSliver extends CardImpl { this.toughness = new MageInt(1); // All Sliver creatures 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))); // All Slivers have "{1}, Sacrifice this permanent: Target Sliver creature gets +2/+2 until end of turn." Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new GenericManaCost(1)); gainedAbility.addCost(new SacrificeSourceCost()); gainedAbility.addTarget(new TargetCreaturePermanent(targetSliverFilter)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( gainedAbility, Duration.WhileOnBattlefield, filter, "All Slivers have \"{1}, Sacrifice this permanent: Target Sliver creature gets +2/+2 until end of turn.\""))); diff --git a/Mage.Sets/src/mage/cards/f/FirstComeFirstServed.java b/Mage.Sets/src/mage/cards/f/FirstComeFirstServed.java index d8ea30122af..9e84cc5e144 100644 --- a/Mage.Sets/src/mage/cards/f/FirstComeFirstServed.java +++ b/Mage.Sets/src/mage/cards/f/FirstComeFirstServed.java @@ -34,7 +34,7 @@ public final class FirstComeFirstServed extends CardImpl { // Each attacking or blocking creature with the lowest collector number among attacking or blocking creatures has first strike. GainAbilityAllEffect gainEffect = new GainAbilityAllEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, false); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, gainEffect)); + this.addAbility(new SimpleStaticAbility(gainEffect)); } private FirstComeFirstServed(final FirstComeFirstServed card) { diff --git a/Mage.Sets/src/mage/cards/f/FishliverOil.java b/Mage.Sets/src/mage/cards/f/FishliverOil.java index b6e528b3b50..38215a093d8 100644 --- a/Mage.Sets/src/mage/cards/f/FishliverOil.java +++ b/Mage.Sets/src/mage/cards/f/FishliverOil.java @@ -35,7 +35,7 @@ public final class FishliverOil extends CardImpl { this.addAbility(ability); // Enchanted creature has islandwalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAttachedEffect(new IslandwalkAbility(), AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/f/FistOfSuns.java b/Mage.Sets/src/mage/cards/f/FistOfSuns.java index 856b21ac505..42352f453ea 100644 --- a/Mage.Sets/src/mage/cards/f/FistOfSuns.java +++ b/Mage.Sets/src/mage/cards/f/FistOfSuns.java @@ -18,7 +18,7 @@ public final class FistOfSuns extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // You may pay {W}{U}{B}{R}{G} rather than pay the mana cost for spells that you cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WUBRGInsteadEffect())); + this.addAbility(new SimpleStaticAbility(new WUBRGInsteadEffect())); } private FistOfSuns(final FistOfSuns card) { diff --git a/Mage.Sets/src/mage/cards/f/FistsOfIronwood.java b/Mage.Sets/src/mage/cards/f/FistsOfIronwood.java index bfe9b308f38..04b175d8d6f 100644 --- a/Mage.Sets/src/mage/cards/f/FistsOfIronwood.java +++ b/Mage.Sets/src/mage/cards/f/FistsOfIronwood.java @@ -41,7 +41,7 @@ public final class FistsOfIronwood extends CardImpl { // When Fists of Ironwood enters the battlefield, create two 1/1 green Saproling creature tokens. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new SaprolingToken(), 2), false)); // Enchanted creature has trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA))); } private FistsOfIronwood(final FistsOfIronwood card) { diff --git a/Mage.Sets/src/mage/cards/f/FistsOfTheDemigod.java b/Mage.Sets/src/mage/cards/f/FistsOfTheDemigod.java index 558c308445c..758bee188ae 100644 --- a/Mage.Sets/src/mage/cards/f/FistsOfTheDemigod.java +++ b/Mage.Sets/src/mage/cards/f/FistsOfTheDemigod.java @@ -41,11 +41,11 @@ public final class FistsOfTheDemigod extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As long as enchanted creature is black, it gets +1/+1 and has wither. - SimpleStaticAbility blackAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "As long as enchanted creature is black, it gets +1/+1")); + SimpleStaticAbility blackAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "As long as enchanted creature is black, it gets +1/+1")); blackAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(WitherAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "and has wither")); this.addAbility(blackAbility); // As long as enchanted creature is red, it gets +1/+1 and has first strike. - SimpleStaticAbility redAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.RED), "As long as enchanted creature is red, it gets +1/+1")); + SimpleStaticAbility redAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.RED), "As long as enchanted creature is red, it gets +1/+1")); redAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.RED), "and has first strike")); this.addAbility(redAbility); } diff --git a/Mage.Sets/src/mage/cards/f/FlameTrooper.java b/Mage.Sets/src/mage/cards/f/FlameTrooper.java index 46e6fcaf753..92f5d16cc38 100644 --- a/Mage.Sets/src/mage/cards/f/FlameTrooper.java +++ b/Mage.Sets/src/mage/cards/f/FlameTrooper.java @@ -34,7 +34,7 @@ public final class FlameTrooper extends CardImpl { this.toughness = new MageInt(2); // Trooper creatures you control have menace. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(new MenaceAbility(), Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(new MenaceAbility(), Duration.WhileOnBattlefield, filter, false))); } private FlameTrooper(final FlameTrooper card) { diff --git a/Mage.Sets/src/mage/cards/f/FlamespeakersWill.java b/Mage.Sets/src/mage/cards/f/FlamespeakersWill.java index c3b824d21d0..21899e284bd 100644 --- a/Mage.Sets/src/mage/cards/f/FlamespeakersWill.java +++ b/Mage.Sets/src/mage/cards/f/FlamespeakersWill.java @@ -37,7 +37,7 @@ public final class FlamespeakersWill extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1,1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1,1, Duration.WhileOnBattlefield))); // Whenever enchanted creature deals combat damage to a player, you may sacrifice Flamespeaker's Will. If you do, destroy target artifact. ability = new DealsDamageToAPlayerAttachedTriggeredAbility( new DoIfCostPaid(new DestroyTargetEffect(), new SacrificeSourceCost()), "enchanted creature", false, false, true, TargetController.ANY); diff --git a/Mage.Sets/src/mage/cards/f/FlamingSword.java b/Mage.Sets/src/mage/cards/f/FlamingSword.java index 1a88cc61d0d..5c1f1b228f7 100644 --- a/Mage.Sets/src/mage/cards/f/FlamingSword.java +++ b/Mage.Sets/src/mage/cards/f/FlamingSword.java @@ -46,7 +46,7 @@ public final class FlamingSword extends CardImpl { // Enchanted creature gets +1/+0 and has first strike. Effect effect = new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +1/+0"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA); effect.setText("and has first strike"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/f/FlaringFlameKin.java b/Mage.Sets/src/mage/cards/f/FlaringFlameKin.java index 21a215d38c9..b0fc9e5477b 100644 --- a/Mage.Sets/src/mage/cards/f/FlaringFlameKin.java +++ b/Mage.Sets/src/mage/cards/f/FlaringFlameKin.java @@ -35,7 +35,7 @@ public final class FlaringFlameKin extends CardImpl { // As long as Flaring Flame-Kin is enchanted, it gets +2/+2, has trample, and has "{R}: Flaring Flame-Kin gets +1/+0 until end of turn." EnchantedSourceCondition enchanted = new EnchantedSourceCondition(); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), enchanted, "As long as {this} is enchanted, it gets +2/+2")); ability.addEffect(new ConditionalContinuousEffect( diff --git a/Mage.Sets/src/mage/cards/f/FlayerHusk.java b/Mage.Sets/src/mage/cards/f/FlayerHusk.java index 25243c68fab..c2626560f14 100644 --- a/Mage.Sets/src/mage/cards/f/FlayerHusk.java +++ b/Mage.Sets/src/mage/cards/f/FlayerHusk.java @@ -28,7 +28,7 @@ public final class FlayerHusk extends CardImpl { this.addAbility(new LivingWeaponAbility()); // Equipped creature gets +1/+1 - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 1))); // Equip {2} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2), false)); diff --git a/Mage.Sets/src/mage/cards/f/FledglingOsprey.java b/Mage.Sets/src/mage/cards/f/FledglingOsprey.java index b6c0c5b0f55..753b9563814 100644 --- a/Mage.Sets/src/mage/cards/f/FledglingOsprey.java +++ b/Mage.Sets/src/mage/cards/f/FledglingOsprey.java @@ -29,7 +29,7 @@ public final class FledglingOsprey extends CardImpl { this.toughness = new MageInt(1); // Fledgling Osprey has flying as long as it's enchanted. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield), new EnchantedSourceCondition(), "{this} has flying as long as it's enchanted"))); diff --git a/Mage.Sets/src/mage/cards/f/FleecemaneLion.java b/Mage.Sets/src/mage/cards/f/FleecemaneLion.java index b3760b26295..fe7e1f7e729 100644 --- a/Mage.Sets/src/mage/cards/f/FleecemaneLion.java +++ b/Mage.Sets/src/mage/cards/f/FleecemaneLion.java @@ -39,7 +39,7 @@ public final class FleecemaneLion extends CardImpl { new GainAbilitySourceEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield), MonstrousCondition.instance, "As long as {this} is monstrous, it has hexproof"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new ConditionalContinuousEffect( new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), MonstrousCondition.instance, diff --git a/Mage.Sets/src/mage/cards/f/FlickeringWard.java b/Mage.Sets/src/mage/cards/f/FlickeringWard.java index e036567ef2d..de6dd0e93ba 100644 --- a/Mage.Sets/src/mage/cards/f/FlickeringWard.java +++ b/Mage.Sets/src/mage/cards/f/FlickeringWard.java @@ -40,7 +40,7 @@ public final class FlickeringWard extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Benefit))); // Enchanted creature has protection from the chosen color. This effect doesn't remove Flickering Ward. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ProtectionChosenColorAttachedEffect(true))); + this.addAbility(new SimpleStaticAbility(new ProtectionChosenColorAttachedEffect(true))); // {W}: Return Flickering Ward to its owner's hand. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ManaCostsImpl<>("{W}"))); diff --git a/Mage.Sets/src/mage/cards/f/Flight.java b/Mage.Sets/src/mage/cards/f/Flight.java index 9ca193dba97..0974181cad1 100644 --- a/Mage.Sets/src/mage/cards/f/Flight.java +++ b/Mage.Sets/src/mage/cards/f/Flight.java @@ -36,7 +36,7 @@ public final class Flight 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 Flight(final Flight card) { diff --git a/Mage.Sets/src/mage/cards/f/FlightOfFancy.java b/Mage.Sets/src/mage/cards/f/FlightOfFancy.java index d7e67dd3ec0..666771e76af 100644 --- a/Mage.Sets/src/mage/cards/f/FlightOfFancy.java +++ b/Mage.Sets/src/mage/cards/f/FlightOfFancy.java @@ -40,7 +40,7 @@ public final class FlightOfFancy extends CardImpl { // When Flight of Fancy enters the battlefield, draw two cards. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(2), false)); // Enchanted creature has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); } private FlightOfFancy(final FlightOfFancy card) { diff --git a/Mage.Sets/src/mage/cards/f/FlinthoofBoar.java b/Mage.Sets/src/mage/cards/f/FlinthoofBoar.java index 89f35e8d400..4dc0d23dbaa 100644 --- a/Mage.Sets/src/mage/cards/f/FlinthoofBoar.java +++ b/Mage.Sets/src/mage/cards/f/FlinthoofBoar.java @@ -37,7 +37,7 @@ public final class FlinthoofBoar extends CardImpl { this.toughness = new MageInt(2); // Flinthoof Boar gets +1/+1 as long as you control a Mountain. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceWhileControlsEffect(filter, 1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filter, 1, 1))); // {R}: Flinthoof Boar gains haste until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/f/FlitterstepEidolon.java b/Mage.Sets/src/mage/cards/f/FlitterstepEidolon.java index 0556b056104..3bb1e100a3b 100644 --- a/Mage.Sets/src/mage/cards/f/FlitterstepEidolon.java +++ b/Mage.Sets/src/mage/cards/f/FlitterstepEidolon.java @@ -35,7 +35,7 @@ public final class FlitterstepEidolon extends CardImpl { // Flitterstep Eidolon can't be blocked. this.addAbility(new CantBeBlockedSourceAbility()); // Enchanted creature gets +1/+1 and can't be blocked. - 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 CantBeBlockedAttachedEffect(AttachmentType.AURA).setText("and can't be blocked")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/Floodchaser.java b/Mage.Sets/src/mage/cards/f/Floodchaser.java index 4be23201afe..4cf86bf8ed6 100644 --- a/Mage.Sets/src/mage/cards/f/Floodchaser.java +++ b/Mage.Sets/src/mage/cards/f/Floodchaser.java @@ -39,7 +39,7 @@ public final class Floodchaser extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(6)), "with six +1/+1 counters on it")); // Floodchaser can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); // {U}, Remove a +1/+1 counter from Floodchaser: Target land becomes an Island until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesBasicLandTargetEffect(Duration.EndOfTurn, SubType.ISLAND), new ManaCostsImpl<>("{U}")); diff --git a/Mage.Sets/src/mage/cards/f/FloodedWoodlands.java b/Mage.Sets/src/mage/cards/f/FloodedWoodlands.java index 3e842dad7b6..635f0d195b6 100644 --- a/Mage.Sets/src/mage/cards/f/FloodedWoodlands.java +++ b/Mage.Sets/src/mage/cards/f/FloodedWoodlands.java @@ -26,7 +26,7 @@ public final class FloodedWoodlands extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}{B}"); // Green creatures can't attack unless their controller sacrifices a land for each green creature they control that's attacking. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FloodedWoodlandsCostToAttackBlockEffect())); + this.addAbility(new SimpleStaticAbility(new FloodedWoodlandsCostToAttackBlockEffect())); } diff --git a/Mage.Sets/src/mage/cards/f/FloodtideSerpent.java b/Mage.Sets/src/mage/cards/f/FloodtideSerpent.java index 7bc5a934ac7..4e30b2d64cb 100644 --- a/Mage.Sets/src/mage/cards/f/FloodtideSerpent.java +++ b/Mage.Sets/src/mage/cards/f/FloodtideSerpent.java @@ -28,7 +28,7 @@ public final class FloodtideSerpent extends CardImpl { this.toughness = new MageInt(4); // Floodtide Serpent can't attack unless you return an enchantment you control to its owner's hand (This cost is paid as attackers are declared.) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockUnlessPaysSourceEffect( + this.addAbility(new SimpleStaticAbility(new CantAttackBlockUnlessPaysSourceEffect( new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(StaticFilters.FILTER_CONTROLLED_PERMANENT_AN_ENCHANTMENT)), PayCostToAttackBlockEffectImpl.RestrictType.ATTACK))); } diff --git a/Mage.Sets/src/mage/cards/f/FloweringField.java b/Mage.Sets/src/mage/cards/f/FloweringField.java index 5b4f3eec5bc..655a538d915 100644 --- a/Mage.Sets/src/mage/cards/f/FloweringField.java +++ b/Mage.Sets/src/mage/cards/f/FloweringField.java @@ -39,7 +39,7 @@ public final class FloweringField extends CardImpl { ability.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted land has \"{T}: Prevent the next 1 damage that would be dealt to any target this turn.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private FloweringField(final FloweringField card) { diff --git a/Mage.Sets/src/mage/cards/f/FloweringLumberknot.java b/Mage.Sets/src/mage/cards/f/FloweringLumberknot.java index 410b7a6e2e9..adf2449acf6 100644 --- a/Mage.Sets/src/mage/cards/f/FloweringLumberknot.java +++ b/Mage.Sets/src/mage/cards/f/FloweringLumberknot.java @@ -29,7 +29,7 @@ public final class FloweringLumberknot extends CardImpl { this.toughness = new MageInt(5); // Flowering Lumberknot can't attack or block unless it's paired with a creature with soulbond. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FloweringLumberknotEffect())); + this.addAbility(new SimpleStaticAbility(new FloweringLumberknotEffect())); } private FloweringLumberknot(final FloweringLumberknot card) { diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneSurge.java b/Mage.Sets/src/mage/cards/f/FlowstoneSurge.java index e3d6f788271..af11479d10a 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneSurge.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneSurge.java @@ -21,7 +21,7 @@ public final class FlowstoneSurge extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}"); // Creatures you control get +1/-1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, -1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, false))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, -1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, false))); } private FlowstoneSurge(final FlowstoneSurge card) { diff --git a/Mage.Sets/src/mage/cards/f/Fluctuator.java b/Mage.Sets/src/mage/cards/f/Fluctuator.java index 85a94979b1c..ed3153ebf24 100644 --- a/Mage.Sets/src/mage/cards/f/Fluctuator.java +++ b/Mage.Sets/src/mage/cards/f/Fluctuator.java @@ -26,7 +26,7 @@ public final class Fluctuator extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // Cycling abilities you activate cost you up to {2} less to activate. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FluctuatorEffect())); + this.addAbility(new SimpleStaticAbility(new FluctuatorEffect())); } private Fluctuator(final Fluctuator card) { diff --git a/Mage.Sets/src/mage/cards/f/ForbiddenLore.java b/Mage.Sets/src/mage/cards/f/ForbiddenLore.java index 85edf1cebc1..06987afcf3c 100644 --- a/Mage.Sets/src/mage/cards/f/ForbiddenLore.java +++ b/Mage.Sets/src/mage/cards/f/ForbiddenLore.java @@ -36,7 +36,7 @@ public final class ForbiddenLore extends CardImpl { // Enchanted land has "{tap}: Target creature gets +2/+1 until end of turn." Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 1, Duration.EndOfTurn), new TapSourceCost()); gainAbility.addTarget(new TargetCreaturePermanent()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{T}: Target creature gets +2/+1 until end of turn.\""))); } diff --git a/Mage.Sets/src/mage/cards/f/ForceBubble.java b/Mage.Sets/src/mage/cards/f/ForceBubble.java index e4407509e7f..9d852bc5354 100644 --- a/Mage.Sets/src/mage/cards/f/ForceBubble.java +++ b/Mage.Sets/src/mage/cards/f/ForceBubble.java @@ -33,7 +33,7 @@ public final class ForceBubble extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}{W}"); // If damage would be dealt to you, put that many depletion counters on Force Bubble instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ForceBubbleReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new ForceBubbleReplacementEffect())); // When there are four or more depletion counters on Force Bubble, sacrifice it. this.addAbility(new ForceBubbleStateTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/f/ForcedWorship.java b/Mage.Sets/src/mage/cards/f/ForcedWorship.java index 5101fae3bf2..91dba6f9140 100644 --- a/Mage.Sets/src/mage/cards/f/ForcedWorship.java +++ b/Mage.Sets/src/mage/cards/f/ForcedWorship.java @@ -39,7 +39,7 @@ public final class ForcedWorship extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantAttackAttachedEffect(AttachmentType.AURA))); // {2}{W}: Return Forced Worship to its owner's hand. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{2}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/f/ForebearsBlade.java b/Mage.Sets/src/mage/cards/f/ForebearsBlade.java index 23d9ef04a46..5dd136e987d 100644 --- a/Mage.Sets/src/mage/cards/f/ForebearsBlade.java +++ b/Mage.Sets/src/mage/cards/f/ForebearsBlade.java @@ -34,7 +34,7 @@ public final class ForebearsBlade extends CardImpl { // Equipped creature gets +3/+0 Effect effect = new BoostEquippedEffect(3, 0); effect.setText("Equipped creature gets +3/+0"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); // and has vigilance effect = new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.EQUIPMENT); effect.setText("and has vigilance"); diff --git a/Mage.Sets/src/mage/cards/f/ForethoughtAmulet.java b/Mage.Sets/src/mage/cards/f/ForethoughtAmulet.java index 663892fbe13..19336700494 100644 --- a/Mage.Sets/src/mage/cards/f/ForethoughtAmulet.java +++ b/Mage.Sets/src/mage/cards/f/ForethoughtAmulet.java @@ -31,7 +31,7 @@ public final class ForethoughtAmulet extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new GenericManaCost(3)))); // If an instant or sorcery source would deal 3 or more damage to you, it deals 2 damage to you instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ForethoughtAmuletEffect())); + this.addAbility(new SimpleStaticAbility(new ForethoughtAmuletEffect())); } private ForethoughtAmulet(final ForethoughtAmulet card) { diff --git a/Mage.Sets/src/mage/cards/f/ForiysianBrigade.java b/Mage.Sets/src/mage/cards/f/ForiysianBrigade.java index 9354d0b1498..f779ffd31e4 100644 --- a/Mage.Sets/src/mage/cards/f/ForiysianBrigade.java +++ b/Mage.Sets/src/mage/cards/f/ForiysianBrigade.java @@ -25,7 +25,7 @@ public final class ForiysianBrigade extends CardImpl { this.toughness = new MageInt(4); // Foriysian Brigade can block an additional creature each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect())); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect())); } private ForiysianBrigade(final ForiysianBrigade card) { diff --git a/Mage.Sets/src/mage/cards/f/ForiysianInterceptor.java b/Mage.Sets/src/mage/cards/f/ForiysianInterceptor.java index dbdb1b55b04..5b283316514 100644 --- a/Mage.Sets/src/mage/cards/f/ForiysianInterceptor.java +++ b/Mage.Sets/src/mage/cards/f/ForiysianInterceptor.java @@ -31,7 +31,7 @@ public final class ForiysianInterceptor extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // Foriysian Interceptor can block an additional creature each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect())); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect())); } private ForiysianInterceptor(final ForiysianInterceptor card) { diff --git a/Mage.Sets/src/mage/cards/f/ForiysianTotem.java b/Mage.Sets/src/mage/cards/f/ForiysianTotem.java index 5109f228407..17cd16d1ed6 100644 --- a/Mage.Sets/src/mage/cards/f/ForiysianTotem.java +++ b/Mage.Sets/src/mage/cards/f/ForiysianTotem.java @@ -39,7 +39,7 @@ public final class ForiysianTotem extends CardImpl { this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new ForiysianTotemToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{4}{R}"))); // As long as Foriysian Totem is a creature, it can block an additional creature each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new CanBlockAdditionalCreatureEffect(1), new SourceMatchesFilterCondition(new FilterCreaturePermanent()), ruleText))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new CanBlockAdditionalCreatureEffect(1), new SourceMatchesFilterCondition(new FilterCreaturePermanent()), ruleText))); } private ForiysianTotem(final ForiysianTotem card) { diff --git a/Mage.Sets/src/mage/cards/f/FormOfTheDragon.java b/Mage.Sets/src/mage/cards/f/FormOfTheDragon.java index 7b6c1206419..ce83e760513 100644 --- a/Mage.Sets/src/mage/cards/f/FormOfTheDragon.java +++ b/Mage.Sets/src/mage/cards/f/FormOfTheDragon.java @@ -45,7 +45,7 @@ public final class FormOfTheDragon extends CardImpl { this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new SetPlayerLifeSourceEffect(5), false)); // Creatures without flying can't attack you. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackYouAllEffect(Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new CantAttackYouAllEffect(Duration.WhileOnBattlefield, filter))); } private FormOfTheDragon(final FormOfTheDragon card) { diff --git a/Mage.Sets/src/mage/cards/f/FormOfTheSquirrel.java b/Mage.Sets/src/mage/cards/f/FormOfTheSquirrel.java index 19b4877da46..420380c52e9 100644 --- a/Mage.Sets/src/mage/cards/f/FormOfTheSquirrel.java +++ b/Mage.Sets/src/mage/cards/f/FormOfTheSquirrel.java @@ -38,13 +38,13 @@ public final class FormOfTheSquirrel extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new FormOfTheSquirrelCreateTokenEffect())); // Creatures can't attack you. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackYouAllEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CantAttackYouAllEffect(Duration.WhileOnBattlefield))); // You have shroud. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControllerEffect(ShroudAbility.getInstance()))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControllerEffect(ShroudAbility.getInstance()))); // You can't cast spells. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FormOfTheSquirrelCantCastEffect())); + this.addAbility(new SimpleStaticAbility(new FormOfTheSquirrelCantCastEffect())); } private FormOfTheSquirrel(final FormOfTheSquirrel card) { diff --git a/Mage.Sets/src/mage/cards/f/ForsakenCity.java b/Mage.Sets/src/mage/cards/f/ForsakenCity.java index eb15ab1f38f..ef3dd567a8f 100644 --- a/Mage.Sets/src/mage/cards/f/ForsakenCity.java +++ b/Mage.Sets/src/mage/cards/f/ForsakenCity.java @@ -27,7 +27,7 @@ public final class ForsakenCity extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.LAND}, ""); // Forsaken City 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 exile a card from your hand. If you do, untap Forsaken City. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DoIfCostPaid(new UntapSourceEffect(), new ExileFromHandCost(new TargetCardInHand(filter))))); diff --git a/Mage.Sets/src/mage/cards/f/FortifiedArea.java b/Mage.Sets/src/mage/cards/f/FortifiedArea.java index 1348ef9421c..d07d668f0ba 100644 --- a/Mage.Sets/src/mage/cards/f/FortifiedArea.java +++ b/Mage.Sets/src/mage/cards/f/FortifiedArea.java @@ -32,7 +32,7 @@ public final class FortifiedArea extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{W}{W}"); // Wall creatures you control get +1/+0 and have banding. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, filter)); + Ability ability = new SimpleStaticAbility(new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, filter)); Effect effect = new GainAbilityControlledEffect(BandingAbility.getInstance(), Duration.WhileOnBattlefield, filter); effect.setText("and have banding"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/f/FortuneThief.java b/Mage.Sets/src/mage/cards/f/FortuneThief.java index 1e2a0c03cc2..eb61db64799 100644 --- a/Mage.Sets/src/mage/cards/f/FortuneThief.java +++ b/Mage.Sets/src/mage/cards/f/FortuneThief.java @@ -35,7 +35,7 @@ public final class FortuneThief extends CardImpl { this.toughness = new MageInt(1); // Damage that would reduce your life total to less than 1 reduces it to 1 instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FortuneThiefReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new FortuneThiefReplacementEffect())); // Morph {R}{R} this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{R}{R}"))); } diff --git a/Mage.Sets/src/mage/cards/f/FoulPresence.java b/Mage.Sets/src/mage/cards/f/FoulPresence.java index 230dd49d726..80c8a539480 100644 --- a/Mage.Sets/src/mage/cards/f/FoulPresence.java +++ b/Mage.Sets/src/mage/cards/f/FoulPresence.java @@ -35,7 +35,7 @@ public final class FoulPresence extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -1/-1 and has "{T}: Target creature gets -1/-1 until end of turn." - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-1, -1, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(-1, -1, Duration.WhileOnBattlefield)); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new TapSourceCost()); gainedAbility.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/f/FoundryInspector.java b/Mage.Sets/src/mage/cards/f/FoundryInspector.java index 838a3cd31b9..90c705b3ec6 100644 --- a/Mage.Sets/src/mage/cards/f/FoundryInspector.java +++ b/Mage.Sets/src/mage/cards/f/FoundryInspector.java @@ -31,7 +31,7 @@ public final class FoundryInspector extends CardImpl { this.toughness = new MageInt(2); // Artifact 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 FoundryInspector(final FoundryInspector card) { diff --git a/Mage.Sets/src/mage/cards/f/FoundryScreecher.java b/Mage.Sets/src/mage/cards/f/FoundryScreecher.java index ebad8cff777..e4ffdc54c22 100644 --- a/Mage.Sets/src/mage/cards/f/FoundryScreecher.java +++ b/Mage.Sets/src/mage/cards/f/FoundryScreecher.java @@ -31,7 +31,7 @@ public final class FoundryScreecher extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Foundry Screecher gets +1/+0 as long as you control an artifact. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1, 0, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT), "{this} gets +1/+0 as long as you control an artifact"))); diff --git a/Mage.Sets/src/mage/cards/f/FountainWatch.java b/Mage.Sets/src/mage/cards/f/FountainWatch.java index c67faf31fdd..19b7d8f5280 100644 --- a/Mage.Sets/src/mage/cards/f/FountainWatch.java +++ b/Mage.Sets/src/mage/cards/f/FountainWatch.java @@ -28,7 +28,7 @@ public final class FountainWatch extends CardImpl { this.toughness = new MageInt(4); // Artifacts and enchantments you control have shroud. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ARTIFACTS_AND_ENCHANTMENTS, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ARTIFACTS_AND_ENCHANTMENTS, false))); } private FountainWatch(final FountainWatch card) { diff --git a/Mage.Sets/src/mage/cards/f/FreneticRaptor.java b/Mage.Sets/src/mage/cards/f/FreneticRaptor.java index 17e2e697486..c409671a11d 100644 --- a/Mage.Sets/src/mage/cards/f/FreneticRaptor.java +++ b/Mage.Sets/src/mage/cards/f/FreneticRaptor.java @@ -30,7 +30,7 @@ public final class FreneticRaptor extends CardImpl { this.toughness = new MageInt(6); // Beasts can't block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAllEffect(filter, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CantBlockAllEffect(filter, Duration.WhileOnBattlefield))); } private FreneticRaptor(final FreneticRaptor card) { diff --git a/Mage.Sets/src/mage/cards/f/FrenziedRage.java b/Mage.Sets/src/mage/cards/f/FrenziedRage.java index d64d1d5f8f6..215b56412d2 100644 --- a/Mage.Sets/src/mage/cards/f/FrenziedRage.java +++ b/Mage.Sets/src/mage/cards/f/FrenziedRage.java @@ -39,7 +39,7 @@ public final class FrenziedRage extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+1 and has menace. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 1)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 1)); Effect effect = new GainAbilityAttachedEffect(new MenaceAbility(), AttachmentType.AURA); effect.setText("and has menace. (It can't be blocked except by two or more creatures.)"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/f/FrenzySliver.java b/Mage.Sets/src/mage/cards/f/FrenzySliver.java index 249c0b358fb..259b1f7c7e3 100644 --- a/Mage.Sets/src/mage/cards/f/FrenzySliver.java +++ b/Mage.Sets/src/mage/cards/f/FrenzySliver.java @@ -43,7 +43,7 @@ public final class FrenzySliver extends CardImpl { this.toughness = new MageInt(1); // All Sliver creatures have frenzy 1. (Whenever a Sliver attacks and isn't blocked, it gets +1/+0 until end of turn.) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( new FrenzyAbility(), Duration.WhileOnBattlefield, filter, "All Sliver creatures have frenzy 1. (Whenever a Sliver attacks and isn't blocked, it gets +1/+0 until end of turn.)"))); } @@ -95,4 +95,4 @@ class FrenzyAbility extends TriggeredAbilityImpl { public String getRule() { return "Frenzy 1. (Whenever this creature attacks and isn't blocked, it gets +1/+0 until end of turn.)"; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/f/FreyalisesWinds.java b/Mage.Sets/src/mage/cards/f/FreyalisesWinds.java index c4b08978b6b..e63f4b4b03f 100644 --- a/Mage.Sets/src/mage/cards/f/FreyalisesWinds.java +++ b/Mage.Sets/src/mage/cards/f/FreyalisesWinds.java @@ -31,7 +31,7 @@ public final class FreyalisesWinds extends CardImpl { this.addAbility(new BecomesTappedTriggeredAbility(effect, false, new FilterPermanent("a permanent"), true)); // If a permanent with a wind counter on it would untap during its controller's untap step, remove all wind counters from it instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FreyalisesWindsReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new FreyalisesWindsReplacementEffect())); } diff --git a/Mage.Sets/src/mage/cards/f/FrogTongue.java b/Mage.Sets/src/mage/cards/f/FrogTongue.java index 61e1286c6b9..cd3981d8436 100644 --- a/Mage.Sets/src/mage/cards/f/FrogTongue.java +++ b/Mage.Sets/src/mage/cards/f/FrogTongue.java @@ -35,7 +35,7 @@ public final class FrogTongue extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ReachAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ReachAbility.getInstance(), AttachmentType.AURA))); } private FrogTongue(final FrogTongue card) { diff --git a/Mage.Sets/src/mage/cards/f/FrogtosserBanneret.java b/Mage.Sets/src/mage/cards/f/FrogtosserBanneret.java index 16c60ddbd76..3b88eba0eb9 100644 --- a/Mage.Sets/src/mage/cards/f/FrogtosserBanneret.java +++ b/Mage.Sets/src/mage/cards/f/FrogtosserBanneret.java @@ -39,7 +39,7 @@ public final class FrogtosserBanneret extends CardImpl { this.addAbility(HasteAbility.getInstance()); // Goblin spells and Rogue 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 FrogtosserBanneret(final FrogtosserBanneret card) { diff --git a/Mage.Sets/src/mage/cards/f/Frostwielder.java b/Mage.Sets/src/mage/cards/f/Frostwielder.java index 17c369bf06d..7f0597231cc 100644 --- a/Mage.Sets/src/mage/cards/f/Frostwielder.java +++ b/Mage.Sets/src/mage/cards/f/Frostwielder.java @@ -37,7 +37,7 @@ public final class Frostwielder extends CardImpl { ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // If a creature dealt damage by Frostwielder this turn would die, exile it instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DealtDamageToCreatureBySourceDies(this, Duration.WhileOnBattlefield)), new DamagedByWatcher(false)); + this.addAbility(new SimpleStaticAbility(new DealtDamageToCreatureBySourceDies(this, Duration.WhileOnBattlefield)), new DamagedByWatcher(false)); } diff --git a/Mage.Sets/src/mage/cards/f/FrozenSolid.java b/Mage.Sets/src/mage/cards/f/FrozenSolid.java index 1c12dc6461a..90e30f24e3f 100644 --- a/Mage.Sets/src/mage/cards/f/FrozenSolid.java +++ b/Mage.Sets/src/mage/cards/f/FrozenSolid.java @@ -35,7 +35,7 @@ public final class FrozenSolid extends CardImpl { Ability ability = new EnchantAbility(auraTarget); 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())); // When enchanted creature is dealt damage, destroy it. this.addAbility(new DealtDamageAttachedTriggeredAbility(new DestroyAttachedToEffect("it"), false) .setTriggerPhrase("When enchanted creature is dealt damage, ")); diff --git a/Mage.Sets/src/mage/cards/f/FullMoonsRise.java b/Mage.Sets/src/mage/cards/f/FullMoonsRise.java index 71c8867e1f8..61ee050ef08 100644 --- a/Mage.Sets/src/mage/cards/f/FullMoonsRise.java +++ b/Mage.Sets/src/mage/cards/f/FullMoonsRise.java @@ -38,7 +38,7 @@ public final class FullMoonsRise extends CardImpl { // Werewolf creatures you control get +1/+0 and have trample. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, filter)); + Ability ability = new SimpleStaticAbility(new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, filter)); Effect effect = new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filter); effect.setText("and have trample"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/f/FungalFortitude.java b/Mage.Sets/src/mage/cards/f/FungalFortitude.java index 609ebfb26a1..913ccf36b59 100644 --- a/Mage.Sets/src/mage/cards/f/FungalFortitude.java +++ b/Mage.Sets/src/mage/cards/f/FungalFortitude.java @@ -38,7 +38,7 @@ public final class FungalFortitude extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 0))); // When enchanted creature dies, return it to the battlefield tapped under its owner's control. this.addAbility(new DiesAttachedTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/f/FungusSliver.java b/Mage.Sets/src/mage/cards/f/FungusSliver.java index a4d8f23c389..b1ecfcfbc75 100644 --- a/Mage.Sets/src/mage/cards/f/FungusSliver.java +++ b/Mage.Sets/src/mage/cards/f/FungusSliver.java @@ -35,7 +35,7 @@ public final class FungusSliver extends CardImpl { this.toughness = new MageInt(2); // All Sliver creatures have "Whenever this creature is dealt damage, put a +1/+1 counter on it." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( new DealtDamageToSourceTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), false), Duration.WhileOnBattlefield, filter, diff --git a/Mage.Sets/src/mage/cards/f/FurnaceOfRath.java b/Mage.Sets/src/mage/cards/f/FurnaceOfRath.java index f8092f974c3..774271c00eb 100644 --- a/Mage.Sets/src/mage/cards/f/FurnaceOfRath.java +++ b/Mage.Sets/src/mage/cards/f/FurnaceOfRath.java @@ -26,7 +26,7 @@ public final class FurnaceOfRath extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}{R}{R}"); // If a source would deal damage to a creature or player, it deals double that damage to that creature or player instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FurnaceOfRathEffect())); + this.addAbility(new SimpleStaticAbility(new FurnaceOfRathEffect())); } private FurnaceOfRath(final FurnaceOfRath card) { diff --git a/Mage.Sets/src/mage/cards/f/FurorOfTheBitten.java b/Mage.Sets/src/mage/cards/f/FurorOfTheBitten.java index b1f0b3565fa..042f4c8df34 100644 --- a/Mage.Sets/src/mage/cards/f/FurorOfTheBitten.java +++ b/Mage.Sets/src/mage/cards/f/FurorOfTheBitten.java @@ -32,7 +32,7 @@ public final class FurorOfTheBitten extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +2/+2 and attacks each turn if able. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); + Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); Effect effect = new AttacksIfAbleAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.AURA); effect.setText("and attacks each combat if able"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/f/FutureSight.java b/Mage.Sets/src/mage/cards/f/FutureSight.java index fa7cda7e9c3..7e83c7747ed 100644 --- a/Mage.Sets/src/mage/cards/f/FutureSight.java +++ b/Mage.Sets/src/mage/cards/f/FutureSight.java @@ -19,10 +19,10 @@ public final class FutureSight extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}{U}{U}"); // Play with the top card of your library revealed. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithTheTopCardRevealedEffect())); + this.addAbility(new SimpleStaticAbility(new PlayWithTheTopCardRevealedEffect())); // You may play lands and cast spells from the top of your library. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayFromTopOfLibraryEffect())); + this.addAbility(new SimpleStaticAbility(new PlayFromTopOfLibraryEffect())); } private FutureSight(final FutureSight card) {