diff --git a/Mage.Sets/src/mage/cards/n/NaruMehaMasterWizard.java b/Mage.Sets/src/mage/cards/n/NaruMehaMasterWizard.java index 18dc6b42585..c951a482827 100644 --- a/Mage.Sets/src/mage/cards/n/NaruMehaMasterWizard.java +++ b/Mage.Sets/src/mage/cards/n/NaruMehaMasterWizard.java @@ -59,7 +59,7 @@ public final class NaruMehaMasterWizard extends CardImpl { this.addAbility(ability); //Other Wizards you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, wizardFilter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, wizardFilter, true))); } private NaruMehaMasterWizard(final NaruMehaMasterWizard card) { diff --git a/Mage.Sets/src/mage/cards/n/NathsElite.java b/Mage.Sets/src/mage/cards/n/NathsElite.java index be06aad9b39..384cf36fec1 100644 --- a/Mage.Sets/src/mage/cards/n/NathsElite.java +++ b/Mage.Sets/src/mage/cards/n/NathsElite.java @@ -31,7 +31,7 @@ public final class NathsElite extends CardImpl { this.toughness = new MageInt(2); // All creatures able to block Nath's Elite do so. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAllSourceEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAllSourceEffect(Duration.WhileOnBattlefield))); // When Nath's Elite enters the battlefield, clash with an opponent. If you win, put a +1/+1 counter on Nath's Elite. this.addAbility(new EntersBattlefieldTriggeredAbility(new DoIfClashWonEffect(new AddCountersSourceEffect(CounterType.P1P1.createInstance())))); diff --git a/Mage.Sets/src/mage/cards/n/NaturesRevolt.java b/Mage.Sets/src/mage/cards/n/NaturesRevolt.java index b1e609b262b..b4f8b3d9df3 100644 --- a/Mage.Sets/src/mage/cards/n/NaturesRevolt.java +++ b/Mage.Sets/src/mage/cards/n/NaturesRevolt.java @@ -24,7 +24,7 @@ public final class NaturesRevolt extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{G}{G}"); // All lands are 2/2 creatures that are still lands. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAllEffect( + this.addAbility(new SimpleStaticAbility(new BecomesCreatureAllEffect( new CreatureToken(2, 2, "2/2 creatures"), "lands", filter, Duration.WhileOnBattlefield, false))); } diff --git a/Mage.Sets/src/mage/cards/n/NayaHushblade.java b/Mage.Sets/src/mage/cards/n/NayaHushblade.java index 5a517da0ad8..e42a0764a67 100644 --- a/Mage.Sets/src/mage/cards/n/NayaHushblade.java +++ b/Mage.Sets/src/mage/cards/n/NayaHushblade.java @@ -45,7 +45,7 @@ public final class NayaHushblade extends CardImpl { this.toughness = new MageInt(1); // As long as you control another multicolored permanent, Naya Hushblade gets +1/+1 and has shroud. - 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, Naya Hushblade gets +1/+1")); diff --git a/Mage.Sets/src/mage/cards/n/NazgulBattleMace.java b/Mage.Sets/src/mage/cards/n/NazgulBattleMace.java index 71530e1acd0..3c2c35c3c84 100644 --- a/Mage.Sets/src/mage/cards/n/NazgulBattleMace.java +++ b/Mage.Sets/src/mage/cards/n/NazgulBattleMace.java @@ -37,7 +37,7 @@ public final class NazgulBattleMace extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has menace, deathtouch, annihilator 1, and // "Whenever an opponent sacrifices a nontoken permanent, put that card onto the battlefield under your control unless that player pays 3 life." - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new MenaceAbility(false), AttachmentType.EQUIPMENT)); + Ability ability = new SimpleStaticAbility(new GainAbilityAttachedEffect(new MenaceAbility(false), AttachmentType.EQUIPMENT)); ability.addEffect(new GainAbilityAttachedEffect(DeathtouchAbility.getInstance(), AttachmentType.EQUIPMENT).setText(", deathtouch")); ability.addEffect(new GainAbilityAttachedEffect(new AnnihilatorAbility(1), AttachmentType.EQUIPMENT).setText(", annihilator 1")); Ability sacTriggerAbility = new SacrificePermanentTriggeredAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/n/NearheathPilgrim.java b/Mage.Sets/src/mage/cards/n/NearheathPilgrim.java index 2fbead4d6e3..b43c96320fe 100644 --- a/Mage.Sets/src/mage/cards/n/NearheathPilgrim.java +++ b/Mage.Sets/src/mage/cards/n/NearheathPilgrim.java @@ -32,7 +32,7 @@ public final class NearheathPilgrim extends CardImpl { this.addAbility(new SoulbondAbility()); // As long as Nearheath Pilgrim is paired with another creature, both creatures have lifelink. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(LifelinkAbility.getInstance(), ruleText))); + this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(LifelinkAbility.getInstance(), ruleText))); } private NearheathPilgrim(final NearheathPilgrim card) { diff --git a/Mage.Sets/src/mage/cards/n/NecromancersMagemark.java b/Mage.Sets/src/mage/cards/n/NecromancersMagemark.java index c5cee4a9c47..cc06e02b374 100644 --- a/Mage.Sets/src/mage/cards/n/NecromancersMagemark.java +++ b/Mage.Sets/src/mage/cards/n/NecromancersMagemark.java @@ -51,11 +51,11 @@ public final class NecromancersMagemark extends CardImpl { this.addAbility(ability); // Creatures you control that are enchanted get +1/+1. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false)); + ability = new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false)); this.addAbility(ability); // If a creature you control that's enchanted would die, return it to its owner's hand instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new NecromancersMagemarkEffect())); + this.addAbility(new SimpleStaticAbility(new NecromancersMagemarkEffect())); } private NecromancersMagemark(final NecromancersMagemark card) { diff --git a/Mage.Sets/src/mage/cards/n/Necropotence.java b/Mage.Sets/src/mage/cards/n/Necropotence.java index aa1d5d01af0..b274067b770 100644 --- a/Mage.Sets/src/mage/cards/n/Necropotence.java +++ b/Mage.Sets/src/mage/cards/n/Necropotence.java @@ -37,7 +37,7 @@ public final class Necropotence extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{B}{B}{B}"); // Skip your draw step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipDrawStepEffect())); + this.addAbility(new SimpleStaticAbility(new SkipDrawStepEffect())); // Whenever you discard a card, exile that card from your graveyard. Effect effect = new ExileTargetEffect(null, "", Zone.GRAVEYARD); effect.setText("exile that card from your graveyard"); diff --git a/Mage.Sets/src/mage/cards/n/Necropouncer.java b/Mage.Sets/src/mage/cards/n/Necropouncer.java index e6039571923..8608720f3e0 100644 --- a/Mage.Sets/src/mage/cards/n/Necropouncer.java +++ b/Mage.Sets/src/mage/cards/n/Necropouncer.java @@ -28,8 +28,8 @@ public final class Necropouncer extends CardImpl { this.subtype.add(SubType.EQUIPMENT); this.addAbility(new LivingWeaponAbility()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 1))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(3, 1))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.EQUIPMENT))); this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2), false)); } diff --git a/Mage.Sets/src/mage/cards/n/NecroticPlague.java b/Mage.Sets/src/mage/cards/n/NecroticPlague.java index 1ec867a870c..3827b308fc9 100644 --- a/Mage.Sets/src/mage/cards/n/NecroticPlague.java +++ b/Mage.Sets/src/mage/cards/n/NecroticPlague.java @@ -47,7 +47,7 @@ public final class NecroticPlague extends CardImpl { ability = new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceEffect()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("Enchanted creature has \"At the beginning of your upkeep, sacrifice this creature.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); ability = new DiesAttachedTriggeredAbility(new NecroticPlagueEffect(), "enchanted creature", false); ability.setTargetAdjuster(NecroticPlagueAdjuster.instance); diff --git a/Mage.Sets/src/mage/cards/n/NefariousLich.java b/Mage.Sets/src/mage/cards/n/NefariousLich.java index ca78e08e44e..0fb414f2f4b 100644 --- a/Mage.Sets/src/mage/cards/n/NefariousLich.java +++ b/Mage.Sets/src/mage/cards/n/NefariousLich.java @@ -33,10 +33,10 @@ public final class NefariousLich extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{B}{B}{B}{B}"); // If damage would be dealt to you, exile that many cards from your graveyard instead. If you can't, you lose the game. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new NefariousLichDamageReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new NefariousLichDamageReplacementEffect())); // If you would gain life, draw that many cards instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new NefariousLichLifeGainReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new NefariousLichLifeGainReplacementEffect())); // When Nefarious Lich leaves the battlefield, you lose the game. this.addAbility(new LeavesBattlefieldTriggeredAbility(new LoseGameSourceControllerEffect(), false)); diff --git a/Mage.Sets/src/mage/cards/n/NeglectedHeirloom.java b/Mage.Sets/src/mage/cards/n/NeglectedHeirloom.java index de6abb74770..695aa58165a 100644 --- a/Mage.Sets/src/mage/cards/n/NeglectedHeirloom.java +++ b/Mage.Sets/src/mage/cards/n/NeglectedHeirloom.java @@ -32,7 +32,7 @@ public final class NeglectedHeirloom extends CardImpl { this.secondSideCardClazz = mage.cards.a.AshmouthBlade.class; // Equipped creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 1))); // When equipped creature transforms, transform Neglected Heirloom. this.addAbility(new TransformAbility()); @@ -87,4 +87,4 @@ class NeglectedHeirloomTriggeredAbility extends TriggeredAbilityImpl { public String getRule() { return "When equipped creature transforms, transform Neglected Heirloom."; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/n/NehebTheWorthy.java b/Mage.Sets/src/mage/cards/n/NehebTheWorthy.java index da8cf9a3def..d43b8c12297 100644 --- a/Mage.Sets/src/mage/cards/n/NehebTheWorthy.java +++ b/Mage.Sets/src/mage/cards/n/NehebTheWorthy.java @@ -44,11 +44,11 @@ public final class NehebTheWorthy extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // Other Minotaurs you control have first strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, true))); // As long as you have one or fewer cards in hand, Minotaurs you control get +2/+0. Condition condition = new CardsInHandCondition(ComparisonType.FEWER_THAN, 2); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostControlledEffect(2, 0, Duration.WhileOnBattlefield, filter), condition, "As long as you have one or fewer cards in hand, Minotaurs you control get +2/+0")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NephaliaAcademy.java b/Mage.Sets/src/mage/cards/n/NephaliaAcademy.java index 5561f010295..015e6ccd6f9 100644 --- a/Mage.Sets/src/mage/cards/n/NephaliaAcademy.java +++ b/Mage.Sets/src/mage/cards/n/NephaliaAcademy.java @@ -33,7 +33,7 @@ public final class NephaliaAcademy extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); // If a spell or ability an opponent controls causes you to discard a card, you may reveal that card and put it on top of your library instead of putting it anywhere else. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new NephaliaAcademyEffect())); + this.addAbility(new SimpleStaticAbility(new NephaliaAcademyEffect())); // {T}: Add {C}. this.addAbility(new ColorlessManaAbility()); @@ -135,4 +135,4 @@ class NephaliaAcademyEffect extends ReplacementEffectImpl { return false; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/n/NerfHerder.java b/Mage.Sets/src/mage/cards/n/NerfHerder.java index 4125fb53966..ca46cfaf483 100644 --- a/Mage.Sets/src/mage/cards/n/NerfHerder.java +++ b/Mage.Sets/src/mage/cards/n/NerfHerder.java @@ -29,10 +29,10 @@ public final class NerfHerder extends CardImpl { this.toughness = new MageInt(3); // Monstrosity abilities you activate cost {1} less to activate. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AbilitiesCostReductionControllerEffect(MonstrosityAbility.class, "Monstrosity"))); + this.addAbility(new SimpleStaticAbility(new AbilitiesCostReductionControllerEffect(MonstrosityAbility.class, "Monstrosity"))); // Each creature you control with a +1/+1 counter on it has trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect( TrampleAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_CONTROLLED_CREATURE_P1P1)) diff --git a/Mage.Sets/src/mage/cards/n/NettleSentinel.java b/Mage.Sets/src/mage/cards/n/NettleSentinel.java index bfabea226f9..508273ce673 100644 --- a/Mage.Sets/src/mage/cards/n/NettleSentinel.java +++ b/Mage.Sets/src/mage/cards/n/NettleSentinel.java @@ -37,7 +37,7 @@ public final class NettleSentinel extends CardImpl { this.toughness = new MageInt(2); // Nettle Sentinel doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // Whenever you cast a green spell, you may untap Nettle Sentinel. this.addAbility(new SpellCastControllerTriggeredAbility(new UntapSourceEffect(), filter, true)); } diff --git a/Mage.Sets/src/mage/cards/n/NeurokHoversail.java b/Mage.Sets/src/mage/cards/n/NeurokHoversail.java index 6a0609e91a0..9d68dac88fe 100644 --- a/Mage.Sets/src/mage/cards/n/NeurokHoversail.java +++ b/Mage.Sets/src/mage/cards/n/NeurokHoversail.java @@ -22,7 +22,7 @@ public final class NeurokHoversail extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.EQUIPMENT))); // Equip {2} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); } diff --git a/Mage.Sets/src/mage/cards/n/NeurokSpy.java b/Mage.Sets/src/mage/cards/n/NeurokSpy.java index 57659344b4b..5e36d76ebb0 100644 --- a/Mage.Sets/src/mage/cards/n/NeurokSpy.java +++ b/Mage.Sets/src/mage/cards/n/NeurokSpy.java @@ -34,7 +34,7 @@ public final class NeurokSpy extends CardImpl { new CantBeBlockedSourceEffect(), new DefendingPlayerControlsSourceAttackingCondition(new FilterArtifactPermanent())); effect.setText("{this} can't be blocked as long as defending player controls an artifact"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private NeurokSpy(final NeurokSpy card) { diff --git a/Mage.Sets/src/mage/cards/n/NeurokStealthsuit.java b/Mage.Sets/src/mage/cards/n/NeurokStealthsuit.java index 38224f1f8c4..1d6d5f62e3d 100644 --- a/Mage.Sets/src/mage/cards/n/NeurokStealthsuit.java +++ b/Mage.Sets/src/mage/cards/n/NeurokStealthsuit.java @@ -31,7 +31,7 @@ public final class NeurokStealthsuit extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has shroud. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.EQUIPMENT))); // {U}{U}: Attach Neurok Stealthsuit to target creature you control. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttachEffect(Outcome.BoostCreature, "Attach {this} to target creature you control"), new ManaCostsImpl<>("{U}{U}")); ability.addTarget(new TargetControlledCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/n/Nevermore.java b/Mage.Sets/src/mage/cards/n/Nevermore.java index a43c9036d69..e56992d7d39 100644 --- a/Mage.Sets/src/mage/cards/n/Nevermore.java +++ b/Mage.Sets/src/mage/cards/n/Nevermore.java @@ -30,7 +30,7 @@ public final class Nevermore extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseACardNameEffect(ChooseACardNameEffect.TypeOfName.NON_LAND_NAME))); // The named card can't be cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new NevermoreEffect2())); + this.addAbility(new SimpleStaticAbility(new NevermoreEffect2())); } diff --git a/Mage.Sets/src/mage/cards/n/NewHorizons.java b/Mage.Sets/src/mage/cards/n/NewHorizons.java index 634f76cf786..e75698ce720 100644 --- a/Mage.Sets/src/mage/cards/n/NewHorizons.java +++ b/Mage.Sets/src/mage/cards/n/NewHorizons.java @@ -52,7 +52,7 @@ public final class NewHorizons extends CardImpl { Ability gainedAbility = new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(2), new TapSourceCost()); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA); effect.setText("Enchanted land has \"{T}: Add two mana of any one color.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private NewHorizons(final NewHorizons card) { diff --git a/Mage.Sets/src/mage/cards/n/NewPerspectives.java b/Mage.Sets/src/mage/cards/n/NewPerspectives.java index 5c5974e6bed..5d939edb1ee 100644 --- a/Mage.Sets/src/mage/cards/n/NewPerspectives.java +++ b/Mage.Sets/src/mage/cards/n/NewPerspectives.java @@ -31,7 +31,7 @@ public final class NewPerspectives extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(3))); // As long as you have seven or more cards in hand, you may pay {0} rather than pay cycling costs. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new NewPerspectivesCostModificationEffect())); + this.addAbility(new SimpleStaticAbility(new NewPerspectivesCostModificationEffect())); } private NewPerspectives(final NewPerspectives card) { diff --git a/Mage.Sets/src/mage/cards/n/NezahalPrimalTide.java b/Mage.Sets/src/mage/cards/n/NezahalPrimalTide.java index cbefd0bb256..5bfbdf46d97 100644 --- a/Mage.Sets/src/mage/cards/n/NezahalPrimalTide.java +++ b/Mage.Sets/src/mage/cards/n/NezahalPrimalTide.java @@ -43,7 +43,7 @@ public final class NezahalPrimalTide extends CardImpl { // You have no maximum hand size. Effect effect = new MaximumHandSizeControllerEffect(Integer.MAX_VALUE, Duration.WhileOnBattlefield, MaximumHandSizeControllerEffect.HandSizeModification.SET); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // Whenever an opponent casts a noncreature spell, draw a card. this.addAbility(new SpellCastOpponentTriggeredAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/n/NightMarketGuard.java b/Mage.Sets/src/mage/cards/n/NightMarketGuard.java index 3b560ac06a7..e07ec4859db 100644 --- a/Mage.Sets/src/mage/cards/n/NightMarketGuard.java +++ b/Mage.Sets/src/mage/cards/n/NightMarketGuard.java @@ -26,7 +26,7 @@ public final class NightMarketGuard extends CardImpl { this.toughness = new MageInt(1); // Night Market Guard 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 NightMarketGuard(final NightMarketGuard card) { diff --git a/Mage.Sets/src/mage/cards/n/NightRevelers.java b/Mage.Sets/src/mage/cards/n/NightRevelers.java index f4cf1cec503..14b188d4cb5 100644 --- a/Mage.Sets/src/mage/cards/n/NightRevelers.java +++ b/Mage.Sets/src/mage/cards/n/NightRevelers.java @@ -32,7 +32,7 @@ public final class NightRevelers extends CardImpl { this.toughness = new MageInt(4); // Night Revelers has haste as long as an opponent controls a Human. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilitySourceEffect(HasteAbility.getInstance()), new OpponentControlsPermanentCondition(filter), "{this} has haste as long as an opponent controls a Human."))); diff --git a/Mage.Sets/src/mage/cards/n/NightfireGiant.java b/Mage.Sets/src/mage/cards/n/NightfireGiant.java index 52dc31cd9fb..812bb86f0cb 100644 --- a/Mage.Sets/src/mage/cards/n/NightfireGiant.java +++ b/Mage.Sets/src/mage/cards/n/NightfireGiant.java @@ -38,7 +38,7 @@ public final class NightfireGiant extends CardImpl { this.toughness = new MageInt(3); // Nightfire Giant 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))); // {4}{R}: Nightfire Giant deals 2 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{4}{R}")); diff --git a/Mage.Sets/src/mage/cards/n/NightmareLash.java b/Mage.Sets/src/mage/cards/n/NightmareLash.java index 0a01d2a4fba..9fcf2bf59ce 100644 --- a/Mage.Sets/src/mage/cards/n/NightmareLash.java +++ b/Mage.Sets/src/mage/cards/n/NightmareLash.java @@ -30,7 +30,7 @@ public final class NightmareLash extends CardImpl { // Equipped creature gets +1/+1 for each Swamp you control. PermanentsOnBattlefieldCount value = new PermanentsOnBattlefieldCount(filter); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(value, value))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(value, value))); // Equip-Pay 3 life. this.addAbility(new EquipAbility(Outcome.BoostCreature, new PayLifeCost(3))); } diff --git a/Mage.Sets/src/mage/cards/n/NightscapeFamiliar.java b/Mage.Sets/src/mage/cards/n/NightscapeFamiliar.java index 1965741a116..81129d9e843 100644 --- a/Mage.Sets/src/mage/cards/n/NightscapeFamiliar.java +++ b/Mage.Sets/src/mage/cards/n/NightscapeFamiliar.java @@ -39,7 +39,7 @@ public final class NightscapeFamiliar extends CardImpl { this.toughness = new MageInt(1); // Blue spells and red 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))); // {1}{B}: Regenerate Nightscape Familiar. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); diff --git a/Mage.Sets/src/mage/cards/n/NightshadePeddler.java b/Mage.Sets/src/mage/cards/n/NightshadePeddler.java index e3a429ef041..5fd43bc61cf 100644 --- a/Mage.Sets/src/mage/cards/n/NightshadePeddler.java +++ b/Mage.Sets/src/mage/cards/n/NightshadePeddler.java @@ -32,7 +32,7 @@ public final class NightshadePeddler extends CardImpl { this.addAbility(new SoulbondAbility()); // As long as Nightshade Peddler is paired with another creature, both creatures have deathtouch. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(DeathtouchAbility.getInstance(), ruleText))); + this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(DeathtouchAbility.getInstance(), ruleText))); } private NightshadePeddler(final NightshadePeddler card) { diff --git a/Mage.Sets/src/mage/cards/n/NightveilSpecter.java b/Mage.Sets/src/mage/cards/n/NightveilSpecter.java index 7029580f915..11a910f50bb 100644 --- a/Mage.Sets/src/mage/cards/n/NightveilSpecter.java +++ b/Mage.Sets/src/mage/cards/n/NightveilSpecter.java @@ -53,7 +53,7 @@ public final class NightveilSpecter extends CardImpl { this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new NightveilSpecterExileEffect(), false, true)); // You may play cards exiled with Nightveil Specter. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new NightveilSpecterEffect())); + this.addAbility(new SimpleStaticAbility(new NightveilSpecterEffect())); } private NightveilSpecter(final NightveilSpecter card) { diff --git a/Mage.Sets/src/mage/cards/n/NimLasher.java b/Mage.Sets/src/mage/cards/n/NimLasher.java index 0cca4b2fdcf..db265e19ed0 100644 --- a/Mage.Sets/src/mage/cards/n/NimLasher.java +++ b/Mage.Sets/src/mage/cards/n/NimLasher.java @@ -32,7 +32,7 @@ public final class NimLasher extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), StaticValue.get(0), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), StaticValue.get(0), Duration.WhileOnBattlefield))); } private NimLasher(final NimLasher card) { diff --git a/Mage.Sets/src/mage/cards/n/NimShambler.java b/Mage.Sets/src/mage/cards/n/NimShambler.java index 418134f8a0f..7c5f4c5b515 100644 --- a/Mage.Sets/src/mage/cards/n/NimShambler.java +++ b/Mage.Sets/src/mage/cards/n/NimShambler.java @@ -37,7 +37,7 @@ public final class NimShambler extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), StaticValue.get(0), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), StaticValue.get(0), Duration.WhileOnBattlefield))); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE))); } diff --git a/Mage.Sets/src/mage/cards/n/NimShrieker.java b/Mage.Sets/src/mage/cards/n/NimShrieker.java index 1234bcc8f2a..c7700856b0c 100644 --- a/Mage.Sets/src/mage/cards/n/NimShrieker.java +++ b/Mage.Sets/src/mage/cards/n/NimShrieker.java @@ -34,7 +34,7 @@ public final class NimShrieker extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), StaticValue.get(0), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), StaticValue.get(0), Duration.WhileOnBattlefield))); } private NimShrieker(final NimShrieker card) { diff --git a/Mage.Sets/src/mage/cards/n/NimbusNaiad.java b/Mage.Sets/src/mage/cards/n/NimbusNaiad.java index a3a7671e27d..a255f4c634a 100644 --- a/Mage.Sets/src/mage/cards/n/NimbusNaiad.java +++ b/Mage.Sets/src/mage/cards/n/NimbusNaiad.java @@ -35,7 +35,7 @@ public final class NimbusNaiad extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Enchanted creature gets +2/+2 and has flying. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2,2)); + Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(2,2)); Effect effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText("and has flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/n/NimbusWings.java b/Mage.Sets/src/mage/cards/n/NimbusWings.java index 09ac2f17441..c8cff2bf615 100644 --- a/Mage.Sets/src/mage/cards/n/NimbusWings.java +++ b/Mage.Sets/src/mage/cards/n/NimbusWings.java @@ -37,7 +37,7 @@ public final class NimbusWings extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +1/+2 and has flying. - SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield)); + SimpleStaticAbility ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield)); ability.addEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA).setText("and has flying")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/n/NissasChosen.java b/Mage.Sets/src/mage/cards/n/NissasChosen.java index 4a3480227d0..828d8e5495a 100644 --- a/Mage.Sets/src/mage/cards/n/NissasChosen.java +++ b/Mage.Sets/src/mage/cards/n/NissasChosen.java @@ -35,7 +35,7 @@ public final class NissasChosen extends CardImpl { this.toughness = new MageInt(3); // If Nissa's Chosen would be put into a graveyard from the battlefield, put it on the bottom of its owner's library instead - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new NissasChosenEffect())); + this.addAbility(new SimpleStaticAbility(new NissasChosenEffect())); } private NissasChosen(final NissasChosen card) { diff --git a/Mage.Sets/src/mage/cards/n/NivMizzetVisionary.java b/Mage.Sets/src/mage/cards/n/NivMizzetVisionary.java index a2643509218..226519cb674 100644 --- a/Mage.Sets/src/mage/cards/n/NivMizzetVisionary.java +++ b/Mage.Sets/src/mage/cards/n/NivMizzetVisionary.java @@ -37,7 +37,7 @@ public final class NivMizzetVisionary extends CardImpl { // You have no maximum hand size. Effect effect = new MaximumHandSizeControllerEffect(Integer.MAX_VALUE, Duration.WhileOnBattlefield, MaximumHandSizeControllerEffect.HandSizeModification.SET); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // Whenever a source you control deals noncombat damage to an opponent, you draw that many cards. this.addAbility(new NivMizzetVisionaryAbility()); @@ -89,4 +89,4 @@ class NivMizzetVisionaryAbility extends TriggeredAbilityImpl { public String getRule() { return "Whenever a source you control deals noncombat damage to an opponent, you draw that many cards."; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/n/NobleQuarry.java b/Mage.Sets/src/mage/cards/n/NobleQuarry.java index ad3c5df9201..b80487bf4bf 100644 --- a/Mage.Sets/src/mage/cards/n/NobleQuarry.java +++ b/Mage.Sets/src/mage/cards/n/NobleQuarry.java @@ -36,14 +36,14 @@ public final class NobleQuarry extends CardImpl { // All creatures able to block Noble Quarry or enchanted creature do so. Effect effect = new MustBeBlockedByAllSourceEffect(Duration.WhileOnBattlefield); effect.setText("All creatures able to block Noble Quarry"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new MustBeBlockedByAllAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.AURA); effect.setText("or enchanted creature do so"); ability.addEffect(effect); 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))); } private NobleQuarry(final NobleQuarry card) { diff --git a/Mage.Sets/src/mage/cards/n/NogiDracoZealot.java b/Mage.Sets/src/mage/cards/n/NogiDracoZealot.java index 26a5b8a1096..3c4d704ea80 100644 --- a/Mage.Sets/src/mage/cards/n/NogiDracoZealot.java +++ b/Mage.Sets/src/mage/cards/n/NogiDracoZealot.java @@ -50,7 +50,7 @@ public final class NogiDracoZealot extends CardImpl { this.toughness = new MageInt(3); // Dragon spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter2, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter2, 1))); // Whenever Nogi, Draco-Zealot attacks, if you control three or more Dragons, until end // of turn, Nogi becomes a Dragon with base power and toughness 5/5 and gains flying. diff --git a/Mage.Sets/src/mage/cards/n/NorwoodRiders.java b/Mage.Sets/src/mage/cards/n/NorwoodRiders.java index 09c9fbefbb7..49b102d4d21 100644 --- a/Mage.Sets/src/mage/cards/n/NorwoodRiders.java +++ b/Mage.Sets/src/mage/cards/n/NorwoodRiders.java @@ -24,7 +24,7 @@ public final class NorwoodRiders extends CardImpl { this.toughness = new MageInt(3); // Norwood Riders can't be blocked by more than one creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByMoreThanOneSourceEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByMoreThanOneSourceEffect())); } private NorwoodRiders(final NorwoodRiders card) { diff --git a/Mage.Sets/src/mage/cards/n/NotionThief.java b/Mage.Sets/src/mage/cards/n/NotionThief.java index 53e0fa17ffa..fce9badb5df 100644 --- a/Mage.Sets/src/mage/cards/n/NotionThief.java +++ b/Mage.Sets/src/mage/cards/n/NotionThief.java @@ -37,7 +37,7 @@ public final class NotionThief extends CardImpl { // Flash this.addAbility(FlashAbility.getInstance()); // If an opponent would draw a card except the first one they draw in each of their draw steps, instead that player skips that draw and you draw a card. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new NotionThiefReplacementEffect()), new CardsDrawnDuringDrawStepWatcher()); + this.addAbility(new SimpleStaticAbility(new NotionThiefReplacementEffect()), new CardsDrawnDuringDrawStepWatcher()); } diff --git a/Mage.Sets/src/mage/cards/n/NoviceKnight.java b/Mage.Sets/src/mage/cards/n/NoviceKnight.java index 2144a112ae4..a8f6adfd686 100644 --- a/Mage.Sets/src/mage/cards/n/NoviceKnight.java +++ b/Mage.Sets/src/mage/cards/n/NoviceKnight.java @@ -40,7 +40,7 @@ public final class NoviceKnight extends CardImpl { new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.WhileOnBattlefield), EnchantedOrEquippedSourceCondition.instance); effect.setText("As long as {this} is enchanted or equipped, it can attack as though it didn't have defender"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private NoviceKnight(final NoviceKnight card) { diff --git a/Mage.Sets/src/mage/cards/n/NoxiousField.java b/Mage.Sets/src/mage/cards/n/NoxiousField.java index 9e538f6d818..684ce2056db 100644 --- a/Mage.Sets/src/mage/cards/n/NoxiousField.java +++ b/Mage.Sets/src/mage/cards/n/NoxiousField.java @@ -41,7 +41,7 @@ public final class NoxiousField extends CardImpl { ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(1), new TapSourceCost()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted land has \"{T}: This land deals 1 damage to each creature and each player.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private NoxiousField(final NoxiousField card) { diff --git a/Mage.Sets/src/mage/cards/n/NullChamber.java b/Mage.Sets/src/mage/cards/n/NullChamber.java index 8aff04eb4b2..d3ef25d652c 100644 --- a/Mage.Sets/src/mage/cards/n/NullChamber.java +++ b/Mage.Sets/src/mage/cards/n/NullChamber.java @@ -32,7 +32,7 @@ public final class NullChamber extends CardImpl { // As Null Chamber enters the battlefield, you and an opponent each name a card other than a basic land card. // The named cards can't be played. this.addAbility(new AsEntersBattlefieldAbility(new NullChamberChooseEffect())); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new NullChamberReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new NullChamberReplacementEffect())); } diff --git a/Mage.Sets/src/mage/cards/n/NullProfusion.java b/Mage.Sets/src/mage/cards/n/NullProfusion.java index 2b4847a26d8..67dc0a9641e 100644 --- a/Mage.Sets/src/mage/cards/n/NullProfusion.java +++ b/Mage.Sets/src/mage/cards/n/NullProfusion.java @@ -26,7 +26,7 @@ public final class NullProfusion extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{B}{B}"); // Skip your draw step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipDrawStepEffect())); + this.addAbility(new SimpleStaticAbility(new SkipDrawStepEffect())); // Whenever you play a card, draw a card. this.addAbility(new PlayCardTriggeredAbility(TargetController.YOU, Zone.BATTLEFIELD, @@ -51,4 +51,4 @@ public final class NullProfusion extends CardImpl { public NullProfusion copy() { return new NullProfusion(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/n/NullRod.java b/Mage.Sets/src/mage/cards/n/NullRod.java index 999ef46af54..c0e1e5c0af1 100644 --- a/Mage.Sets/src/mage/cards/n/NullRod.java +++ b/Mage.Sets/src/mage/cards/n/NullRod.java @@ -22,7 +22,7 @@ public final class NullRod extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // Activated abilities of artifacts can't be activated. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new NullRodCantActivateEffect())); + this.addAbility(new SimpleStaticAbility(new NullRodCantActivateEffect())); } private NullRod(final NullRod card) { diff --git a/Mage.Sets/src/mage/cards/n/NumbingDose.java b/Mage.Sets/src/mage/cards/n/NumbingDose.java index 278aa4b95e4..08ce379b385 100644 --- a/Mage.Sets/src/mage/cards/n/NumbingDose.java +++ b/Mage.Sets/src/mage/cards/n/NumbingDose.java @@ -39,7 +39,7 @@ public final class NumbingDose extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted permanent doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect("permanent"))); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect("permanent"))); // At the beginning of the upkeep of enchanted permanent's controller, that player loses 1 life. this.addAbility(new NumbingDoseTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/n/NyleasEmissary.java b/Mage.Sets/src/mage/cards/n/NyleasEmissary.java index 947bdfa00b9..d13b4bdba44 100644 --- a/Mage.Sets/src/mage/cards/n/NyleasEmissary.java +++ b/Mage.Sets/src/mage/cards/n/NyleasEmissary.java @@ -35,7 +35,7 @@ public final class NyleasEmissary extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // Enchanted creature gets +3/+3 and has trample. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3,3, Duration.WhileOnBattlefield)); + Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(3,3, Duration.WhileOnBattlefield)); ability.addEffect(new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield,"and has trample")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NyxInfusion.java b/Mage.Sets/src/mage/cards/n/NyxInfusion.java index 8caf2a5c94b..d749ce11797 100644 --- a/Mage.Sets/src/mage/cards/n/NyxInfusion.java +++ b/Mage.Sets/src/mage/cards/n/NyxInfusion.java @@ -46,7 +46,7 @@ public final class NyxInfusion extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2 as long as it's an enchantment. Otherwise, it gets -2/-2. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostEnchantedEffect(2,2,Duration.WhileOnBattlefield), new BoostEnchantedEffect(-2,-2,Duration.WhileOnBattlefield), new AttachedToMatchesFilterCondition(filter), diff --git a/Mage.Sets/src/mage/cards/n/Nyxathid.java b/Mage.Sets/src/mage/cards/n/Nyxathid.java index 2b460eacaaa..2453b35746c 100644 --- a/Mage.Sets/src/mage/cards/n/Nyxathid.java +++ b/Mage.Sets/src/mage/cards/n/Nyxathid.java @@ -39,7 +39,7 @@ public final class Nyxathid extends CardImpl { // Nyxathid gets -1/-1 for each card in the chosen player's hand. DynamicValue chosenPlayerHand = new SignInversionDynamicValue(new CardsInChosenPlayerHandCount()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(chosenPlayerHand, chosenPlayerHand, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(chosenPlayerHand, chosenPlayerHand, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/n/NyxbornEidolon.java b/Mage.Sets/src/mage/cards/n/NyxbornEidolon.java index 55cb300e8a9..50e945a1639 100644 --- a/Mage.Sets/src/mage/cards/n/NyxbornEidolon.java +++ b/Mage.Sets/src/mage/cards/n/NyxbornEidolon.java @@ -29,7 +29,7 @@ public final class NyxbornEidolon extends CardImpl { // Bestow {4}{B} this.addAbility(new BestowAbility(this, "{4}{B}")); // 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 NyxbornEidolon(final NyxbornEidolon card) { diff --git a/Mage.Sets/src/mage/cards/n/NyxbornRollicker.java b/Mage.Sets/src/mage/cards/n/NyxbornRollicker.java index 5da1b383cd7..249e72c4a6a 100644 --- a/Mage.Sets/src/mage/cards/n/NyxbornRollicker.java +++ b/Mage.Sets/src/mage/cards/n/NyxbornRollicker.java @@ -29,7 +29,7 @@ public final class NyxbornRollicker extends CardImpl { // Bestow {1}{R} this.addAbility(new BestowAbility(this, "{1}{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 NyxbornRollicker(final NyxbornRollicker card) { diff --git a/Mage.Sets/src/mage/cards/n/NyxbornShieldmate.java b/Mage.Sets/src/mage/cards/n/NyxbornShieldmate.java index 8f27bb34798..ba46e110fce 100644 --- a/Mage.Sets/src/mage/cards/n/NyxbornShieldmate.java +++ b/Mage.Sets/src/mage/cards/n/NyxbornShieldmate.java @@ -30,7 +30,7 @@ public final class NyxbornShieldmate extends CardImpl { // Bestow {2}{W} this.addAbility(new BestowAbility(this, "{2}{W}")); // Enchanted creature gets +1/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1,2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1,2, Duration.WhileOnBattlefield))); } private NyxbornShieldmate(final NyxbornShieldmate card) { diff --git a/Mage.Sets/src/mage/cards/n/NyxbornTriton.java b/Mage.Sets/src/mage/cards/n/NyxbornTriton.java index e3972525a70..9028643d777 100644 --- a/Mage.Sets/src/mage/cards/n/NyxbornTriton.java +++ b/Mage.Sets/src/mage/cards/n/NyxbornTriton.java @@ -29,7 +29,7 @@ public final class NyxbornTriton extends CardImpl { // Bestow {4}{U} this.addAbility(new BestowAbility(this, "{4}{U}")); // Enchanted creature gets +2/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2,3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2,3, Duration.WhileOnBattlefield))); } private NyxbornTriton(final NyxbornTriton card) { diff --git a/Mage.Sets/src/mage/cards/n/NyxbornWolf.java b/Mage.Sets/src/mage/cards/n/NyxbornWolf.java index 4ba9f807bf1..1c0fa312ede 100644 --- a/Mage.Sets/src/mage/cards/n/NyxbornWolf.java +++ b/Mage.Sets/src/mage/cards/n/NyxbornWolf.java @@ -29,7 +29,7 @@ public final class NyxbornWolf extends CardImpl { // Bestow {4}{G} this.addAbility(new BestowAbility(this, "{4}{G}")); // Enchanted creature gets +3/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3,1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(3,1, Duration.WhileOnBattlefield))); } private NyxbornWolf(final NyxbornWolf card) { diff --git a/Mage.Sets/src/mage/cards/o/ONaginata.java b/Mage.Sets/src/mage/cards/o/ONaginata.java index 9b82ea987d0..c34f02b7fd9 100644 --- a/Mage.Sets/src/mage/cards/o/ONaginata.java +++ b/Mage.Sets/src/mage/cards/o/ONaginata.java @@ -47,7 +47,7 @@ public final class ONaginata extends CardImpl { // Equipped creature gets +3/+0 and has trample. 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); effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT); effect.setText("and has trample"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/o/OakStreetInnkeeper.java b/Mage.Sets/src/mage/cards/o/OakStreetInnkeeper.java index c88a42b0b68..d023ef9ba24 100644 --- a/Mage.Sets/src/mage/cards/o/OakStreetInnkeeper.java +++ b/Mage.Sets/src/mage/cards/o/OakStreetInnkeeper.java @@ -38,7 +38,7 @@ public final class OakStreetInnkeeper extends CardImpl { this.toughness = new MageInt(2); // As long as it's not your turn, tapped creatures you control have hexproof. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, filter), NotMyTurnCondition.instance, "During turns other than yours, tapped creatures you control have hexproof")) diff --git a/Mage.Sets/src/mage/cards/o/Oakenform.java b/Mage.Sets/src/mage/cards/o/Oakenform.java index 22097f6314e..ee558157a6c 100644 --- a/Mage.Sets/src/mage/cards/o/Oakenform.java +++ b/Mage.Sets/src/mage/cards/o/Oakenform.java @@ -38,7 +38,7 @@ public final class Oakenform extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OakenformEffect())); + this.addAbility(new SimpleStaticAbility(new OakenformEffect())); } private Oakenform(final Oakenform card) { diff --git a/Mage.Sets/src/mage/cards/o/OathOfAjani.java b/Mage.Sets/src/mage/cards/o/OathOfAjani.java index 820aa6d7c0d..5bec9a370ce 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfAjani.java +++ b/Mage.Sets/src/mage/cards/o/OathOfAjani.java @@ -29,7 +29,7 @@ public final class OathOfAjani extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new AddCountersAllEffect(CounterType.P1P1.createInstance(), StaticFilters.FILTER_CONTROLLED_CREATURE))); // Planeswalker spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(new FilterPlaneswalkerCard("Planeswalker spells"), 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(new FilterPlaneswalkerCard("Planeswalker spells"), 1))); } private OathOfAjani(final OathOfAjani card) { diff --git a/Mage.Sets/src/mage/cards/o/OathOfNissa.java b/Mage.Sets/src/mage/cards/o/OathOfNissa.java index 26d8f05d3de..c4427eb8e16 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfNissa.java +++ b/Mage.Sets/src/mage/cards/o/OathOfNissa.java @@ -43,7 +43,7 @@ public final class OathOfNissa extends CardImpl { 3, 1, filter, PutCards.HAND, PutCards.BOTTOM_ANY))); // You may spend mana as though it were mana of any color to cast planeswalker spells. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OathOfNissaSpendAnyManaEffect())); + this.addAbility(new SimpleStaticAbility(new OathOfNissaSpendAnyManaEffect())); } private OathOfNissa(final OathOfNissa card) { diff --git a/Mage.Sets/src/mage/cards/o/OathOfTeferi.java b/Mage.Sets/src/mage/cards/o/OathOfTeferi.java index f95d59b4f3e..1c98d5841ae 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfTeferi.java +++ b/Mage.Sets/src/mage/cards/o/OathOfTeferi.java @@ -31,7 +31,7 @@ public final class OathOfTeferi extends CardImpl { this.addAbility(ability); // You may activate the loyalty abilities of planeswalkers you control twice each turn rather than only once. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OathOfTeferiLoyaltyEffect())); + this.addAbility(new SimpleStaticAbility(new OathOfTeferiLoyaltyEffect())); } private OathOfTeferi(final OathOfTeferi card) { diff --git a/Mage.Sets/src/mage/cards/o/OathkeeperTakenosDaisho.java b/Mage.Sets/src/mage/cards/o/OathkeeperTakenosDaisho.java index 40b82057b97..394111d2089 100644 --- a/Mage.Sets/src/mage/cards/o/OathkeeperTakenosDaisho.java +++ b/Mage.Sets/src/mage/cards/o/OathkeeperTakenosDaisho.java @@ -32,7 +32,7 @@ public final class OathkeeperTakenosDaisho extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +3/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(3, 1, Duration.WhileOnBattlefield))); // Whenever equipped creature dies, return that card to the battlefield under your control if it's a Samurai card. this.addAbility(new DiesAttachedTriggeredAbility(new ConditionalOneShotEffect( diff --git a/Mage.Sets/src/mage/cards/o/OathswornGiant.java b/Mage.Sets/src/mage/cards/o/OathswornGiant.java index 73517a5ce1d..791919a1eb1 100644 --- a/Mage.Sets/src/mage/cards/o/OathswornGiant.java +++ b/Mage.Sets/src/mage/cards/o/OathswornGiant.java @@ -32,7 +32,7 @@ public final class OathswornGiant extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Other creatures you control get +0/+2 and have vigilance. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 2, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, true)); + Ability ability = new SimpleStaticAbility(new BoostControlledEffect(0, 2, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, true)); ability.addEffect(new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, true).setText("and have vigilance")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/o/ObeliskOfUrd.java b/Mage.Sets/src/mage/cards/o/ObeliskOfUrd.java index 12f00cc5427..085dc47f923 100644 --- a/Mage.Sets/src/mage/cards/o/ObeliskOfUrd.java +++ b/Mage.Sets/src/mage/cards/o/ObeliskOfUrd.java @@ -31,7 +31,7 @@ public final class ObeliskOfUrd extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseCreatureTypeEffect(Outcome.BoostCreature))); // Creatures you control of the chosen type get +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ObeliskOfUrdBoostEffect())); + this.addAbility(new SimpleStaticAbility(new ObeliskOfUrdBoostEffect())); } private ObeliskOfUrd(final ObeliskOfUrd card) { diff --git a/Mage.Sets/src/mage/cards/o/OblivionCrown.java b/Mage.Sets/src/mage/cards/o/OblivionCrown.java index efd853c6ad4..a604e4a9b03 100644 --- a/Mage.Sets/src/mage/cards/o/OblivionCrown.java +++ b/Mage.Sets/src/mage/cards/o/OblivionCrown.java @@ -41,7 +41,7 @@ public final class OblivionCrown extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature has "Discard a card: This creature gets +1/+1 until end of turn." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn),new DiscardCardCost()), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn),new DiscardCardCost()), AttachmentType.AURA))); } private OblivionCrown(final OblivionCrown card) { diff --git a/Mage.Sets/src/mage/cards/o/ObscuringAether.java b/Mage.Sets/src/mage/cards/o/ObscuringAether.java index 1cf0f4c7792..1cdd14ad479 100644 --- a/Mage.Sets/src/mage/cards/o/ObscuringAether.java +++ b/Mage.Sets/src/mage/cards/o/ObscuringAether.java @@ -23,7 +23,7 @@ public final class ObscuringAether extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{G}"); // Face-down creature spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FaceDownSpellsCostReductionControllerEffect(1))); + this.addAbility(new SimpleStaticAbility(new FaceDownSpellsCostReductionControllerEffect(1))); // {1}{G}: Turn Obscuring Aether face down. Effect effect = new BecomesFaceDownCreatureEffect(Duration.Custom, BecomesFaceDownCreatureEffect.FaceDownType.MANUAL); diff --git a/Mage.Sets/src/mage/cards/o/ObservantAlseid.java b/Mage.Sets/src/mage/cards/o/ObservantAlseid.java index 298d6b44b66..96427ded201 100644 --- a/Mage.Sets/src/mage/cards/o/ObservantAlseid.java +++ b/Mage.Sets/src/mage/cards/o/ObservantAlseid.java @@ -38,7 +38,7 @@ public final class ObservantAlseid extends CardImpl { // Enchanted creature gets +2/+2 and has vigilance. Effect effect = new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +2/+2"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA); effect.setText("and has vigilance"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/o/ObsidianBattleAxe.java b/Mage.Sets/src/mage/cards/o/ObsidianBattleAxe.java index b6777ae5581..75a92620d1e 100644 --- a/Mage.Sets/src/mage/cards/o/ObsidianBattleAxe.java +++ b/Mage.Sets/src/mage/cards/o/ObsidianBattleAxe.java @@ -31,7 +31,7 @@ public final class ObsidianBattleAxe extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+1 and has haste. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 1)); + Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(2, 1)); ability.addEffect(new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.EQUIPMENT).setText("and has haste")); this.addAbility(ability); // Whenever a Warrior creature enters the battlefield, you may attach Obsidian Battle-Axe to it. diff --git a/Mage.Sets/src/mage/cards/o/ObsidianFireheart.java b/Mage.Sets/src/mage/cards/o/ObsidianFireheart.java index ff90c215b1a..8e0b87090d6 100644 --- a/Mage.Sets/src/mage/cards/o/ObsidianFireheart.java +++ b/Mage.Sets/src/mage/cards/o/ObsidianFireheart.java @@ -104,7 +104,7 @@ class ObsidianFireheartOneShotEffect extends OneShotEffect { Duration.Custom, ""); // add a new independent ability that is not reliant on the source ability - SimpleStaticAbility gainAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + SimpleStaticAbility gainAbility = new SimpleStaticAbility(effect); // set sourcecard of the independent ability to the targeted permanent of the source ability gainAbility.setSourceId(targetLand.getId()); diff --git a/Mage.Sets/src/mage/cards/o/ObstinateFamiliar.java b/Mage.Sets/src/mage/cards/o/ObstinateFamiliar.java index 04f6bc15fb0..4a74b908057 100644 --- a/Mage.Sets/src/mage/cards/o/ObstinateFamiliar.java +++ b/Mage.Sets/src/mage/cards/o/ObstinateFamiliar.java @@ -32,7 +32,7 @@ public final class ObstinateFamiliar extends CardImpl { this.toughness = new MageInt(1); // If you would draw a card, you may skip that draw instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ObstinateFamiliarReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new ObstinateFamiliarReplacementEffect())); } private ObstinateFamiliar(final ObstinateFamiliar card) { diff --git a/Mage.Sets/src/mage/cards/o/Occupation.java b/Mage.Sets/src/mage/cards/o/Occupation.java index 8b4e10f5a2c..bd4c7e121be 100644 --- a/Mage.Sets/src/mage/cards/o/Occupation.java +++ b/Mage.Sets/src/mage/cards/o/Occupation.java @@ -29,7 +29,7 @@ public final class Occupation extends CardImpl { // Creatures your opponents control enter the battlefield tapped. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OccupationTapEffect())); + this.addAbility(new SimpleStaticAbility(new OccupationTapEffect())); // {W}{B}: Target creature can't attack or block this turn, and its activated abilities can't be activated until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/o/OcularHalo.java b/Mage.Sets/src/mage/cards/o/OcularHalo.java index 640c82217fb..85da48fdf04 100644 --- a/Mage.Sets/src/mage/cards/o/OcularHalo.java +++ b/Mage.Sets/src/mage/cards/o/OcularHalo.java @@ -42,7 +42,7 @@ public final class OcularHalo extends CardImpl { // Enchanted creature has "{tap}: Draw a card." Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA))); // {W}: Enchanted creature gains vigilance until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/o/OgreJailbreaker.java b/Mage.Sets/src/mage/cards/o/OgreJailbreaker.java index 63d1d29377b..08a9b831a7a 100644 --- a/Mage.Sets/src/mage/cards/o/OgreJailbreaker.java +++ b/Mage.Sets/src/mage/cards/o/OgreJailbreaker.java @@ -41,7 +41,7 @@ public final class OgreJailbreaker extends CardImpl { new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter)); effect.setText("{this} can attack as though it didn't have defender as long as you control a Gate"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/o/OgreSlumlord.java b/Mage.Sets/src/mage/cards/o/OgreSlumlord.java index 79682ce7275..701c477bef7 100644 --- a/Mage.Sets/src/mage/cards/o/OgreSlumlord.java +++ b/Mage.Sets/src/mage/cards/o/OgreSlumlord.java @@ -46,7 +46,7 @@ public final class OgreSlumlord extends CardImpl { this.addAbility(new DiesCreatureTriggeredAbility(new CreateTokenEffect(new RatToken()), true, filter)); // Rats you control have deathtouch. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield, filter2))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield, filter2))); } diff --git a/Mage.Sets/src/mage/cards/o/OgresCleaver.java b/Mage.Sets/src/mage/cards/o/OgresCleaver.java index 88afb52bcf4..4112b987608 100644 --- a/Mage.Sets/src/mage/cards/o/OgresCleaver.java +++ b/Mage.Sets/src/mage/cards/o/OgresCleaver.java @@ -26,7 +26,7 @@ public final class OgresCleaver extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +5/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(5, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(5, 0))); // Equip {5} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(5), new TargetControlledCreaturePermanent(), false)); diff --git a/Mage.Sets/src/mage/cards/o/OhabiCaleria.java b/Mage.Sets/src/mage/cards/o/OhabiCaleria.java index 927510fb7f5..b92281782d9 100644 --- a/Mage.Sets/src/mage/cards/o/OhabiCaleria.java +++ b/Mage.Sets/src/mage/cards/o/OhabiCaleria.java @@ -35,7 +35,7 @@ public final class OhabiCaleria extends CardImpl { this.addAbility(ReachAbility.getInstance()); // Untap all Archers you control during each other player's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new UntapAllDuringEachOtherPlayersUntapStepEffect(filter))); + this.addAbility(new SimpleStaticAbility(new UntapAllDuringEachOtherPlayersUntapStepEffect(filter))); // Whenever an Archer you control deals damage to a creature, you may pay {2}. If you do, draw a card. this.addAbility(new DealsDamageToACreatureAllTriggeredAbility(new DoIfCostPaid( diff --git a/Mage.Sets/src/mage/cards/o/OketraTheTrue.java b/Mage.Sets/src/mage/cards/o/OketraTheTrue.java index d4ac2891ff4..bc570530c79 100644 --- a/Mage.Sets/src/mage/cards/o/OketraTheTrue.java +++ b/Mage.Sets/src/mage/cards/o/OketraTheTrue.java @@ -41,7 +41,7 @@ public final class OketraTheTrue extends CardImpl { this.addAbility(IndestructibleAbility.getInstance()); // Oketra the True can't attack or block unless you control three or more creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OketraTheTrueRestrictionEffect())); + this.addAbility(new SimpleStaticAbility(new OketraTheTrueRestrictionEffect())); // {3}{W}: Create a 1/1 white Warrior creature token with vigilance. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new WarriorVigilantToken()), new ManaCostsImpl<>("{3}{W}"))); diff --git a/Mage.Sets/src/mage/cards/o/OketrasMonument.java b/Mage.Sets/src/mage/cards/o/OketrasMonument.java index f94e0fbf0d3..5a78c71b598 100644 --- a/Mage.Sets/src/mage/cards/o/OketrasMonument.java +++ b/Mage.Sets/src/mage/cards/o/OketrasMonument.java @@ -40,7 +40,7 @@ public final class OketrasMonument extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // White creature spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); // Whenever you cast a creature spell, create a 1/1 white Warrior creature token with vigilance. this.addAbility(new SpellCastControllerTriggeredAbility(new CreateTokenEffect(new WarriorVigilantToken()), filter2, false)); diff --git a/Mage.Sets/src/mage/cards/o/OkinaNightwatch.java b/Mage.Sets/src/mage/cards/o/OkinaNightwatch.java index 89f0a47decd..1657a2ac65b 100644 --- a/Mage.Sets/src/mage/cards/o/OkinaNightwatch.java +++ b/Mage.Sets/src/mage/cards/o/OkinaNightwatch.java @@ -30,7 +30,7 @@ public final class OkinaNightwatch extends CardImpl { this.toughness = new MageInt(3); // As long as you have more cards in hand than each opponent, Okina Nightwatch gets +3/+3. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(3,3, Duration.WhileOnBattlefield), MoreCardsInHandThanOpponentsCondition.instance, "As long as you have more cards in hand than each opponent, Okina Nightwatch gets +3/+3")); diff --git a/Mage.Sets/src/mage/cards/o/Okk.java b/Mage.Sets/src/mage/cards/o/Okk.java index 2227dc166bd..231e1ee5fee 100644 --- a/Mage.Sets/src/mage/cards/o/Okk.java +++ b/Mage.Sets/src/mage/cards/o/Okk.java @@ -29,10 +29,10 @@ public final class Okk extends CardImpl { this.toughness = new MageInt(4); // Okk can't attack unless a creature with greater power also attacks. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OkkAttackEffect())); + this.addAbility(new SimpleStaticAbility(new OkkAttackEffect())); // Okk can't block unless a creature with greater power also blocks. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OkkBlockEffect())); + this.addAbility(new SimpleStaticAbility(new OkkBlockEffect())); } private Okk(final Okk card) { diff --git a/Mage.Sets/src/mage/cards/o/OmenMachine.java b/Mage.Sets/src/mage/cards/o/OmenMachine.java index 8bf43b24b11..a2ce373418a 100644 --- a/Mage.Sets/src/mage/cards/o/OmenMachine.java +++ b/Mage.Sets/src/mage/cards/o/OmenMachine.java @@ -30,7 +30,7 @@ public final class OmenMachine extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{6}"); // Players can't draw cards. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OmenMachineEffect())); + this.addAbility(new SimpleStaticAbility(new OmenMachineEffect())); // At the beginning of each player's draw step, that player exiles the top card of their library. If it's a land card, the player puts it onto the battlefield. Otherwise, the player casts it without paying its mana cost if able. this.addAbility(new BeginningOfDrawTriggeredAbility(TargetController.EACH_PLAYER, new OmenMachineEffect2(), false)); diff --git a/Mage.Sets/src/mage/cards/o/Omniscience.java b/Mage.Sets/src/mage/cards/o/Omniscience.java index 9d70d342846..bc7b05d2395 100644 --- a/Mage.Sets/src/mage/cards/o/Omniscience.java +++ b/Mage.Sets/src/mage/cards/o/Omniscience.java @@ -19,7 +19,7 @@ public final class Omniscience extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{7}{U}{U}{U}"); // You may cast nonland cards from your hand without paying their mana costs. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CastFromHandWithoutPayingManaCostEffect())); + this.addAbility(new SimpleStaticAbility(new CastFromHandWithoutPayingManaCostEffect())); } private Omniscience(final Omniscience card) { @@ -31,4 +31,3 @@ public final class Omniscience extends CardImpl { return new Omniscience(this); } } - diff --git a/Mage.Sets/src/mage/cards/o/OnSerrasWings.java b/Mage.Sets/src/mage/cards/o/OnSerrasWings.java index 0cc6637979d..9a41de28d10 100644 --- a/Mage.Sets/src/mage/cards/o/OnSerrasWings.java +++ b/Mage.Sets/src/mage/cards/o/OnSerrasWings.java @@ -47,7 +47,7 @@ public final class OnSerrasWings extends CardImpl { // Enchanted creature is legendary, gets +1/+1, and has flying, vigilance, and lifelink. Effect effect = new AddCardSuperTypeAttachedEffect(SuperType.LEGENDARY, Duration.WhileOnBattlefield, AttachmentType.AURA); effect.setText("Enchanted creature is legendary"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); effect = new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield); effect.setText(", gets +1/+1"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/o/OneEyedScarecrow.java b/Mage.Sets/src/mage/cards/o/OneEyedScarecrow.java index 31458be4075..380a34fdf9d 100644 --- a/Mage.Sets/src/mage/cards/o/OneEyedScarecrow.java +++ b/Mage.Sets/src/mage/cards/o/OneEyedScarecrow.java @@ -39,7 +39,7 @@ public final class OneEyedScarecrow extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // Creatures with flying your opponents control get -1/-0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(-1, 0, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(-1, 0, Duration.WhileOnBattlefield, filter, false))); } private OneEyedScarecrow(final OneEyedScarecrow card) { diff --git a/Mage.Sets/src/mage/cards/o/OneThousandLashes.java b/Mage.Sets/src/mage/cards/o/OneThousandLashes.java index 5bd53433bbc..a3ae444aae9 100644 --- a/Mage.Sets/src/mage/cards/o/OneThousandLashes.java +++ b/Mage.Sets/src/mage/cards/o/OneThousandLashes.java @@ -38,7 +38,7 @@ public final class OneThousandLashes extends CardImpl { this.addAbility(ability); // Enchanted creature can't attack or block, and its activated abilities can't be activated. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAttackActivateAttachedEffect())); + this.addAbility(new SimpleStaticAbility(new CantBlockAttackActivateAttachedEffect())); // At the beginning of the upkeep of enchanted creature's controller, that player loses 1 life. this.addAbility(new BeginningOfUpkeepTriggeredAbility(TargetController.CONTROLLER_ATTACHED_TO, new LoseLifeTargetEffect(1), false)); diff --git a/Mage.Sets/src/mage/cards/o/OneWithTheWind.java b/Mage.Sets/src/mage/cards/o/OneWithTheWind.java index 521542a0089..91bfc4703c5 100644 --- a/Mage.Sets/src/mage/cards/o/OneWithTheWind.java +++ b/Mage.Sets/src/mage/cards/o/OneWithTheWind.java @@ -39,7 +39,7 @@ public final class OneWithTheWind extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2 and has flying. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); ability.addEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA) .setText("and has flying")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/Opalescence.java b/Mage.Sets/src/mage/cards/o/Opalescence.java index c4eae3c9c63..f295d59c2ea 100644 --- a/Mage.Sets/src/mage/cards/o/Opalescence.java +++ b/Mage.Sets/src/mage/cards/o/Opalescence.java @@ -24,7 +24,7 @@ public final class Opalescence extends CardImpl { // Each other non-Aura enchantment is a creature with power and // toughness each equal to its converted mana cost. It's still an enchantment. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OpalescenceEffect())); + this.addAbility(new SimpleStaticAbility(new OpalescenceEffect())); } diff --git a/Mage.Sets/src/mage/cards/o/OpalineBracers.java b/Mage.Sets/src/mage/cards/o/OpalineBracers.java index cb56e1a9d35..cfe4f44471f 100644 --- a/Mage.Sets/src/mage/cards/o/OpalineBracers.java +++ b/Mage.Sets/src/mage/cards/o/OpalineBracers.java @@ -29,7 +29,7 @@ public final class OpalineBracers extends CardImpl { // Sunburst this.addAbility(new SunburstAbility(this)); // Equipped creature gets +X/+X, where X is the number of charge counters on Opaline Bracers. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(new CountersSourceCount(CounterType.CHARGE), new CountersSourceCount(CounterType.CHARGE)))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(new CountersSourceCount(CounterType.CHARGE), new CountersSourceCount(CounterType.CHARGE)))); // Equip {2} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2))); } diff --git a/Mage.Sets/src/mage/cards/o/OpenSeason.java b/Mage.Sets/src/mage/cards/o/OpenSeason.java index 0208ee94356..e9dc1a2d342 100644 --- a/Mage.Sets/src/mage/cards/o/OpenSeason.java +++ b/Mage.Sets/src/mage/cards/o/OpenSeason.java @@ -40,7 +40,7 @@ public final class OpenSeason extends CardImpl { this.addAbility(ability); // Creatures your opponent control with bounty counters on them can't activate abilities - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OpenSeasonRestrictionEffect())); + this.addAbility(new SimpleStaticAbility(new OpenSeasonRestrictionEffect())); // Bounty - Whenever a creature an opponent controls with a bounty counter on it dies, that creature's controller loses 2 life. Each other player gains 2 life. this.addAbility(new BountyAbility(new OpenSeasonEffect(), false, true)); diff --git a/Mage.Sets/src/mage/cards/o/OppressiveRays.java b/Mage.Sets/src/mage/cards/o/OppressiveRays.java index 5545f8c7ca0..42e7d097d7c 100644 --- a/Mage.Sets/src/mage/cards/o/OppressiveRays.java +++ b/Mage.Sets/src/mage/cards/o/OppressiveRays.java @@ -36,10 +36,10 @@ public final class OppressiveRays extends CardImpl { this.addAbility(ability); // Enchanted creature can't attack or block unless its controller pays {3}. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockUnlessPaysAttachedEffect(new ManaCostsImpl<>("{3}"), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantAttackBlockUnlessPaysAttachedEffect(new ManaCostsImpl<>("{3}"), AttachmentType.AURA))); // Activated abilities of enchanted creature cost {3} more to activate. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OppressiveRaysCostModificationEffect())); + this.addAbility(new SimpleStaticAbility(new OppressiveRaysCostModificationEffect())); } private OppressiveRays(final OppressiveRays card) { diff --git a/Mage.Sets/src/mage/cards/o/OraclesInsight.java b/Mage.Sets/src/mage/cards/o/OraclesInsight.java index 639c77606c9..acd12b07cd1 100644 --- a/Mage.Sets/src/mage/cards/o/OraclesInsight.java +++ b/Mage.Sets/src/mage/cards/o/OraclesInsight.java @@ -43,7 +43,7 @@ public final class OraclesInsight extends CardImpl { ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1, false), new TapSourceCost()); Effect effect = new DrawCardSourceControllerEffect(1).concatBy(", then"); ability.addEffect(effect); - 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 OraclesInsight(final OraclesInsight card) { diff --git a/Mage.Sets/src/mage/cards/o/OrbsOfWarding.java b/Mage.Sets/src/mage/cards/o/OrbsOfWarding.java index 987dce9141d..d17df355e55 100644 --- a/Mage.Sets/src/mage/cards/o/OrbsOfWarding.java +++ b/Mage.Sets/src/mage/cards/o/OrbsOfWarding.java @@ -26,10 +26,10 @@ public final class OrbsOfWarding extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); // You have hexproof. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControllerEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControllerEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield))); // If a creature would deal damage to you, prevent 1 of that damage. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OrbsOfWardingEffect())); + this.addAbility(new SimpleStaticAbility(new OrbsOfWardingEffect())); } private OrbsOfWarding(final OrbsOfWarding card) { diff --git a/Mage.Sets/src/mage/cards/o/OrcishOriflamme.java b/Mage.Sets/src/mage/cards/o/OrcishOriflamme.java index 8602a2a49f8..d950f8c5d2a 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishOriflamme.java +++ b/Mage.Sets/src/mage/cards/o/OrcishOriflamme.java @@ -24,7 +24,7 @@ public final class OrcishOriflamme extends CardImpl { // Attacking creatures you control get +1/+0. BoostControlledEffect boostEffect = new BoostControlledEffect(1, 0, Duration.WhileOnBattlefield, StaticFilters.FILTER_ATTACKING_CREATURES, false); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, boostEffect)); + this.addAbility(new SimpleStaticAbility(boostEffect)); } private OrcishOriflamme(final OrcishOriflamme card) { diff --git a/Mage.Sets/src/mage/cards/o/OrcishVeteran.java b/Mage.Sets/src/mage/cards/o/OrcishVeteran.java index b741b6f0a27..f9f2397b8fe 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishVeteran.java +++ b/Mage.Sets/src/mage/cards/o/OrcishVeteran.java @@ -41,7 +41,7 @@ public final class OrcishVeteran extends CardImpl { this.toughness = new MageInt(2); // Orcish Veteran can't block white creatures with power 2 or greater. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockCreaturesSourceEffect(filter))); + this.addAbility(new SimpleStaticAbility(new CantBlockCreaturesSourceEffect(filter))); // {R}: Orcish Veteran gains first strike until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); diff --git a/Mage.Sets/src/mage/cards/o/OrderOfTheStars.java b/Mage.Sets/src/mage/cards/o/OrderOfTheStars.java index 847bf439a57..509da316d69 100644 --- a/Mage.Sets/src/mage/cards/o/OrderOfTheStars.java +++ b/Mage.Sets/src/mage/cards/o/OrderOfTheStars.java @@ -35,7 +35,7 @@ public final class OrderOfTheStars extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Benefit))); // Order of the Stars has protection from the chosen color. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ProtectionChosenColorSourceEffect())); + this.addAbility(new SimpleStaticAbility(new ProtectionChosenColorSourceEffect())); } private OrderOfTheStars(final OrderOfTheStars card) { diff --git a/Mage.Sets/src/mage/cards/o/Orgg.java b/Mage.Sets/src/mage/cards/o/Orgg.java index b4fb3b71b5b..c250eafdc0f 100644 --- a/Mage.Sets/src/mage/cards/o/Orgg.java +++ b/Mage.Sets/src/mage/cards/o/Orgg.java @@ -43,11 +43,11 @@ public final class Orgg extends CardImpl { // Orgg can't attack if defending player controls an untapped creature with power 3 or greater. Effect effect = new CantAttackIfDefenderControlsPermanent(filter); effect.setText("{this} can't attack if defending player controls an untapped creature with power 3 or greater."); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // Orgg can't block creatures with power 3 or greater. Effect effectBlock = new CantBlockCreaturesSourceEffect(filter2); effectBlock.setText("{this} can't block creatures with power 3 or greater."); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effectBlock)); + this.addAbility(new SimpleStaticAbility(effectBlock)); } private Orgg(final Orgg card) { diff --git a/Mage.Sets/src/mage/cards/o/OtepecHuntmaster.java b/Mage.Sets/src/mage/cards/o/OtepecHuntmaster.java index 74ccee959ce..60c0b6d85fd 100644 --- a/Mage.Sets/src/mage/cards/o/OtepecHuntmaster.java +++ b/Mage.Sets/src/mage/cards/o/OtepecHuntmaster.java @@ -43,7 +43,7 @@ public final class OtepecHuntmaster extends CardImpl { this.toughness = new MageInt(2); // Dinosaur 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))); // {T}: Target Dinosaur gains haste until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/o/OutlandColossus.java b/Mage.Sets/src/mage/cards/o/OutlandColossus.java index f0868c4a6cc..1e1753ed441 100644 --- a/Mage.Sets/src/mage/cards/o/OutlandColossus.java +++ b/Mage.Sets/src/mage/cards/o/OutlandColossus.java @@ -28,7 +28,7 @@ public final class OutlandColossus extends CardImpl { this.addAbility(new RenownAbility(6)); // Outland Colossus can't be blocked by more than one creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByMoreThanOneSourceEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByMoreThanOneSourceEffect())); } private OutlandColossus(final OutlandColossus card) { diff --git a/Mage.Sets/src/mage/cards/o/OverwhelmingSplendor.java b/Mage.Sets/src/mage/cards/o/OverwhelmingSplendor.java index 5db8c104d1b..b4486f285ad 100644 --- a/Mage.Sets/src/mage/cards/o/OverwhelmingSplendor.java +++ b/Mage.Sets/src/mage/cards/o/OverwhelmingSplendor.java @@ -39,10 +39,10 @@ public final class OverwhelmingSplendor extends CardImpl { this.addAbility(ability); // Creatures enchanted player controls lose all abilities and have base power and toughness 1/1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OverwhelmingSplendorLoseAbilitiesEffect())); + this.addAbility(new SimpleStaticAbility(new OverwhelmingSplendorLoseAbilitiesEffect())); // Enchanted player can't activate abilities that aren't mana abilities or loyalty abilities. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OverwhelmingSplendorCantActivateEffect())); + this.addAbility(new SimpleStaticAbility(new OverwhelmingSplendorCantActivateEffect())); } private OverwhelmingSplendor(final OverwhelmingSplendor card) { diff --git a/Mage.Sets/src/mage/cards/p/Pacifism.java b/Mage.Sets/src/mage/cards/p/Pacifism.java index 00097749539..9abfde0bf86 100644 --- a/Mage.Sets/src/mage/cards/p/Pacifism.java +++ b/Mage.Sets/src/mage/cards/p/Pacifism.java @@ -35,7 +35,7 @@ public final class Pacifism extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack or block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantAttackBlockAttachedEffect(AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/p/PaintersServant.java b/Mage.Sets/src/mage/cards/p/PaintersServant.java index 224b437c726..b61327c63c6 100644 --- a/Mage.Sets/src/mage/cards/p/PaintersServant.java +++ b/Mage.Sets/src/mage/cards/p/PaintersServant.java @@ -35,7 +35,7 @@ public final class PaintersServant extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Detriment))); // All cards that aren't on the battlefield, spells, and permanents are the chosen color in addition to their other colors. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PaintersServantEffect())); + this.addAbility(new SimpleStaticAbility(new PaintersServantEffect())); } private PaintersServant(final PaintersServant card) { diff --git a/Mage.Sets/src/mage/cards/p/PalaceGuard.java b/Mage.Sets/src/mage/cards/p/PalaceGuard.java index f6784d89170..0e7c4c39496 100644 --- a/Mage.Sets/src/mage/cards/p/PalaceGuard.java +++ b/Mage.Sets/src/mage/cards/p/PalaceGuard.java @@ -27,7 +27,7 @@ public final class PalaceGuard extends CardImpl { this.toughness = new MageInt(4); // Palace Guard can block any number of creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(0))); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect(0))); } private PalaceGuard(final PalaceGuard card) { diff --git a/Mage.Sets/src/mage/cards/p/PalisadeGiant.java b/Mage.Sets/src/mage/cards/p/PalisadeGiant.java index f0c3c92f6d0..9b9744866f9 100644 --- a/Mage.Sets/src/mage/cards/p/PalisadeGiant.java +++ b/Mage.Sets/src/mage/cards/p/PalisadeGiant.java @@ -48,7 +48,7 @@ public final class PalisadeGiant extends CardImpl { this.toughness = new MageInt(7); // All damage that would be dealt to you or another permanent you control is dealt to Palisade Giant instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PalisadeGiantReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new PalisadeGiantReplacementEffect())); } private PalisadeGiant(final PalisadeGiant card) { diff --git a/Mage.Sets/src/mage/cards/p/Panharmonicon.java b/Mage.Sets/src/mage/cards/p/Panharmonicon.java index 4702d070fef..239825fbfaa 100644 --- a/Mage.Sets/src/mage/cards/p/Panharmonicon.java +++ b/Mage.Sets/src/mage/cards/p/Panharmonicon.java @@ -26,7 +26,7 @@ public final class Panharmonicon extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // If an artifact or creature entering the battlefield causes a triggered ability of a permanent you control to trigger, that ability triggers an additional time. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PanharmoniconEffect())); + this.addAbility(new SimpleStaticAbility(new PanharmoniconEffect())); } private Panharmonicon(final Panharmonicon card) { diff --git a/Mage.Sets/src/mage/cards/p/PaperTiger.java b/Mage.Sets/src/mage/cards/p/PaperTiger.java index 5e6e7aafbaf..e94a32d5304 100644 --- a/Mage.Sets/src/mage/cards/p/PaperTiger.java +++ b/Mage.Sets/src/mage/cards/p/PaperTiger.java @@ -34,7 +34,7 @@ public final class PaperTiger extends CardImpl { this.toughness = new MageInt(3); // Creatures named Rock Lobster can't attack or block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockAllEffect(Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new CantAttackBlockAllEffect(Duration.WhileOnBattlefield, filter))); } private PaperTiger(final PaperTiger card) { diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfEternalWilds.java b/Mage.Sets/src/mage/cards/p/ParagonOfEternalWilds.java index 0c7a0249789..ad94079ac81 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfEternalWilds.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfEternalWilds.java @@ -50,7 +50,7 @@ public final class ParagonOfEternalWilds extends CardImpl { this.toughness = new MageInt(2); // Other green creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterGreen, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterGreen, true))); // {G}, {t}: Another target green creature you control gains trample until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(TrampleAbility.getInstance(),Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfFierceDefiance.java b/Mage.Sets/src/mage/cards/p/ParagonOfFierceDefiance.java index 82526174dbc..51746395bc3 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfFierceDefiance.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfFierceDefiance.java @@ -48,7 +48,7 @@ public final class ParagonOfFierceDefiance extends CardImpl { this.toughness = new MageInt(2); // Other red creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterCreatures, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterCreatures, true))); // {R}, {T}: Another target red creature you control gains haste until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfGatheringMists.java b/Mage.Sets/src/mage/cards/p/ParagonOfGatheringMists.java index 181afc118bf..c1152c91359 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfGatheringMists.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfGatheringMists.java @@ -50,7 +50,7 @@ public final class ParagonOfGatheringMists extends CardImpl { this.toughness = new MageInt(2); // Other blue creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterBlue, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterBlue, true))); // {U}, {T}: Another target blue creature you control gains flying until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(),Duration.EndOfTurn), new ManaCostsImpl<>("{U}")); diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfNewDawns.java b/Mage.Sets/src/mage/cards/p/ParagonOfNewDawns.java index 29bad7770ee..95dc97cb3c7 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfNewDawns.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfNewDawns.java @@ -50,7 +50,7 @@ public final class ParagonOfNewDawns extends CardImpl { this.toughness = new MageInt(2); // Other white creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1,1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1,1, Duration.WhileOnBattlefield, filter, true))); // {W}, {T}: Another target white creature you control gains vigilance until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfOpenGraves.java b/Mage.Sets/src/mage/cards/p/ParagonOfOpenGraves.java index 50165bfe0ee..76607767b8b 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfOpenGraves.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfOpenGraves.java @@ -48,7 +48,7 @@ public final class ParagonOfOpenGraves extends CardImpl { this.toughness = new MageInt(2); // Other black creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterCreatures, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterCreatures, true))); // {2}{B}, {T}: Another target black creature you control gains deathtouch until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}")); diff --git a/Mage.Sets/src/mage/cards/p/ParallaxDementia.java b/Mage.Sets/src/mage/cards/p/ParallaxDementia.java index 453a3e3fac5..e4ccd023069 100644 --- a/Mage.Sets/src/mage/cards/p/ParallaxDementia.java +++ b/Mage.Sets/src/mage/cards/p/ParallaxDementia.java @@ -39,7 +39,7 @@ public final class ParallaxDementia extends CardImpl { // Fading 1 this.addAbility(new FadingAbility(1, this)); // Enchanted creature gets +3/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(3, 2, Duration.WhileOnBattlefield))); // When Parallax Dementia leaves the battlefield, destroy enchanted creature. That creature can't be regenerated. this.addAbility(new LeavesBattlefieldTriggeredAbility(new DestroyAttachedToEffect("enchanted creature", true), false)); } diff --git a/Mage.Sets/src/mage/cards/p/ParallelLives.java b/Mage.Sets/src/mage/cards/p/ParallelLives.java index fe9202525b9..685a251ec8e 100644 --- a/Mage.Sets/src/mage/cards/p/ParallelLives.java +++ b/Mage.Sets/src/mage/cards/p/ParallelLives.java @@ -19,7 +19,7 @@ public final class ParallelLives extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{G}"); // If an effect would create one or more tokens under your control, it creates twice that many of those tokens instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CreateTwiceThatManyTokensEffect())); + this.addAbility(new SimpleStaticAbility(new CreateTwiceThatManyTokensEffect())); } private ParallelLives(final ParallelLives card) { diff --git a/Mage.Sets/src/mage/cards/p/ParallelThoughts.java b/Mage.Sets/src/mage/cards/p/ParallelThoughts.java index f07d1c71809..8d8e5c29245 100644 --- a/Mage.Sets/src/mage/cards/p/ParallelThoughts.java +++ b/Mage.Sets/src/mage/cards/p/ParallelThoughts.java @@ -37,7 +37,7 @@ public final class ParallelThoughts extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new ParallelThoughtsSearchEffect())); // If you would draw a card, you may instead put the top card of the pile you exiled into your hand. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ParallelThoughtsReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new ParallelThoughtsReplacementEffect())); } diff --git a/Mage.Sets/src/mage/cards/p/Paralyze.java b/Mage.Sets/src/mage/cards/p/Paralyze.java index 5636aa850c1..2001a3a5e5a 100644 --- a/Mage.Sets/src/mage/cards/p/Paralyze.java +++ b/Mage.Sets/src/mage/cards/p/Paralyze.java @@ -38,7 +38,7 @@ public final class Paralyze extends CardImpl { // When Paralyze enters the battlefield, tap enchanted creature. 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())); // At the beginning of the upkeep of enchanted creature's controller, that player may pay {4}. If they do, untap the creature. this.addAbility(new BeginningOfUpkeepTriggeredAbility(TargetController.CONTROLLER_ATTACHED_TO, new ParalyzeEffect(), false)); } diff --git a/Mage.Sets/src/mage/cards/p/ParalyzingGrasp.java b/Mage.Sets/src/mage/cards/p/ParalyzingGrasp.java index 7f023cfd984..d4c188a8caf 100644 --- a/Mage.Sets/src/mage/cards/p/ParalyzingGrasp.java +++ b/Mage.Sets/src/mage/cards/p/ParalyzingGrasp.java @@ -32,7 +32,7 @@ public final class ParalyzingGrasp extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); 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 ParalyzingGrasp(final ParalyzingGrasp card) { diff --git a/Mage.Sets/src/mage/cards/p/ParanoidParishBlade.java b/Mage.Sets/src/mage/cards/p/ParanoidParishBlade.java index 88c827fd11d..fe65991fa3f 100644 --- a/Mage.Sets/src/mage/cards/p/ParanoidParishBlade.java +++ b/Mage.Sets/src/mage/cards/p/ParanoidParishBlade.java @@ -34,7 +34,7 @@ public final class ParanoidParishBlade extends CardImpl { ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostSourceEffect(1, 0, Duration.WhileOnBattlefield), DeliriumCondition.instance, "Delirium — {this} gets +1/+0 "); effect.setText("Delirium — {this} gets +1/+0"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield), DeliriumCondition.instance, "and has first strike as long as there are four or more card types among cards in your graveyard."); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/p/Parapet.java b/Mage.Sets/src/mage/cards/p/Parapet.java index 17cdad773ac..fa524f5c9fd 100644 --- a/Mage.Sets/src/mage/cards/p/Parapet.java +++ b/Mage.Sets/src/mage/cards/p/Parapet.java @@ -25,7 +25,7 @@ public final class Parapet extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.ALL, new CastAsThoughItHadFlashSourceEffect(Duration.EndOfGame))); this.addAbility(new SacrificeIfCastAtInstantTimeTriggeredAbility()); // Creatures you control get +0/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield))); } private Parapet(final Parapet card) { diff --git a/Mage.Sets/src/mage/cards/p/Pariah.java b/Mage.Sets/src/mage/cards/p/Pariah.java index 52cf22f9186..08aef9f7a12 100644 --- a/Mage.Sets/src/mage/cards/p/Pariah.java +++ b/Mage.Sets/src/mage/cards/p/Pariah.java @@ -38,7 +38,7 @@ public final class Pariah extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // All damage that would be dealt to you is dealt to enchanted creature instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PariahEffect())); + this.addAbility(new SimpleStaticAbility(new PariahEffect())); } private Pariah(final Pariah card) { diff --git a/Mage.Sets/src/mage/cards/p/PariahsShield.java b/Mage.Sets/src/mage/cards/p/PariahsShield.java index c5b86b302bb..7781598f30e 100644 --- a/Mage.Sets/src/mage/cards/p/PariahsShield.java +++ b/Mage.Sets/src/mage/cards/p/PariahsShield.java @@ -31,7 +31,7 @@ public final class PariahsShield extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // All damage that would be dealt to you is dealt to equipped creature instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PariahsShieldEffect())); + this.addAbility(new SimpleStaticAbility(new PariahsShieldEffect())); // Equip {3} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(3), new TargetControlledCreaturePermanent(), false)); diff --git a/Mage.Sets/src/mage/cards/p/PathbreakerWurm.java b/Mage.Sets/src/mage/cards/p/PathbreakerWurm.java index 6cd03162f76..a700d8d3ba4 100644 --- a/Mage.Sets/src/mage/cards/p/PathbreakerWurm.java +++ b/Mage.Sets/src/mage/cards/p/PathbreakerWurm.java @@ -31,7 +31,7 @@ public final class PathbreakerWurm extends CardImpl { this.addAbility(new SoulbondAbility()); // As long as Pathbreaker Wurm is paired with another creature, both creatures have trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(TrampleAbility.getInstance(), ruleText))); + this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(TrampleAbility.getInstance(), ruleText))); } diff --git a/Mage.Sets/src/mage/cards/p/PathrazerOfUlamog.java b/Mage.Sets/src/mage/cards/p/PathrazerOfUlamog.java index 58aea58cd4e..7a9d6c7bac4 100644 --- a/Mage.Sets/src/mage/cards/p/PathrazerOfUlamog.java +++ b/Mage.Sets/src/mage/cards/p/PathrazerOfUlamog.java @@ -27,7 +27,7 @@ public final class PathrazerOfUlamog extends CardImpl { this.addAbility(new AnnihilatorAbility(3)); // Pathrazer of Ulamog can't be blocked except by three or more creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(3))); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByOneEffect(3))); } private PathrazerOfUlamog(final PathrazerOfUlamog card) { diff --git a/Mage.Sets/src/mage/cards/p/PathwayArrows.java b/Mage.Sets/src/mage/cards/p/PathwayArrows.java index 1868b561f6a..fd7ad2eebe1 100644 --- a/Mage.Sets/src/mage/cards/p/PathwayArrows.java +++ b/Mage.Sets/src/mage/cards/p/PathwayArrows.java @@ -36,7 +36,7 @@ public final class PathwayArrows extends CardImpl { SimpleActivatedAbility ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PathwayArrowsEffect(), new GenericManaCost(2)); ability2.addCost(new TapSourceCost()); ability2.addTarget(new TargetCreaturePermanent()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability2, AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability2, AttachmentType.EQUIPMENT))); // Equip {2} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2), false)); diff --git a/Mage.Sets/src/mage/cards/p/Peacekeeper.java b/Mage.Sets/src/mage/cards/p/Peacekeeper.java index ae8ef2e8759..499ddc7e95b 100644 --- a/Mage.Sets/src/mage/cards/p/Peacekeeper.java +++ b/Mage.Sets/src/mage/cards/p/Peacekeeper.java @@ -31,7 +31,7 @@ public final class Peacekeeper extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{1}{W}")))); // Creatures can't attack. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PeacekeeperCantAttackEffect())); + this.addAbility(new SimpleStaticAbility(new PeacekeeperCantAttackEffect())); } private Peacekeeper(final Peacekeeper card) { diff --git a/Mage.Sets/src/mage/cards/p/PearlMedallion.java b/Mage.Sets/src/mage/cards/p/PearlMedallion.java index d73b4db6f82..1542761f63b 100644 --- a/Mage.Sets/src/mage/cards/p/PearlMedallion.java +++ b/Mage.Sets/src/mage/cards/p/PearlMedallion.java @@ -27,7 +27,7 @@ public final class PearlMedallion extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // White 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 PearlMedallion(final PearlMedallion card) { diff --git a/Mage.Sets/src/mage/cards/p/PendrellFlux.java b/Mage.Sets/src/mage/cards/p/PendrellFlux.java index 22934917988..6ee339cde61 100644 --- a/Mage.Sets/src/mage/cards/p/PendrellFlux.java +++ b/Mage.Sets/src/mage/cards/p/PendrellFlux.java @@ -42,7 +42,7 @@ public final class PendrellFlux extends CardImpl { ability = new BeginningOfUpkeepTriggeredAbility(new PendrellFluxEffect()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted creature has \"At the beginning of your upkeep, sacrifice this creature unless you pay its mana cost.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private PendrellFlux(final PendrellFlux card) { diff --git a/Mage.Sets/src/mage/cards/p/PendrellMists.java b/Mage.Sets/src/mage/cards/p/PendrellMists.java index 24067280037..0dc75abf753 100644 --- a/Mage.Sets/src/mage/cards/p/PendrellMists.java +++ b/Mage.Sets/src/mage/cards/p/PendrellMists.java @@ -26,7 +26,7 @@ public final class PendrellMists extends CardImpl { // All creatures have "At the beginning of your upkeep, sacrifice this creature unless you pay {1}." Ability gainedAbility = new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new GenericManaCost(1))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(gainedAbility, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(gainedAbility, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, "All creatures have \"At the beginning of your upkeep, sacrifice this creature unless you pay {1}.\""))); } diff --git a/Mage.Sets/src/mage/cards/p/PennonBlade.java b/Mage.Sets/src/mage/cards/p/PennonBlade.java index 84891c2f587..fe3b9d79412 100644 --- a/Mage.Sets/src/mage/cards/p/PennonBlade.java +++ b/Mage.Sets/src/mage/cards/p/PennonBlade.java @@ -26,7 +26,7 @@ public final class PennonBlade extends CardImpl { // Equipped creature gets +1/+1 for each creature you control. PermanentsOnBattlefieldCount value = new PermanentsOnBattlefieldCount(StaticFilters.FILTER_CONTROLLED_CREATURE); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(value, value))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(value, value))); // Equip {4} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(4))); diff --git a/Mage.Sets/src/mage/cards/p/PentarchWard.java b/Mage.Sets/src/mage/cards/p/PentarchWard.java index df956aca09a..89ab9eabcd4 100644 --- a/Mage.Sets/src/mage/cards/p/PentarchWard.java +++ b/Mage.Sets/src/mage/cards/p/PentarchWard.java @@ -42,7 +42,7 @@ public final class PentarchWard extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Benefit))); // Enchanted creature has protection from the chosen color. This effect doesn't remove Pentarch Ward. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ProtectionChosenColorAttachedEffect(true))); + this.addAbility(new SimpleStaticAbility(new ProtectionChosenColorAttachedEffect(true))); } private PentarchWard(final PentarchWard card) { diff --git a/Mage.Sets/src/mage/cards/p/PeregrineMask.java b/Mage.Sets/src/mage/cards/p/PeregrineMask.java index 885eed83312..675478a18b8 100644 --- a/Mage.Sets/src/mage/cards/p/PeregrineMask.java +++ b/Mage.Sets/src/mage/cards/p/PeregrineMask.java @@ -24,7 +24,7 @@ public final class PeregrineMask extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); this.subtype.add(SubType.EQUIPMENT); // Equipped creature has defender, flying, and first strike. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DefenderAbility.getInstance(), AttachmentType.EQUIPMENT)); + Ability ability = new SimpleStaticAbility(new GainAbilityAttachedEffect(DefenderAbility.getInstance(), AttachmentType.EQUIPMENT)); ability.addEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.EQUIPMENT).setText(", flying")); ability.addEffect(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT).setText(", and first strike")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PersonalSanctuary.java b/Mage.Sets/src/mage/cards/p/PersonalSanctuary.java index 19e0037df37..6dc513854e7 100644 --- a/Mage.Sets/src/mage/cards/p/PersonalSanctuary.java +++ b/Mage.Sets/src/mage/cards/p/PersonalSanctuary.java @@ -26,7 +26,7 @@ public final class PersonalSanctuary extends CardImpl { // During your turn, prevent all damage that would be dealt to you. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PersonalSanctuaryEffect())); + this.addAbility(new SimpleStaticAbility(new PersonalSanctuaryEffect())); } private PersonalSanctuary(final PersonalSanctuary card) { diff --git a/Mage.Sets/src/mage/cards/p/Persuasion.java b/Mage.Sets/src/mage/cards/p/Persuasion.java index 508515296ab..defc79c27ad 100644 --- a/Mage.Sets/src/mage/cards/p/Persuasion.java +++ b/Mage.Sets/src/mage/cards/p/Persuasion.java @@ -35,7 +35,7 @@ public final class Persuasion extends CardImpl { this.addAbility(ability); // You control enchanted creature. - Ability controlAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect()); + Ability controlAbility = new SimpleStaticAbility(new ControlEnchantedEffect()); this.addAbility(controlAbility); } diff --git a/Mage.Sets/src/mage/cards/p/PetrifiedPlating.java b/Mage.Sets/src/mage/cards/p/PetrifiedPlating.java index 1fdd666580f..c9de657f668 100644 --- a/Mage.Sets/src/mage/cards/p/PetrifiedPlating.java +++ b/Mage.Sets/src/mage/cards/p/PetrifiedPlating.java @@ -37,7 +37,7 @@ public final class PetrifiedPlating 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))); // Suspend 2-{G} this.addAbility(new SuspendAbility(2, new ManaCostsImpl<>("{G}"), this)); diff --git a/Mage.Sets/src/mage/cards/p/PhantasmalTerrain.java b/Mage.Sets/src/mage/cards/p/PhantasmalTerrain.java index 65008b845e7..f0954f5b7b9 100644 --- a/Mage.Sets/src/mage/cards/p/PhantasmalTerrain.java +++ b/Mage.Sets/src/mage/cards/p/PhantasmalTerrain.java @@ -37,7 +37,7 @@ public final class PhantasmalTerrain extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseBasicLandTypeEffect(Outcome.Neutral))); // Enchanted land is the chosen type. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PhantasmalTerrainContinuousEffect())); + this.addAbility(new SimpleStaticAbility(new PhantasmalTerrainContinuousEffect())); } private PhantasmalTerrain(final PhantasmalTerrain card) { diff --git a/Mage.Sets/src/mage/cards/p/PhantomGeneral.java b/Mage.Sets/src/mage/cards/p/PhantomGeneral.java index d15214f8364..726cebdc41a 100644 --- a/Mage.Sets/src/mage/cards/p/PhantomGeneral.java +++ b/Mage.Sets/src/mage/cards/p/PhantomGeneral.java @@ -36,7 +36,7 @@ public final class PhantomGeneral extends CardImpl { this.toughness = new MageInt(3); // Creature tokens you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); } private PhantomGeneral(final PhantomGeneral card) { diff --git a/Mage.Sets/src/mage/cards/p/PheresBandWarchief.java b/Mage.Sets/src/mage/cards/p/PheresBandWarchief.java index 38e52edf414..50494fdba52 100644 --- a/Mage.Sets/src/mage/cards/p/PheresBandWarchief.java +++ b/Mage.Sets/src/mage/cards/p/PheresBandWarchief.java @@ -43,7 +43,7 @@ public final class PheresBandWarchief extends CardImpl { // Other Centaur creatures you control get +1/+1 and have vigilance and trample. Effect effect = new BoostControlledEffect(1,1,Duration.WhileOnBattlefield, filter, true); effect.setText("Other Centaur creatures you control get +1/+1"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filter, true); effect.setText("and have vigilance"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/p/PhialOfGaladriel.java b/Mage.Sets/src/mage/cards/p/PhialOfGaladriel.java index 6be2f001124..c91fa0fdc2f 100644 --- a/Mage.Sets/src/mage/cards/p/PhialOfGaladriel.java +++ b/Mage.Sets/src/mage/cards/p/PhialOfGaladriel.java @@ -26,9 +26,9 @@ public final class PhialOfGaladriel extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // If you would draw a card while you have no cards in hand, draw two cards instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PhialOfGaladrielDrawEffect())); + this.addAbility(new SimpleStaticAbility(new PhialOfGaladrielDrawEffect())); // If you would gain life while you have 5 or less life, you gain twice that much life instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PhialOfGaladrielLifeEffect())); + this.addAbility(new SimpleStaticAbility(new PhialOfGaladrielLifeEffect())); // {T}: Add one mana of any color. this.addAbility(new AnyColorManaAbility()); diff --git a/Mage.Sets/src/mage/cards/p/Phyresis.java b/Mage.Sets/src/mage/cards/p/Phyresis.java index 159289380fc..529713114ac 100644 --- a/Mage.Sets/src/mage/cards/p/Phyresis.java +++ b/Mage.Sets/src/mage/cards/p/Phyresis.java @@ -36,7 +36,7 @@ public final class Phyresis extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(InfectAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(InfectAbility.getInstance(), AttachmentType.AURA))); } private Phyresis(final Phyresis card) { diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianColossus.java b/Mage.Sets/src/mage/cards/p/PhyrexianColossus.java index 41efa4e30eb..25ceb423688 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianColossus.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianColossus.java @@ -29,12 +29,12 @@ public final class PhyrexianColossus extends CardImpl { this.toughness = new MageInt(8); // {this} doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // Pay 8 life: Untap {this}. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new PayLifeCost(8))); // {this} can't be blocked except by three or more creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(3))); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByOneEffect(3))); } diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianHydra.java b/Mage.Sets/src/mage/cards/p/PhyrexianHydra.java index 0b0f709c5a4..e5007931682 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianHydra.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianHydra.java @@ -35,7 +35,7 @@ public final class PhyrexianHydra extends CardImpl { this.toughness = new MageInt(7); this.addAbility(InfectAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PhyrexianHydraEffect())); + this.addAbility(new SimpleStaticAbility(new PhyrexianHydraEffect())); } private PhyrexianHydra(final PhyrexianHydra card) { diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianIngester.java b/Mage.Sets/src/mage/cards/p/PhyrexianIngester.java index a87d0520b24..1c762f83a4b 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianIngester.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianIngester.java @@ -46,7 +46,7 @@ public final class PhyrexianIngester extends CardImpl { ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability.setAbilityWord(AbilityWord.IMPRINT)); // Phyrexian Ingester gets +X/+Y, where X is the exiled creature card's power and Y is its toughness. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PhyrexianIngesterBoostEffect())); + this.addAbility(new SimpleStaticAbility(new PhyrexianIngesterBoostEffect())); } private PhyrexianIngester(final PhyrexianIngester card) { diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianIronfoot.java b/Mage.Sets/src/mage/cards/p/PhyrexianIronfoot.java index 38c33bae450..f9279a3717b 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianIronfoot.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianIronfoot.java @@ -30,7 +30,7 @@ public final class PhyrexianIronfoot extends CardImpl { this.toughness = new MageInt(4); // Phyrexian Ironfoot doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // {1}{S}: Untap Phyrexian Ironfoot. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl<>("{1}{S}"))); diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianMarauder.java b/Mage.Sets/src/mage/cards/p/PhyrexianMarauder.java index 92f78dd6861..23b31535119 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianMarauder.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianMarauder.java @@ -41,7 +41,7 @@ public final class PhyrexianMarauder extends CardImpl { this.addAbility(new CantBlockAbility()); // Phyrexian Marauder can't attack unless you pay {1} for each +1/+1 counter on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PhyrexianMarauderCantAttackUnlessYouPayEffect())); + this.addAbility(new SimpleStaticAbility(new PhyrexianMarauderCantAttackUnlessYouPayEffect())); } private PhyrexianMarauder(final PhyrexianMarauder card) { diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianRevoker.java b/Mage.Sets/src/mage/cards/p/PhyrexianRevoker.java index 9965bac5cb2..8b46b429c85 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianRevoker.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianRevoker.java @@ -34,7 +34,7 @@ public final class PhyrexianRevoker extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseACardNameEffect(ChooseACardNameEffect.TypeOfName.NON_LAND_NAME))); // Activated abilities of sources with the chosen name can't be activated. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PhyrexianRevokerEffect2())); + this.addAbility(new SimpleStaticAbility(new PhyrexianRevokerEffect2())); } private PhyrexianRevoker(final PhyrexianRevoker card) { diff --git a/Mage.Sets/src/mage/cards/p/Phytohydra.java b/Mage.Sets/src/mage/cards/p/Phytohydra.java index 0c7c02f48f6..3a38bfc4c23 100644 --- a/Mage.Sets/src/mage/cards/p/Phytohydra.java +++ b/Mage.Sets/src/mage/cards/p/Phytohydra.java @@ -30,7 +30,7 @@ public final class Phytohydra extends CardImpl { this.toughness = new MageInt(1); // If damage would be dealt to Phytohydra, put that many +1/+1 counters on it instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PhytohydraEffect())); + this.addAbility(new SimpleStaticAbility(new PhytohydraEffect())); } private Phytohydra(final Phytohydra card) { diff --git a/Mage.Sets/src/mage/cards/p/Piety.java b/Mage.Sets/src/mage/cards/p/Piety.java index 4f3002407ff..c72682382ed 100644 --- a/Mage.Sets/src/mage/cards/p/Piety.java +++ b/Mage.Sets/src/mage/cards/p/Piety.java @@ -23,7 +23,7 @@ public final class Piety extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{W}"); // Blocking creatures get +0/+3 until end of turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(0, 3, Duration.EndOfTurn, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(0, 3, Duration.EndOfTurn, filter, false))); } private Piety(final Piety card) { diff --git a/Mage.Sets/src/mage/cards/p/PillarOfWar.java b/Mage.Sets/src/mage/cards/p/PillarOfWar.java index 4b44cd5a64f..2f3e17cc245 100644 --- a/Mage.Sets/src/mage/cards/p/PillarOfWar.java +++ b/Mage.Sets/src/mage/cards/p/PillarOfWar.java @@ -36,7 +36,7 @@ public final class PillarOfWar extends CardImpl { new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.WhileOnBattlefield), new EnchantedSourceCondition()); effect.setText("As long as {this} is enchanted, it can attack as though it didn't have defender"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/p/PilloryOfTheSleepless.java b/Mage.Sets/src/mage/cards/p/PilloryOfTheSleepless.java index e0b131fcebd..d93acb4894a 100644 --- a/Mage.Sets/src/mage/cards/p/PilloryOfTheSleepless.java +++ b/Mage.Sets/src/mage/cards/p/PilloryOfTheSleepless.java @@ -38,10 +38,10 @@ public final class PilloryOfTheSleepless extends CardImpl { this.addAbility(ability); // Enchanted creature can't attack or block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantAttackBlockAttachedEffect(AttachmentType.AURA))); // Enchanted creature has "At the beginning of your upkeep, you lose 1 life." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect( new BeginningOfUpkeepTriggeredAbility(new LoseLifeSourceControllerEffect(1)), AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/p/PinToTheEarth.java b/Mage.Sets/src/mage/cards/p/PinToTheEarth.java index 2133aed83da..03ebf30b165 100644 --- a/Mage.Sets/src/mage/cards/p/PinToTheEarth.java +++ b/Mage.Sets/src/mage/cards/p/PinToTheEarth.java @@ -36,7 +36,7 @@ public final class PinToTheEarth extends CardImpl { this.addAbility(ability); // Enchanted creature gets -6/-0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-6,-0,Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-6,-0,Duration.WhileOnBattlefield))); } private PinToTheEarth(final PinToTheEarth card) { diff --git a/Mage.Sets/src/mage/cards/p/PiousInterdiction.java b/Mage.Sets/src/mage/cards/p/PiousInterdiction.java index ce7769ef551..a38b7c0f8ea 100644 --- a/Mage.Sets/src/mage/cards/p/PiousInterdiction.java +++ b/Mage.Sets/src/mage/cards/p/PiousInterdiction.java @@ -41,7 +41,7 @@ public final class PiousInterdiction extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new GainLifeEffect(2))); // Enchanted creature can't attack or block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantAttackBlockAttachedEffect(AttachmentType.AURA))); } private PiousInterdiction(final PiousInterdiction card) { diff --git a/Mage.Sets/src/mage/cards/p/PirateShip.java b/Mage.Sets/src/mage/cards/p/PirateShip.java index c19d5d82269..c18df14e5a1 100644 --- a/Mage.Sets/src/mage/cards/p/PirateShip.java +++ b/Mage.Sets/src/mage/cards/p/PirateShip.java @@ -34,7 +34,7 @@ public final class PirateShip extends CardImpl { this.toughness = new MageInt(3); // Pirate Ship 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")))); // {tap}: Pirate Ship deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/p/PiratesCutlass.java b/Mage.Sets/src/mage/cards/p/PiratesCutlass.java index b5036ff0401..297261171d2 100644 --- a/Mage.Sets/src/mage/cards/p/PiratesCutlass.java +++ b/Mage.Sets/src/mage/cards/p/PiratesCutlass.java @@ -33,7 +33,7 @@ public final class PiratesCutlass extends CardImpl { this.addAbility(new EntersBattlefieldAttachToTarget(filter)); // Equipped creature gets +2/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 1))); // Equip 2 this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); diff --git a/Mage.Sets/src/mage/cards/p/PistonSledge.java b/Mage.Sets/src/mage/cards/p/PistonSledge.java index 980e6e44ac4..735855e836c 100644 --- a/Mage.Sets/src/mage/cards/p/PistonSledge.java +++ b/Mage.Sets/src/mage/cards/p/PistonSledge.java @@ -37,7 +37,7 @@ public final class PistonSledge extends CardImpl { this.addAbility(new EntersBattlefieldAttachToTarget()); // Equipped creature gets +3/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(3, 1))); // Equip—Sacrifice an artifact. this.addAbility(new EquipAbility(Outcome.AddAbility, new SacrificeTargetCost(filter), false)); diff --git a/Mage.Sets/src/mage/cards/p/PithingNeedle.java b/Mage.Sets/src/mage/cards/p/PithingNeedle.java index 29ece3c81d2..28f9ce04f5a 100644 --- a/Mage.Sets/src/mage/cards/p/PithingNeedle.java +++ b/Mage.Sets/src/mage/cards/p/PithingNeedle.java @@ -31,7 +31,7 @@ public final class PithingNeedle extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseACardNameEffect(ChooseACardNameEffect.TypeOfName.ALL))); // Activated abilities of sources with the chosen name can't be activated unless they're mana abilities. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PithingNeedleEffect())); + this.addAbility(new SimpleStaticAbility(new PithingNeedleEffect())); } private PithingNeedle(final PithingNeedle card) { diff --git a/Mage.Sets/src/mage/cards/p/PlagueDrone.java b/Mage.Sets/src/mage/cards/p/PlagueDrone.java index dbdfe851bca..200169cb1f6 100644 --- a/Mage.Sets/src/mage/cards/p/PlagueDrone.java +++ b/Mage.Sets/src/mage/cards/p/PlagueDrone.java @@ -29,7 +29,7 @@ public final class PlagueDrone extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Rot Fly — If an opponent would gain life, that player loses that much life instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlagueDroneReplacementEffect()).withFlavorWord("Rot Fly")); + this.addAbility(new SimpleStaticAbility(new PlagueDroneReplacementEffect()).withFlavorWord("Rot Fly")); } private PlagueDrone(final PlagueDrone card) { diff --git a/Mage.Sets/src/mage/cards/p/PlagueSliver.java b/Mage.Sets/src/mage/cards/p/PlagueSliver.java index 3f01d4a3973..3ee4def66ec 100644 --- a/Mage.Sets/src/mage/cards/p/PlagueSliver.java +++ b/Mage.Sets/src/mage/cards/p/PlagueSliver.java @@ -34,7 +34,7 @@ public final class PlagueSliver extends CardImpl { // All Slivers have "At the beginning of your upkeep, this permanent deals 1 damage to you." Ability ability = new BeginningOfUpkeepTriggeredAbility(new DamageControllerEffect(1)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( ability, Duration.WhileOnBattlefield, filterSliver, "All Slivers have \"At the beginning of your upkeep, this permanent deals 1 damage to you.\""))); } diff --git a/Mage.Sets/src/mage/cards/p/PlanarGate.java b/Mage.Sets/src/mage/cards/p/PlanarGate.java index 6ab399325a3..8e6419e3965 100644 --- a/Mage.Sets/src/mage/cards/p/PlanarGate.java +++ b/Mage.Sets/src/mage/cards/p/PlanarGate.java @@ -20,7 +20,7 @@ public final class PlanarGate extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{6}"); // Creature spells you cast cost up to {2} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(new FilterCreatureCard("Creature spells"), 2, true))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(new FilterCreatureCard("Creature spells"), 2, true))); } private PlanarGate(final PlanarGate card) { diff --git a/Mage.Sets/src/mage/cards/p/PlasmaElemental.java b/Mage.Sets/src/mage/cards/p/PlasmaElemental.java index e9ac7ffa7f1..4dc9ab1ae33 100644 --- a/Mage.Sets/src/mage/cards/p/PlasmaElemental.java +++ b/Mage.Sets/src/mage/cards/p/PlasmaElemental.java @@ -25,7 +25,7 @@ public final class PlasmaElemental extends CardImpl { this.toughness = new MageInt(1); // Plasma Elemental can't be blocked. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedSourceEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedSourceEffect())); } private PlasmaElemental(final PlasmaElemental card) { diff --git a/Mage.Sets/src/mage/cards/p/PlatedPegasus.java b/Mage.Sets/src/mage/cards/p/PlatedPegasus.java index e213a87b570..2734e1f63ef 100644 --- a/Mage.Sets/src/mage/cards/p/PlatedPegasus.java +++ b/Mage.Sets/src/mage/cards/p/PlatedPegasus.java @@ -38,7 +38,7 @@ public final class PlatedPegasus extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // If a spell would deal damage to a permanent or player, prevent 1 damage that spell would deal to that permanent or player. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlatedPegasusEffect())); + this.addAbility(new SimpleStaticAbility(new PlatedPegasusEffect())); } private PlatedPegasus(final PlatedPegasus card) { diff --git a/Mage.Sets/src/mage/cards/p/PlatedSliver.java b/Mage.Sets/src/mage/cards/p/PlatedSliver.java index 6511c894db6..5ad21ef7e9c 100644 --- a/Mage.Sets/src/mage/cards/p/PlatedSliver.java +++ b/Mage.Sets/src/mage/cards/p/PlatedSliver.java @@ -27,7 +27,7 @@ public final class PlatedSliver extends CardImpl { this.toughness = new MageInt(1); // All Sliver creatures get +0/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(0, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(0, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS, false))); } private PlatedSliver(final PlatedSliver card) { diff --git a/Mage.Sets/src/mage/cards/p/PlatinumEmperion.java b/Mage.Sets/src/mage/cards/p/PlatinumEmperion.java index 0c3bf4e2158..2fe8d57cbdf 100644 --- a/Mage.Sets/src/mage/cards/p/PlatinumEmperion.java +++ b/Mage.Sets/src/mage/cards/p/PlatinumEmperion.java @@ -26,7 +26,7 @@ public final class PlatinumEmperion extends CardImpl { this.toughness = new MageInt(8); // Your life total can't change. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LifeTotalCantChangeControllerEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new LifeTotalCantChangeControllerEffect(Duration.WhileOnBattlefield))); } private PlatinumEmperion(final PlatinumEmperion card) { diff --git a/Mage.Sets/src/mage/cards/p/PloKoon.java b/Mage.Sets/src/mage/cards/p/PloKoon.java index bad18cbd1f8..ba717efdfa1 100644 --- a/Mage.Sets/src/mage/cards/p/PloKoon.java +++ b/Mage.Sets/src/mage/cards/p/PloKoon.java @@ -29,7 +29,7 @@ public final class PloKoon extends CardImpl { this.toughness = new MageInt(4); // You may activate meditate abilities any time you could cast an instant. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ActivateAbilitiesAnyTimeYouCouldCastInstantEffect(MeditateAbility.class, "meditate abilities"))); + this.addAbility(new SimpleStaticAbility(new ActivateAbilitiesAnyTimeYouCouldCastInstantEffect(MeditateAbility.class, "meditate abilities"))); // Meditate {1}{W} this.addAbility(new MeditateAbility(new ManaCostsImpl<>("{1}{W}"))); diff --git a/Mage.Sets/src/mage/cards/p/PlumesOfPeace.java b/Mage.Sets/src/mage/cards/p/PlumesOfPeace.java index 0769b0c6cc7..c2b2d3eef6e 100644 --- a/Mage.Sets/src/mage/cards/p/PlumesOfPeace.java +++ b/Mage.Sets/src/mage/cards/p/PlumesOfPeace.java @@ -35,7 +35,7 @@ public final class PlumesOfPeace 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())); // Forecast - {W}{U}, Reveal Plumes of Peace from your hand: Tap target creature. ForecastAbility ability = new ForecastAbility(new TapTargetEffect(), new ManaCostsImpl<>("{W}{U}")); diff --git a/Mage.Sets/src/mage/cards/p/PossessedPortal.java b/Mage.Sets/src/mage/cards/p/PossessedPortal.java index 1d5b8f10fe4..aa4c8b8ea53 100644 --- a/Mage.Sets/src/mage/cards/p/PossessedPortal.java +++ b/Mage.Sets/src/mage/cards/p/PossessedPortal.java @@ -27,7 +27,7 @@ public final class PossessedPortal extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{8}"); // If a player would draw a card, that player skips that draw instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PossessedPortalReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new PossessedPortalReplacementEffect())); // At the beginning of each end step, each player sacrifices a permanent unless they discard a card. this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new PossessedPortalEffect(), false)); diff --git a/Mage.Sets/src/mage/cards/p/PowerArtifact.java b/Mage.Sets/src/mage/cards/p/PowerArtifact.java index 647c5e0a2d2..d5e19d04c89 100644 --- a/Mage.Sets/src/mage/cards/p/PowerArtifact.java +++ b/Mage.Sets/src/mage/cards/p/PowerArtifact.java @@ -35,7 +35,7 @@ public final class PowerArtifact extends CardImpl { // Enchanted artifact's activated abilities cost {2} less to activate. // This effect can't reduce the mana in that cost to less than one mana. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PowerArtifactCostModificationEffect())); + this.addAbility(new SimpleStaticAbility(new PowerArtifactCostModificationEffect())); } private PowerArtifact(final PowerArtifact card) { diff --git a/Mage.Sets/src/mage/cards/p/PowerFist.java b/Mage.Sets/src/mage/cards/p/PowerFist.java index b4d40f22d0e..2ec01bb2138 100644 --- a/Mage.Sets/src/mage/cards/p/PowerFist.java +++ b/Mage.Sets/src/mage/cards/p/PowerFist.java @@ -26,7 +26,7 @@ public final class PowerFist extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has trample and "Whenever this creature deals combat damage to a player, put that many +1/+1 counters on it." - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT)); + Ability ability = new SimpleStaticAbility(new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT)); ability.addEffect(new GainAbilityAttachedEffect( new DealsCombatDamageToAPlayerTriggeredAbility(new AddCountersSourceEffect( CounterType.P1P1.createInstance(), SavedDamageValue.MANY, false diff --git a/Mage.Sets/src/mage/cards/p/PowerOfFire.java b/Mage.Sets/src/mage/cards/p/PowerOfFire.java index db79218c0d5..76c6441f783 100644 --- a/Mage.Sets/src/mage/cards/p/PowerOfFire.java +++ b/Mage.Sets/src/mage/cards/p/PowerOfFire.java @@ -43,7 +43,7 @@ public final class PowerOfFire extends CardImpl { // Enchanted creature has "{tap}: This creature deals 1 damage to any target." Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); gainedAbility.addTarget(new TargetAnyTarget()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{T}: This creature deals 1 damage to any target.\""))); } @@ -57,4 +57,3 @@ public final class PowerOfFire extends CardImpl { return new PowerOfFire(this); } } - diff --git a/Mage.Sets/src/mage/cards/p/PraetorianTrooper.java b/Mage.Sets/src/mage/cards/p/PraetorianTrooper.java index 912ea52b818..69f8d73b1b6 100644 --- a/Mage.Sets/src/mage/cards/p/PraetorianTrooper.java +++ b/Mage.Sets/src/mage/cards/p/PraetorianTrooper.java @@ -34,7 +34,7 @@ public final class PraetorianTrooper extends CardImpl { this.toughness = new MageInt(2); // Trooper creatures you control have double strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); } private PraetorianTrooper(final PraetorianTrooper card) { diff --git a/Mage.Sets/src/mage/cards/p/PrecipiceOfMortis.java b/Mage.Sets/src/mage/cards/p/PrecipiceOfMortis.java index 926b73062ea..832ff6468fa 100644 --- a/Mage.Sets/src/mage/cards/p/PrecipiceOfMortis.java +++ b/Mage.Sets/src/mage/cards/p/PrecipiceOfMortis.java @@ -26,7 +26,7 @@ public final class PrecipiceOfMortis extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{G}{U}{W}"); // If a Jedi entering or leaving the battlefield causes a triggered ability of a permanent you control to trigger, that ability triggers additional time - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PrecipiceOfMortisEffect())); + this.addAbility(new SimpleStaticAbility(new PrecipiceOfMortisEffect())); } diff --git a/Mage.Sets/src/mage/cards/p/PredatoryUrge.java b/Mage.Sets/src/mage/cards/p/PredatoryUrge.java index 4bab2a4ae5f..6d259fe78db 100644 --- a/Mage.Sets/src/mage/cards/p/PredatoryUrge.java +++ b/Mage.Sets/src/mage/cards/p/PredatoryUrge.java @@ -44,7 +44,7 @@ public final class PredatoryUrge extends CardImpl { ability.addTarget(new TargetCreaturePermanent()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted creature has \"{T}: This creature deals damage equal to its power to target creature. That creature deals damage equal to its power to this creature.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private PredatoryUrge(final PredatoryUrge card) { diff --git a/Mage.Sets/src/mage/cards/p/PresenceOfGond.java b/Mage.Sets/src/mage/cards/p/PresenceOfGond.java index e6e064a808c..86c7a127be8 100644 --- a/Mage.Sets/src/mage/cards/p/PresenceOfGond.java +++ b/Mage.Sets/src/mage/cards/p/PresenceOfGond.java @@ -36,7 +36,7 @@ public final class PresenceOfGond extends CardImpl { // Enchanted creature has "{tap}: Create a 1/1 green Elf Warrior creature token." Ability abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ElfWarriorToken()), new TapSourceCost()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(abilityToGain, AttachmentType.AURA, Duration.WhileOnBattlefield, + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(abilityToGain, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{T}: Create a 1/1 green Elf Warrior creature token.\""))); } diff --git a/Mage.Sets/src/mage/cards/p/PriceOfKnowledge.java b/Mage.Sets/src/mage/cards/p/PriceOfKnowledge.java index 2a6816b6eb6..0c263660762 100644 --- a/Mage.Sets/src/mage/cards/p/PriceOfKnowledge.java +++ b/Mage.Sets/src/mage/cards/p/PriceOfKnowledge.java @@ -26,7 +26,7 @@ public final class PriceOfKnowledge extends CardImpl { // Players have no maximum hand size. Effect effect = new MaximumHandSizeControllerEffect(Integer.MAX_VALUE, Duration.WhileOnBattlefield, HandSizeModification.SET, TargetController.ANY); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // At the beginning of each opponent's upkeep, Price of Knowledge deals damage to that player equal to the number of cards in that player's hand. this.addAbility(new BeginningOfUpkeepTriggeredAbility(TargetController.OPPONENT, new PriceOfKnowledgeEffect(), false)); diff --git a/Mage.Sets/src/mage/cards/p/Prickleboar.java b/Mage.Sets/src/mage/cards/p/Prickleboar.java index 6dc8c8198a9..1d3e91a1317 100644 --- a/Mage.Sets/src/mage/cards/p/Prickleboar.java +++ b/Mage.Sets/src/mage/cards/p/Prickleboar.java @@ -40,7 +40,7 @@ public final class Prickleboar extends CardImpl { new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield), MyTurnCondition.instance, "and has first strike"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, boostEffect); + Ability ability = new SimpleStaticAbility(boostEffect); ability.addEffect(gainAbilityEffect); ability.addHint(MyTurnHint.instance); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PrideSovereign.java b/Mage.Sets/src/mage/cards/p/PrideSovereign.java index 0cc53452844..f080fc3bd68 100644 --- a/Mage.Sets/src/mage/cards/p/PrideSovereign.java +++ b/Mage.Sets/src/mage/cards/p/PrideSovereign.java @@ -42,7 +42,7 @@ public final class PrideSovereign extends CardImpl { // Pride Sovereign gets +1/+1 for each other Cat you control. DynamicValue otherCats = new PermanentsOnBattlefieldCount(filter); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(otherCats, otherCats, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(otherCats, otherCats, Duration.WhileOnBattlefield))); // {W}, {t}, Exert Pride Sovereign: Create two 1/1 white Cat creature tokens with lifelink. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CatToken2(), 2), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/p/PrimalAmulet.java b/Mage.Sets/src/mage/cards/p/PrimalAmulet.java index 5dbd7ce2ce2..a687c4d3aba 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalAmulet.java +++ b/Mage.Sets/src/mage/cards/p/PrimalAmulet.java @@ -41,7 +41,7 @@ public final class PrimalAmulet extends CardImpl { this.secondSideCardClazz = mage.cards.p.PrimalWellspring.class; // Instant and sorcery spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); // Whenever you cast an instant or sorcery spell, put a charge counter on Primal Amulet. Then if there are four or more charge counters on it, you may remove those counters and transform it. this.addAbility(new TransformAbility()); diff --git a/Mage.Sets/src/mage/cards/p/PrimalFrenzy.java b/Mage.Sets/src/mage/cards/p/PrimalFrenzy.java index ad4d645669c..c6e2da2e2d2 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalFrenzy.java +++ b/Mage.Sets/src/mage/cards/p/PrimalFrenzy.java @@ -37,7 +37,7 @@ public final class PrimalFrenzy extends CardImpl { this.addAbility(ability); // 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 PrimalFrenzy(final PrimalFrenzy card) { diff --git a/Mage.Sets/src/mage/cards/p/PrimalRage.java b/Mage.Sets/src/mage/cards/p/PrimalRage.java index cd68d38138f..507938b63b6 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalRage.java +++ b/Mage.Sets/src/mage/cards/p/PrimalRage.java @@ -20,7 +20,7 @@ public final class PrimalRage extends CardImpl { public PrimalRage(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, false))); } private PrimalRage(final PrimalRage card) { diff --git a/Mage.Sets/src/mage/cards/p/PrimalVigor.java b/Mage.Sets/src/mage/cards/p/PrimalVigor.java index 9a35fea4760..4066b42fb5c 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalVigor.java +++ b/Mage.Sets/src/mage/cards/p/PrimalVigor.java @@ -27,9 +27,9 @@ public final class PrimalVigor extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{G}"); // If one or more tokens would be created, twice that many of those tokens are created instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PrimalVigorTokenEffect())); + this.addAbility(new SimpleStaticAbility(new PrimalVigorTokenEffect())); // If one or more +1/+1 counters would be put on a creature, twice that many +1/+1 counters are put on that creature instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PrimalVigorCounterEffect())); + this.addAbility(new SimpleStaticAbility(new PrimalVigorCounterEffect())); } diff --git a/Mage.Sets/src/mage/cards/p/PrimalWhisperer.java b/Mage.Sets/src/mage/cards/p/PrimalWhisperer.java index 22d59d5f5bd..65a9eb9ff0a 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalWhisperer.java +++ b/Mage.Sets/src/mage/cards/p/PrimalWhisperer.java @@ -38,7 +38,7 @@ public final class PrimalWhisperer extends CardImpl { // Primal Whisperer gets +2/+2 for each face-down creature on the battlefield. PermanentsOnBattlefieldCount amount = new PermanentsOnBattlefieldCount(filter, 2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield))); // Morph {3}{G} this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{G}"))); } diff --git a/Mage.Sets/src/mage/cards/p/PrincessLeia.java b/Mage.Sets/src/mage/cards/p/PrincessLeia.java index b6924e989e9..cc0ff001ec9 100644 --- a/Mage.Sets/src/mage/cards/p/PrincessLeia.java +++ b/Mage.Sets/src/mage/cards/p/PrincessLeia.java @@ -46,10 +46,10 @@ public final class PrincessLeia extends CardImpl { // Princess Leia gets +1/+1 for each other Rebel creature you control. DynamicValue count = new PermanentsOnBattlefieldCount(filter1); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); // Other Rebel creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter2, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter2, true))); } diff --git a/Mage.Sets/src/mage/cards/p/PrismaticWard.java b/Mage.Sets/src/mage/cards/p/PrismaticWard.java index 366d594aa77..8c7165dac24 100644 --- a/Mage.Sets/src/mage/cards/p/PrismaticWard.java +++ b/Mage.Sets/src/mage/cards/p/PrismaticWard.java @@ -46,7 +46,7 @@ public final class PrismaticWard extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Benefit))); // Prevent all damage that would be dealt to enchanted creature by sources of the chosen color. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PrismaticWardPreventDamageEffect())); + this.addAbility(new SimpleStaticAbility(new PrismaticWardPreventDamageEffect())); } private PrismaticWard(final PrismaticWard card) { diff --git a/Mage.Sets/src/mage/cards/p/PrisonTerm.java b/Mage.Sets/src/mage/cards/p/PrisonTerm.java index 458f1a9ff13..b6433693ab2 100644 --- a/Mage.Sets/src/mage/cards/p/PrisonTerm.java +++ b/Mage.Sets/src/mage/cards/p/PrisonTerm.java @@ -50,7 +50,7 @@ public final class PrisonTerm extends CardImpl { this.addAbility(ability); // Enchanted creature can't attack or block, and its activated abilities can't be activated. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAttackActivateAttachedEffect())); + this.addAbility(new SimpleStaticAbility(new CantBlockAttackActivateAttachedEffect())); // Whenever a creature enters the battlefield under an opponent's control, you may attach Prison Term to that creature. this.addAbility(new EntersBattlefieldOpponentTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/p/PrivilegedPosition.java b/Mage.Sets/src/mage/cards/p/PrivilegedPosition.java index 235dbd24222..1073bfa6f71 100644 --- a/Mage.Sets/src/mage/cards/p/PrivilegedPosition.java +++ b/Mage.Sets/src/mage/cards/p/PrivilegedPosition.java @@ -23,7 +23,7 @@ public final class PrivilegedPosition extends CardImpl { // Other permanents you control have hexproof. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENTS, true))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENTS, true))); } private PrivilegedPosition(final PrivilegedPosition card) { diff --git a/Mage.Sets/src/mage/cards/p/PrizedUnicorn.java b/Mage.Sets/src/mage/cards/p/PrizedUnicorn.java index b506e789e83..3afbee7d4ca 100644 --- a/Mage.Sets/src/mage/cards/p/PrizedUnicorn.java +++ b/Mage.Sets/src/mage/cards/p/PrizedUnicorn.java @@ -25,7 +25,7 @@ public final class PrizedUnicorn extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAllSourceEffect())); + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAllSourceEffect())); } private PrizedUnicorn(final PrizedUnicorn card) { diff --git a/Mage.Sets/src/mage/cards/p/ProphetOfKruphix.java b/Mage.Sets/src/mage/cards/p/ProphetOfKruphix.java index 74c62651468..2f76ba32859 100644 --- a/Mage.Sets/src/mage/cards/p/ProphetOfKruphix.java +++ b/Mage.Sets/src/mage/cards/p/ProphetOfKruphix.java @@ -39,9 +39,9 @@ public final class ProphetOfKruphix extends CardImpl { this.toughness = new MageInt(3); // Untap all creatures and lands you control during each other player's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new UntapAllDuringEachOtherPlayersUntapStepEffect(filter))); + this.addAbility(new SimpleStaticAbility(new UntapAllDuringEachOtherPlayersUntapStepEffect(filter))); // You may cast creature spells as though they had flash. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, new FilterCreatureCard("creature spells")))); + this.addAbility(new SimpleStaticAbility(new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, new FilterCreatureCard("creature spells")))); } diff --git a/Mage.Sets/src/mage/cards/p/PropheticRavings.java b/Mage.Sets/src/mage/cards/p/PropheticRavings.java index e8562c7130c..d8f4788270d 100644 --- a/Mage.Sets/src/mage/cards/p/PropheticRavings.java +++ b/Mage.Sets/src/mage/cards/p/PropheticRavings.java @@ -41,7 +41,7 @@ public final class PropheticRavings extends CardImpl { this.addAbility(ability); // Enchanted creature has haste and "{T}, Discard a card: Draw a card." - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA)); + ability = new SimpleStaticAbility(new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA)); Ability abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost()); abilityToGain.addCost(new DiscardCardCost()); Effect effect = new GainAbilityAttachedEffect(abilityToGain, AttachmentType.AURA); diff --git a/Mage.Sets/src/mage/cards/p/ProtectionOfTheHekma.java b/Mage.Sets/src/mage/cards/p/ProtectionOfTheHekma.java index 556df2a0094..a1c5db42e54 100644 --- a/Mage.Sets/src/mage/cards/p/ProtectionOfTheHekma.java +++ b/Mage.Sets/src/mage/cards/p/ProtectionOfTheHekma.java @@ -24,7 +24,7 @@ public final class ProtectionOfTheHekma extends CardImpl { // If a source an opponent controls would deal damage to you, prevent 1 of that damage. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ProtectionOfTheHekmaEffect())); + this.addAbility(new SimpleStaticAbility(new ProtectionOfTheHekmaEffect())); } private ProtectionOfTheHekma(final ProtectionOfTheHekma card) { diff --git a/Mage.Sets/src/mage/cards/p/ProtectorOfTheCrown.java b/Mage.Sets/src/mage/cards/p/ProtectorOfTheCrown.java index ee478072370..743f04a7117 100644 --- a/Mage.Sets/src/mage/cards/p/ProtectorOfTheCrown.java +++ b/Mage.Sets/src/mage/cards/p/ProtectorOfTheCrown.java @@ -39,7 +39,7 @@ public final class ProtectorOfTheCrown extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new BecomesMonarchSourceEffect()).addHint(MonarchHint.instance)); // All damage would be dealt to you is dealt to Protector of the Crown instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ProtectorOfTheCrownEffect())); + this.addAbility(new SimpleStaticAbility(new ProtectorOfTheCrownEffect())); } private ProtectorOfTheCrown(final ProtectorOfTheCrown card) { diff --git a/Mage.Sets/src/mage/cards/p/ProwlingSerpopard.java b/Mage.Sets/src/mage/cards/p/ProwlingSerpopard.java index 98e1b3472ca..7764ad489a0 100644 --- a/Mage.Sets/src/mage/cards/p/ProwlingSerpopard.java +++ b/Mage.Sets/src/mage/cards/p/ProwlingSerpopard.java @@ -38,7 +38,7 @@ public final class ProwlingSerpopard extends CardImpl { this.addAbility(new CantBeCounteredSourceAbility()); // Creature spells you control can't be countered. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeCounteredControlledEffect(filterTarget, null, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CantBeCounteredControlledEffect(filterTarget, null, Duration.WhileOnBattlefield))); } private ProwlingSerpopard(final ProwlingSerpopard card) { diff --git a/Mage.Sets/src/mage/cards/p/PryingBlade.java b/Mage.Sets/src/mage/cards/p/PryingBlade.java index 1af9b337758..c88d063b956 100644 --- a/Mage.Sets/src/mage/cards/p/PryingBlade.java +++ b/Mage.Sets/src/mage/cards/p/PryingBlade.java @@ -28,7 +28,7 @@ public final class PryingBlade extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 0))); // Whenever equipped creature deals combat damage to a player, create a colorless Treasure artifact token with "{t}, Sacrifice this artifact: Add one mana of any color." this.addAbility(new DealsDamageToAPlayerAttachedTriggeredAbility(new CreateTokenEffect(new TreasureToken()), "equipped creature", false)); diff --git a/Mage.Sets/src/mage/cards/p/PsionicGift.java b/Mage.Sets/src/mage/cards/p/PsionicGift.java index 36064d5910d..ef1c7f684bb 100644 --- a/Mage.Sets/src/mage/cards/p/PsionicGift.java +++ b/Mage.Sets/src/mage/cards/p/PsionicGift.java @@ -42,7 +42,7 @@ public final class PsionicGift extends CardImpl { // Enchanted creature has "{tap}: This creature deals 1 damage to any target." Ability psiAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); psiAbility.addTarget(new TargetAnyTarget()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(psiAbility, AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(psiAbility, AttachmentType.AURA))); } private PsionicGift(final PsionicGift card) { diff --git a/Mage.Sets/src/mage/cards/p/PsionicSliver.java b/Mage.Sets/src/mage/cards/p/PsionicSliver.java index 3af3d9f843f..24fffdccfd3 100644 --- a/Mage.Sets/src/mage/cards/p/PsionicSliver.java +++ b/Mage.Sets/src/mage/cards/p/PsionicSliver.java @@ -43,7 +43,7 @@ public final class PsionicSliver extends CardImpl { ability.addEffect(new DamageSelfEffect(3).setText("3 damage to itself.")); ability.addTarget(new TargetAnyTarget()); this.addAbility( - new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, filter, + new SimpleStaticAbility(new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, filter, "All Sliver creatures have \"{T}: This creature deals 2 damage to any target and 3 damage to itself.\"") ) ); diff --git a/Mage.Sets/src/mage/cards/p/PsychicOverload.java b/Mage.Sets/src/mage/cards/p/PsychicOverload.java index 726908c56bb..ff09a5c8924 100644 --- a/Mage.Sets/src/mage/cards/p/PsychicOverload.java +++ b/Mage.Sets/src/mage/cards/p/PsychicOverload.java @@ -45,12 +45,12 @@ public final class PsychicOverload extends CardImpl { // When Psychic Overload enters the battlefield, tap enchanted permanent. this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect("permanent"))); // Enchanted permanent doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect("permanent"))); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect("permanent"))); // Enchanted permanent has "Discard two artifact cards: Untap this permanent." Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new DiscardTargetCost(new TargetCardInHand(2, new FilterArtifactCard("two artifact cards")))); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted permanent has \"Discard two artifact cards: Untap this permanent.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility( effect)); } private PsychicOverload(final PsychicOverload card) { diff --git a/Mage.Sets/src/mage/cards/p/PsychicPossession.java b/Mage.Sets/src/mage/cards/p/PsychicPossession.java index c15da55721e..4c11b3a6ecd 100644 --- a/Mage.Sets/src/mage/cards/p/PsychicPossession.java +++ b/Mage.Sets/src/mage/cards/p/PsychicPossession.java @@ -40,7 +40,7 @@ public final class PsychicPossession extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Skip your draw step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipDrawStepEffect())); + this.addAbility(new SimpleStaticAbility(new SkipDrawStepEffect())); // Whenever enchanted opponent draws a card, you may draw a card. this.addAbility(new PsychicPossessionTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/p/PulmonicSliver.java b/Mage.Sets/src/mage/cards/p/PulmonicSliver.java index a798ba39b5b..8802e2ed0f7 100644 --- a/Mage.Sets/src/mage/cards/p/PulmonicSliver.java +++ b/Mage.Sets/src/mage/cards/p/PulmonicSliver.java @@ -34,11 +34,11 @@ public final class PulmonicSliver extends CardImpl { this.toughness = new MageInt(3); // All Sliver creatures have flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( FlyingAbility.getInstance(), Duration.WhileOnBattlefield, filter, "All Sliver creatures have flying."))); // All Slivers have "If this permanent would be put into a graveyard, you may put it on top of its owner's library instead." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( new PutIntoGraveFromAnywhereSourceAbility(new ReturnToLibraryPermanentEffect(true), null, null, false, true), Duration.WhileOnBattlefield, filterSlivers, "All Slivers have \"If this permanent would be put into a graveyard, you may put it on top of its owner's library instead.\""))); } diff --git a/Mage.Sets/src/mage/cards/p/Purity.java b/Mage.Sets/src/mage/cards/p/Purity.java index 346eecbb48f..70aab97b5fc 100644 --- a/Mage.Sets/src/mage/cards/p/Purity.java +++ b/Mage.Sets/src/mage/cards/p/Purity.java @@ -39,7 +39,7 @@ public final class Purity extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // If noncombat damage would be dealt to you, prevent that damage. You gain life equal to the damage prevented this way. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PurityEffect())); + this.addAbility(new SimpleStaticAbility(new PurityEffect())); // When Purity is put into a graveyard from anywhere, shuffle it into its owner's library. this.addAbility(new PutIntoGraveFromAnywhereSourceTriggeredAbility(new ShuffleIntoLibrarySourceEffect())); diff --git a/Mage.Sets/src/mage/cards/p/PurphorossEmissary.java b/Mage.Sets/src/mage/cards/p/PurphorossEmissary.java index a3bb75b4107..cdc1721d517 100644 --- a/Mage.Sets/src/mage/cards/p/PurphorossEmissary.java +++ b/Mage.Sets/src/mage/cards/p/PurphorossEmissary.java @@ -37,7 +37,7 @@ public final class PurphorossEmissary extends CardImpl { this.addAbility(new MenaceAbility()); // Enchanted creature gets +3/+3 and and has menace. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3,3)); + Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(3,3)); Effect effect = new GainAbilityAttachedEffect(new MenaceAbility(), AttachmentType.AURA); effect.setText("and has menace"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/p/PursuitOfFlight.java b/Mage.Sets/src/mage/cards/p/PursuitOfFlight.java index 00ef7723637..70bcf57d5cb 100644 --- a/Mage.Sets/src/mage/cards/p/PursuitOfFlight.java +++ b/Mage.Sets/src/mage/cards/p/PursuitOfFlight.java @@ -40,7 +40,7 @@ public final class PursuitOfFlight extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2 and has "{U}: This creature gains flying until end of turn." - SimpleStaticAbility ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); + SimpleStaticAbility ability2 = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); ability2.addEffect(new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{U}")), AttachmentType.AURA, Duration.WhileOnBattlefield, rule)); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/p/PursuitOfKnowledge.java b/Mage.Sets/src/mage/cards/p/PursuitOfKnowledge.java index dbf4bbfc9a9..6ae0fe8dcf0 100644 --- a/Mage.Sets/src/mage/cards/p/PursuitOfKnowledge.java +++ b/Mage.Sets/src/mage/cards/p/PursuitOfKnowledge.java @@ -31,7 +31,7 @@ public final class PursuitOfKnowledge extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{W}"); // If you would draw a card, you may put a study counter on Pursuit of Knowledge instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PursuitOfKnowledgeEffect())); + this.addAbility(new SimpleStaticAbility(new PursuitOfKnowledgeEffect())); // Remove three study counters from Pursuit of Knowledge, Sacrifice Pursuit of Knowledge: Draw seven cards. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(7), diff --git a/Mage.Sets/src/mage/cards/p/PyromancersGauntlet.java b/Mage.Sets/src/mage/cards/p/PyromancersGauntlet.java index a4954c9adae..9815e9b07dd 100644 --- a/Mage.Sets/src/mage/cards/p/PyromancersGauntlet.java +++ b/Mage.Sets/src/mage/cards/p/PyromancersGauntlet.java @@ -27,7 +27,7 @@ public final class PyromancersGauntlet extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{5}"); // If a red instant or sorcery spell you control or a red planeswalker you control would deal damage to a permanent or player, it deals that much damage plus 2 to that permanent or player instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PyromancersGauntletReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new PyromancersGauntletReplacementEffect())); } private PyromancersGauntlet(final PyromancersGauntlet card) { diff --git a/Mage.Sets/src/mage/cards/p/PyromancersSwath.java b/Mage.Sets/src/mage/cards/p/PyromancersSwath.java index 139ba6408a5..2e2443397c1 100644 --- a/Mage.Sets/src/mage/cards/p/PyromancersSwath.java +++ b/Mage.Sets/src/mage/cards/p/PyromancersSwath.java @@ -25,7 +25,7 @@ public final class PyromancersSwath extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); // If an instant or sorcery source you control would deal damage to a creature or player, it deals that much damage plus 2 to that creature or player instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PyromancersSwathReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new PyromancersSwathReplacementEffect())); // At the beginning of each end step, discard your hand. this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new DiscardHandControllerEffect(), false, null));