diff --git a/Mage.Sets/src/mage/cards/a/AerieMystics.java b/Mage.Sets/src/mage/cards/a/AerieMystics.java index 179e22e43e0..6476bb0ff03 100644 --- a/Mage.Sets/src/mage/cards/a/AerieMystics.java +++ b/Mage.Sets/src/mage/cards/a/AerieMystics.java @@ -30,7 +30,7 @@ public final class AerieMystics extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES), new ManaCostsImpl<>("{1}{G}{U}"))); } diff --git a/Mage.Sets/src/mage/cards/a/AlchemistsRefuge.java b/Mage.Sets/src/mage/cards/a/AlchemistsRefuge.java index 1f12ece0718..81b1e7fc299 100644 --- a/Mage.Sets/src/mage/cards/a/AlchemistsRefuge.java +++ b/Mage.Sets/src/mage/cards/a/AlchemistsRefuge.java @@ -37,7 +37,7 @@ public final class AlchemistsRefuge extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {G}{U}, {tap}: You may cast spells this turn as though they had flash. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new AddContinuousEffectToGame(new CastAsThoughItHadFlashAllEffect(Duration.EndOfTurn, filter)), new CompositeCost(new ManaCostsImpl<>("{G}{U}"), new TapSourceCost(), "{G}{U}, {T}"))); } diff --git a/Mage.Sets/src/mage/cards/a/AllosaurusShepherd.java b/Mage.Sets/src/mage/cards/a/AllosaurusShepherd.java index 3a4151d07c5..803dec39d7c 100644 --- a/Mage.Sets/src/mage/cards/a/AllosaurusShepherd.java +++ b/Mage.Sets/src/mage/cards/a/AllosaurusShepherd.java @@ -47,7 +47,7 @@ public class AllosaurusShepherd extends CardImpl { //4GG: Until end of turn, each Elf creature you control has base power and toughness 5/5 // and becomes a Dinosaur in addition to its other creature types. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SetBasePowerToughnessAllEffect(5, 5, Duration.EndOfTurn, elvesFilter) .setText("Until end of turn, each Elf creature you control has base power and toughness 5/5"), new ManaCostsImpl<>("{4}{G}{G}")); diff --git a/Mage.Sets/src/mage/cards/a/AmrouScout.java b/Mage.Sets/src/mage/cards/a/AmrouScout.java index 62259eecf7d..29ea136c3d4 100644 --- a/Mage.Sets/src/mage/cards/a/AmrouScout.java +++ b/Mage.Sets/src/mage/cards/a/AmrouScout.java @@ -39,7 +39,7 @@ public final class AmrouScout extends CardImpl { this.toughness = new MageInt(1); // {4}, {tap}: Search your library for a Rebel permanent card with converted mana cost 3 or less and put it onto the battlefield. Then shuffle your library. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), false), new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/a/AncestorsProphet.java b/Mage.Sets/src/mage/cards/a/AncestorsProphet.java index f26cf210874..a12a01c6ae2 100644 --- a/Mage.Sets/src/mage/cards/a/AncestorsProphet.java +++ b/Mage.Sets/src/mage/cards/a/AncestorsProphet.java @@ -36,7 +36,7 @@ public final class AncestorsProphet extends CardImpl { this.toughness = new MageInt(5); // Tap five untapped Clerics you control: You gain 10 life. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new GainLifeEffect(10), new TapTargetCost(new TargetControlledPermanent(5, 5, filter, true))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AndraditeLeech.java b/Mage.Sets/src/mage/cards/a/AndraditeLeech.java index 97129468d68..9f80775ff4c 100644 --- a/Mage.Sets/src/mage/cards/a/AndraditeLeech.java +++ b/Mage.Sets/src/mage/cards/a/AndraditeLeech.java @@ -36,7 +36,7 @@ public final class AndraditeLeech extends CardImpl { this.addAbility(new SimpleStaticAbility( new SpellsCostIncreasingAllEffect(new ManaCostsImpl<>("{B}"), filter, TargetController.YOU))); // {B}: Andradite Leech gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); } diff --git a/Mage.Sets/src/mage/cards/a/AnuridBrushhopper.java b/Mage.Sets/src/mage/cards/a/AnuridBrushhopper.java index dfce8cc3bb4..e5826d9ba72 100644 --- a/Mage.Sets/src/mage/cards/a/AnuridBrushhopper.java +++ b/Mage.Sets/src/mage/cards/a/AnuridBrushhopper.java @@ -29,7 +29,7 @@ public final class AnuridBrushhopper extends CardImpl { this.toughness = new MageInt(4); // Discard two cards: Exile Anurid Brushhopper. Return it to the battlefield under its owner's control at the beginning of the next end step. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new ExileReturnBattlefieldOwnerNextEndStepSourceEffect(), new DiscardTargetCost(new TargetCardInHand(2, StaticFilters.FILTER_CARD_CARDS)))); } diff --git a/Mage.Sets/src/mage/cards/a/AquastrandSpider.java b/Mage.Sets/src/mage/cards/a/AquastrandSpider.java index 9abc90a97c4..c7baca16d32 100644 --- a/Mage.Sets/src/mage/cards/a/AquastrandSpider.java +++ b/Mage.Sets/src/mage/cards/a/AquastrandSpider.java @@ -35,7 +35,7 @@ public final class AquastrandSpider extends CardImpl { this.addAbility(new GraftAbility(this, 2)); // {G}: Target creature with a +1/+1 counter on it gains reach until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(ReachAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_CREATURE_P1P1)); diff --git a/Mage.Sets/src/mage/cards/a/ArachnusSpinner.java b/Mage.Sets/src/mage/cards/a/ArachnusSpinner.java index c3fd6f9972d..759968aa04a 100644 --- a/Mage.Sets/src/mage/cards/a/ArachnusSpinner.java +++ b/Mage.Sets/src/mage/cards/a/ArachnusSpinner.java @@ -46,7 +46,7 @@ public final class ArachnusSpinner extends CardImpl { // Reach (This creature can block creatures with flying.) this.addAbility(ReachAbility.getInstance()); // Tap an untapped Spider you control: Search your graveyard and/or library for a card named Arachnus Web and put it onto the battlefield attached to target creature. If you search your library this way, shuffle it. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new ArachnusSpinnerEffect(), new TapTargetCost(new TargetControlledPermanent(1, 1, filter, false))); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/a/ArcticAven.java b/Mage.Sets/src/mage/cards/a/ArcticAven.java index def04d87a63..95340e011d2 100644 --- a/Mage.Sets/src/mage/cards/a/ArcticAven.java +++ b/Mage.Sets/src/mage/cards/a/ArcticAven.java @@ -43,7 +43,7 @@ public final class ArcticAven extends CardImpl { // Arctic Aven gets +1/+1 as long as you control a Plains. this.addAbility(new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filter, 1, 1))); // {W}: Arctic Aven gains lifelink until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } diff --git a/Mage.Sets/src/mage/cards/a/ArmillarySphere.java b/Mage.Sets/src/mage/cards/a/ArmillarySphere.java index d33311cf118..ebb90624b90 100644 --- a/Mage.Sets/src/mage/cards/a/ArmillarySphere.java +++ b/Mage.Sets/src/mage/cards/a/ArmillarySphere.java @@ -26,7 +26,7 @@ public final class ArmillarySphere extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {2}, {tap}, Sacrifice Armillary Sphere: Search your library for up to two basic land cards, reveal them, and put them into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 2, StaticFilters.FILTER_CARD_BASIC_LANDS), true), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/a/ArmsDealer.java b/Mage.Sets/src/mage/cards/a/ArmsDealer.java index 0b7831a4c5b..c7763f64c5f 100644 --- a/Mage.Sets/src/mage/cards/a/ArmsDealer.java +++ b/Mage.Sets/src/mage/cards/a/ArmsDealer.java @@ -31,7 +31,7 @@ public final class ArmsDealer extends CardImpl { this.toughness = new MageInt(1); // {1}{R}, Sacrifice a Goblin: Arms Dealer deals 4 damage to target creature. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new DamageTargetEffect(4), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new SacrificeTargetCost(filter)); diff --git a/Mage.Sets/src/mage/cards/a/ArmyAnts.java b/Mage.Sets/src/mage/cards/a/ArmyAnts.java index 8909938bacd..9200cef4298 100644 --- a/Mage.Sets/src/mage/cards/a/ArmyAnts.java +++ b/Mage.Sets/src/mage/cards/a/ArmyAnts.java @@ -30,7 +30,7 @@ public final class ArmyAnts extends CardImpl { this.toughness = new MageInt(1); // {tap}, Sacrifice a land: Destroy target land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new DestroyTargetEffect(), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_LAND)); diff --git a/Mage.Sets/src/mage/cards/a/AstromechDroid.java b/Mage.Sets/src/mage/cards/a/AstromechDroid.java index badec8e2e4e..b856816dbb0 100644 --- a/Mage.Sets/src/mage/cards/a/AstromechDroid.java +++ b/Mage.Sets/src/mage/cards/a/AstromechDroid.java @@ -38,7 +38,7 @@ public final class AstromechDroid extends CardImpl { this.toughness = new MageInt(1); // {T}: Target starship creature you control gets +1/+1 and gains vigilance until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new BoostTargetEffect(1, 1, Duration.EndOfTurn) .setText("Target starship creature you control gets +1/+1"), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/a/Atogatog.java b/Mage.Sets/src/mage/cards/a/Atogatog.java index 2559213c5f4..ed047483694 100644 --- a/Mage.Sets/src/mage/cards/a/Atogatog.java +++ b/Mage.Sets/src/mage/cards/a/Atogatog.java @@ -33,7 +33,7 @@ public final class Atogatog extends CardImpl { DynamicValue xValue = SacrificeCostCreaturesPower.instance; // Sacrifice an Atog creature: Atogatog gets +X/+X until end of turn, where X is the sacrificed creature's power. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect(xValue, xValue, Duration.EndOfTurn), new SacrificeTargetCost(filter))); diff --git a/Mage.Sets/src/mage/cards/a/AvacynGuardianAngel.java b/Mage.Sets/src/mage/cards/a/AvacynGuardianAngel.java index 0167ae870e7..9ab15663f99 100644 --- a/Mage.Sets/src/mage/cards/a/AvacynGuardianAngel.java +++ b/Mage.Sets/src/mage/cards/a/AvacynGuardianAngel.java @@ -41,14 +41,14 @@ public final class AvacynGuardianAngel extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); // {1}{W}: Prevent all damage that would be dealt to another target creature this turn by sources of the color of your choice. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new AvacynGuardianAngelPreventToCreatureEffect(), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_ANOTHER_TARGET_CREATURE)); this.addAbility(ability); // {5}{W}{W}: Prevent all damage that would be dealt to target player this turn by sources of the color of your choice. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + ability = new SimpleActivatedAbility( new AvacynGuardianAngelPreventToPlayerEffect(), new ManaCostsImpl<>("{5}{W}{W}")); ability.addTarget(new TargetPlayerOrPlaneswalker()); diff --git a/Mage.Sets/src/mage/cards/b/BattleRampart.java b/Mage.Sets/src/mage/cards/b/BattleRampart.java index 7eec86aa2fa..b34ab7fdbf1 100644 --- a/Mage.Sets/src/mage/cards/b/BattleRampart.java +++ b/Mage.Sets/src/mage/cards/b/BattleRampart.java @@ -33,7 +33,7 @@ public final class BattleRampart extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {T}: Target creature gains haste until end of turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/b/BeguilerOfWills.java b/Mage.Sets/src/mage/cards/b/BeguilerOfWills.java index 80067b4e754..eb43b1be046 100644 --- a/Mage.Sets/src/mage/cards/b/BeguilerOfWills.java +++ b/Mage.Sets/src/mage/cards/b/BeguilerOfWills.java @@ -32,7 +32,7 @@ public final class BeguilerOfWills extends CardImpl { this.toughness = new MageInt(1); // {tap}: Gain control of target creature with power less than or equal to the number of creatures you control. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new GainControlTargetEffect(Duration.Custom), new TapSourceCost()); ability.addTarget(new BeguilerOfWillsTarget()); diff --git a/Mage.Sets/src/mage/cards/b/BehindTheScenes.java b/Mage.Sets/src/mage/cards/b/BehindTheScenes.java index 4a679512fc1..346f7f0302a 100644 --- a/Mage.Sets/src/mage/cards/b/BehindTheScenes.java +++ b/Mage.Sets/src/mage/cards/b/BehindTheScenes.java @@ -29,7 +29,7 @@ public final class BehindTheScenes extends CardImpl { new GainAbilityControlledEffect(new SkulkAbility(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES))); // {4}{W}: Creatures you control get +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostControlledEffect(1, 1, Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES), new ManaCostsImpl<>("{4}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/b/BelbesPortal.java b/Mage.Sets/src/mage/cards/b/BelbesPortal.java index 970af302266..09abe5bf68c 100644 --- a/Mage.Sets/src/mage/cards/b/BelbesPortal.java +++ b/Mage.Sets/src/mage/cards/b/BelbesPortal.java @@ -31,7 +31,7 @@ public final class BelbesPortal extends CardImpl { // {3}, {tap}: You may put a creature card of the chosen type from your hand onto the battlefield. FilterCreatureCard filter = new FilterCreatureCard("a creature card of the chosen type"); filter.add(ChosenSubtypePredicate.TRUE); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new PutCardFromHandOntoBattlefieldEffect(filter), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/b/BighornerRancher.java b/Mage.Sets/src/mage/cards/b/BighornerRancher.java index 270ebcb43d8..c0197498421 100644 --- a/Mage.Sets/src/mage/cards/b/BighornerRancher.java +++ b/Mage.Sets/src/mage/cards/b/BighornerRancher.java @@ -41,7 +41,7 @@ public final class BighornerRancher extends CardImpl { )); // Sacrifice Bighorner Rancher: You gain life equal to the greatest toughness among other creatures you control. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainLifeEffect(GreatestToughnessAmongControlledCreaturesValue.instance).setText("You gain life equal to the greatest toughness among other creatures you control."), new SacrificeSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/b/BlackManaBattery.java b/Mage.Sets/src/mage/cards/b/BlackManaBattery.java index b96e9100c3b..8e5b3a8b741 100644 --- a/Mage.Sets/src/mage/cards/b/BlackManaBattery.java +++ b/Mage.Sets/src/mage/cards/b/BlackManaBattery.java @@ -28,7 +28,7 @@ public final class BlackManaBattery extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {2}, {T}: Put a charge counter on Black Mana Battery. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new AddCountersSourceEffect(CounterType.CHARGE.createInstance(1)), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/b/Blessing.java b/Mage.Sets/src/mage/cards/b/Blessing.java index 22fe5b90a20..e7140c5c070 100644 --- a/Mage.Sets/src/mage/cards/b/Blessing.java +++ b/Mage.Sets/src/mage/cards/b/Blessing.java @@ -32,7 +32,7 @@ public final class Blessing extends CardImpl { // {W}: Enchanted creature gets +1/+1 until end of turn. Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostEnchantedEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.W))); } diff --git a/Mage.Sets/src/mage/cards/b/BlightedFen.java b/Mage.Sets/src/mage/cards/b/BlightedFen.java index 742b4f6d32f..5266397f227 100644 --- a/Mage.Sets/src/mage/cards/b/BlightedFen.java +++ b/Mage.Sets/src/mage/cards/b/BlightedFen.java @@ -29,7 +29,7 @@ public final class BlightedFen extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {4}{B}, {T}, Sacrifice Blighted Fen: Target opponent sacrifices a creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SacrificeEffect(StaticFilters.FILTER_PERMANENT_CREATURE, 1, "Target opponent"), new ManaCostsImpl<>("{4}{B}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/b/BlightedGorge.java b/Mage.Sets/src/mage/cards/b/BlightedGorge.java index 59cd161df34..b696b2144f0 100644 --- a/Mage.Sets/src/mage/cards/b/BlightedGorge.java +++ b/Mage.Sets/src/mage/cards/b/BlightedGorge.java @@ -28,7 +28,7 @@ public final class BlightedGorge extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {4}{R}, {T}, Sacrifice Blighted Gorge: Blighted Gorge deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new DamageTargetEffect(2, "it"), new ManaCostsImpl<>("{4}{R}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/b/BlightedSteppe.java b/Mage.Sets/src/mage/cards/b/BlightedSteppe.java index 1ce2c55c587..084eaccc573 100644 --- a/Mage.Sets/src/mage/cards/b/BlightedSteppe.java +++ b/Mage.Sets/src/mage/cards/b/BlightedSteppe.java @@ -29,7 +29,7 @@ public final class BlightedSteppe extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {3}{W}, {T}, Sacrifice Blighted Steppe: You gain 2 life for each creature you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainLifeEffect(new PermanentsOnBattlefieldCount(StaticFilters.FILTER_PERMANENT_CREATURE_CONTROLLED, 2)), new ManaCostsImpl<>("{3}{W}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/b/BlightedWoodland.java b/Mage.Sets/src/mage/cards/b/BlightedWoodland.java index 2f21abb3582..144a89d8d90 100644 --- a/Mage.Sets/src/mage/cards/b/BlightedWoodland.java +++ b/Mage.Sets/src/mage/cards/b/BlightedWoodland.java @@ -30,7 +30,7 @@ public final class BlightedWoodland extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {3}{G}, {T}, Sacrifice Blighted Woodland: Search your library for up to two basic land cards and put them onto the battlefield tapped. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 2, StaticFilters.FILTER_CARD_BASIC_LANDS), true), new ManaCostsImpl<>("{3}{G}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/b/Blightspeaker.java b/Mage.Sets/src/mage/cards/b/Blightspeaker.java index 95582632e7e..9dc21ebc537 100644 --- a/Mage.Sets/src/mage/cards/b/Blightspeaker.java +++ b/Mage.Sets/src/mage/cards/b/Blightspeaker.java @@ -46,7 +46,7 @@ public final class Blightspeaker extends CardImpl { this.addAbility(ability); // {4}, {tap}: Search your library for a Rebel permanent card with converted mana cost 3 or less and put it onto the battlefield. Then shuffle your library. - SimpleActivatedAbility ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability2 = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), false), new ManaCostsImpl<>("{4}")); ability2.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/b/BlockadeRunner.java b/Mage.Sets/src/mage/cards/b/BlockadeRunner.java index 687f5975025..c678944b2d7 100644 --- a/Mage.Sets/src/mage/cards/b/BlockadeRunner.java +++ b/Mage.Sets/src/mage/cards/b/BlockadeRunner.java @@ -26,7 +26,7 @@ public final class BlockadeRunner extends CardImpl { this.toughness = new MageInt(2); // {U}: Blockade Runner is unblockable this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new CantBeBlockedSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); } diff --git a/Mage.Sets/src/mage/cards/b/BloodletterQuill.java b/Mage.Sets/src/mage/cards/b/BloodletterQuill.java index 15fef9dcf32..ffc4ce4094d 100644 --- a/Mage.Sets/src/mage/cards/b/BloodletterQuill.java +++ b/Mage.Sets/src/mage/cards/b/BloodletterQuill.java @@ -35,7 +35,7 @@ public final class BloodletterQuill extends CardImpl { ability.addCost(new PutCountersSourceCost(CounterType.BLOOD.createInstance())); this.addAbility(ability); // {U}{B}: Remove a blood counter from Bloodletter Quill. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new RemoveCounterSourceEffect(CounterType.BLOOD.createInstance()), new ManaCostsImpl<>("{U}{B}"))); } diff --git a/Mage.Sets/src/mage/cards/b/BloodshotCyclops.java b/Mage.Sets/src/mage/cards/b/BloodshotCyclops.java index e7895ef1e14..e962aecab7a 100644 --- a/Mage.Sets/src/mage/cards/b/BloodshotCyclops.java +++ b/Mage.Sets/src/mage/cards/b/BloodshotCyclops.java @@ -32,7 +32,7 @@ public final class BloodshotCyclops extends CardImpl { // {T}, Sacrifice a creature: Bloodshot Cyclops deals damage equal to the sacrificed // creature's power to any target. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new DamageTargetEffect(SacrificeCostCreaturesPower.instance).setText("{this} deals damage equal to the sacrificed creature's power to any target"), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); diff --git a/Mage.Sets/src/mage/cards/b/BloodthornTaunter.java b/Mage.Sets/src/mage/cards/b/BloodthornTaunter.java index 861eb98d5fd..72f4f37bf0f 100644 --- a/Mage.Sets/src/mage/cards/b/BloodthornTaunter.java +++ b/Mage.Sets/src/mage/cards/b/BloodthornTaunter.java @@ -34,7 +34,7 @@ public final class BloodthornTaunter extends CardImpl { this.toughness = new MageInt(1); this.addAbility(HasteAbility.getInstance()); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/b/BlueManaBattery.java b/Mage.Sets/src/mage/cards/b/BlueManaBattery.java index f3c55611adb..63f522e186b 100644 --- a/Mage.Sets/src/mage/cards/b/BlueManaBattery.java +++ b/Mage.Sets/src/mage/cards/b/BlueManaBattery.java @@ -28,7 +28,7 @@ public final class BlueManaBattery extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {2}, {T}: Put a charge counter on Blue Mana Battery. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new AddCountersSourceEffect(CounterType.CHARGE.createInstance(1)), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BogbrewWitch.java b/Mage.Sets/src/mage/cards/b/BogbrewWitch.java index 86851a11d9e..24c6da76871 100644 --- a/Mage.Sets/src/mage/cards/b/BogbrewWitch.java +++ b/Mage.Sets/src/mage/cards/b/BogbrewWitch.java @@ -39,7 +39,7 @@ public final class BogbrewWitch extends CardImpl { // {2}, {T}: Search your library for a card named Festering Newt or Bubbling Cauldron, put it onto the battlefield tapped, then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(1, 1, filter); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(target, true), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/b/Boompile.java b/Mage.Sets/src/mage/cards/b/Boompile.java index 30bcf8abcbe..9b6586b98c4 100644 --- a/Mage.Sets/src/mage/cards/b/Boompile.java +++ b/Mage.Sets/src/mage/cards/b/Boompile.java @@ -22,7 +22,7 @@ public final class Boompile extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {T}: Flip a coin. If you win the flip, destroy all nonland permanents. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new FlipCoinEffect(new DestroyAllEffect(new FilterNonlandPermanent("nonland permanents"))), new TapSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/b/Bramblesnap.java b/Mage.Sets/src/mage/cards/b/Bramblesnap.java index a9a4a40b2b4..02d5d0a31c1 100644 --- a/Mage.Sets/src/mage/cards/b/Bramblesnap.java +++ b/Mage.Sets/src/mage/cards/b/Bramblesnap.java @@ -38,7 +38,7 @@ public final class Bramblesnap extends CardImpl { this.toughness = new MageInt(1); this.addAbility(TrampleAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect(1, 1, Duration.EndOfTurn), new TapTargetCost(new TargetControlledPermanent(filter)))); } diff --git a/Mage.Sets/src/mage/cards/c/CacklingWitch.java b/Mage.Sets/src/mage/cards/c/CacklingWitch.java index 635c8d5455d..7f50ab19de3 100644 --- a/Mage.Sets/src/mage/cards/c/CacklingWitch.java +++ b/Mage.Sets/src/mage/cards/c/CacklingWitch.java @@ -34,7 +34,7 @@ public final class CacklingWitch extends CardImpl { // {X}{B}, {tap}, Discard a card: Target creature gets +X/+0 until end of turn. GetXValue manaX = GetXValue.instance; - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new BoostTargetEffect(manaX, StaticValue.get(0), Duration.EndOfTurn), new ManaCostsImpl<>("{X}{B}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/c/CarrionFeeder.java b/Mage.Sets/src/mage/cards/c/CarrionFeeder.java index f8f3a8672c1..4cd49ed528d 100644 --- a/Mage.Sets/src/mage/cards/c/CarrionFeeder.java +++ b/Mage.Sets/src/mage/cards/c/CarrionFeeder.java @@ -32,7 +32,7 @@ public final class CarrionFeeder extends CardImpl { // Carrion Feeder can't block. this.addAbility(new CantBlockAbility()); // Sacrifice a creature: Put a +1/+1 counter on Carrion Feeder. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE))); } diff --git a/Mage.Sets/src/mage/cards/c/CatharticAdept.java b/Mage.Sets/src/mage/cards/c/CatharticAdept.java index 2fcf54407d8..f7000e9a8de 100644 --- a/Mage.Sets/src/mage/cards/c/CatharticAdept.java +++ b/Mage.Sets/src/mage/cards/c/CatharticAdept.java @@ -27,7 +27,7 @@ public final class CatharticAdept extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new MillCardsTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/c/CattiBrieOfMithralHall.java b/Mage.Sets/src/mage/cards/c/CattiBrieOfMithralHall.java index 131a13f1aae..f0fe906e2ba 100644 --- a/Mage.Sets/src/mage/cards/c/CattiBrieOfMithralHall.java +++ b/Mage.Sets/src/mage/cards/c/CattiBrieOfMithralHall.java @@ -57,7 +57,7 @@ public final class CattiBrieOfMithralHall extends CardImpl { new AddCountersSourceEffect(CounterType.P1P1.createInstance(), amount, false).setText("put a +1/+1 counter on it for each Equipment attached to it"))); // {1}, Remove all +1/+1 counters from Catti-brie: It deals X damage to target attacking or blocking creature an opponent controls, where X is the number of counters removed this way. - Ability damageAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability damageAbility = new SimpleActivatedAbility( new DamageTargetEffect(CattiBrieRemovedCounterValue.instance).setText("it deals X damage to target attacking or blocking creature an opponent controls, where X is the number of counters removed this way"), new ManaCostsImpl<>("{1}")); damageAbility.addTarget(new TargetCreaturePermanent(filter)); damageAbility.addCost(new RemoveAllCountersSourceCost(CounterType.P1P1)); @@ -98,4 +98,4 @@ enum CattiBrieRemovedCounterValue implements DynamicValue { public String getMessage() { return ""; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/c/ClockOfOmens.java b/Mage.Sets/src/mage/cards/c/ClockOfOmens.java index 02b1f77f739..608ec64e602 100644 --- a/Mage.Sets/src/mage/cards/c/ClockOfOmens.java +++ b/Mage.Sets/src/mage/cards/c/ClockOfOmens.java @@ -31,7 +31,7 @@ public final class ClockOfOmens extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // Tap two untapped artifacts you control: Untap target artifact. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new UntapTargetEffect(), new TapTargetCost(new TargetControlledPermanent(2, 2, filter, true))); ability.addTarget(new TargetArtifactPermanent()); diff --git a/Mage.Sets/src/mage/cards/c/ConquerorsFoothold.java b/Mage.Sets/src/mage/cards/c/ConquerorsFoothold.java index bbca31d498d..aa342858ef5 100644 --- a/Mage.Sets/src/mage/cards/c/ConquerorsFoothold.java +++ b/Mage.Sets/src/mage/cards/c/ConquerorsFoothold.java @@ -30,21 +30,21 @@ public final class ConquerorsFoothold extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {2}, {T}: Draw a card, then discard a card. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {4}, {T}: Draw a card. - SimpleActivatedAbility ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability2 = new SimpleActivatedAbility( new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{4}")); ability2.addCost(new TapSourceCost()); this.addAbility(ability2); // {6}, {T}: Return target card from your graveyard to your hand. - SimpleActivatedAbility ability3 = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability3 = new SimpleActivatedAbility( new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl<>("{6}")); ability3.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/c/ConsulateSurveillance.java b/Mage.Sets/src/mage/cards/c/ConsulateSurveillance.java index f20457cf399..c578435ea36 100644 --- a/Mage.Sets/src/mage/cards/c/ConsulateSurveillance.java +++ b/Mage.Sets/src/mage/cards/c/ConsulateSurveillance.java @@ -27,7 +27,7 @@ public final class ConsulateSurveillance extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(4))); // Pay {E}{E}: Prevent all damage that would be dealt to you this turn by a source of your choice. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new PreventAllDamageFromChosenSourceToYouEffect(Duration.EndOfTurn, new FilterObject("source"), false), new PayEnergyCost(2))); diff --git a/Mage.Sets/src/mage/cards/c/Cursecatcher.java b/Mage.Sets/src/mage/cards/c/Cursecatcher.java index c0d694a12c6..12607e5f692 100644 --- a/Mage.Sets/src/mage/cards/c/Cursecatcher.java +++ b/Mage.Sets/src/mage/cards/c/Cursecatcher.java @@ -30,7 +30,7 @@ public final class Cursecatcher extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Cursecatcher: Counter target instant or sorcery spell unless its controller pays {1}. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new CounterUnlessPaysEffect(new GenericManaCost(1)), new SacrificeSourceCost()); ability.addTarget(new TargetSpell(StaticFilters.FILTER_SPELL_INSTANT_OR_SORCERY)); diff --git a/Mage.Sets/src/mage/cards/d/DarkApostle.java b/Mage.Sets/src/mage/cards/d/DarkApostle.java index 6c9c26185da..58348bdc425 100644 --- a/Mage.Sets/src/mage/cards/d/DarkApostle.java +++ b/Mage.Sets/src/mage/cards/d/DarkApostle.java @@ -30,7 +30,7 @@ public final class DarkApostle extends CardImpl { this.toughness = new MageInt(3); // Gift of Chaos -- {3}, {T}: The next noncreature spell you cast this turn has cascade. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new NextSpellCastHasAbilityEffect(new CascadeAbility(), StaticFilters.FILTER_CARD_NON_CREATURE), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/d/DarkMaze.java b/Mage.Sets/src/mage/cards/d/DarkMaze.java index 48e50e22fa2..5049770bbde 100644 --- a/Mage.Sets/src/mage/cards/d/DarkMaze.java +++ b/Mage.Sets/src/mage/cards/d/DarkMaze.java @@ -34,7 +34,7 @@ public final class DarkMaze extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {0}: Dark Maze can attack this turn as though it didn't have defender. Exile it at the beginning of the next end step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.EndOfTurn), new GenericManaCost(0)); ability.addEffect(new CreateDelayedTriggeredAbilityEffect( diff --git a/Mage.Sets/src/mage/cards/d/DaruEncampment.java b/Mage.Sets/src/mage/cards/d/DaruEncampment.java index 1c795b3ebc9..b5d8a77173c 100644 --- a/Mage.Sets/src/mage/cards/d/DaruEncampment.java +++ b/Mage.Sets/src/mage/cards/d/DaruEncampment.java @@ -33,7 +33,7 @@ public final class DaruEncampment extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {W}, {tap}: Target Soldier creature gets +1/+1 until end of turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/d/DawnglareInvoker.java b/Mage.Sets/src/mage/cards/d/DawnglareInvoker.java index 69308dc999a..09f652ca560 100644 --- a/Mage.Sets/src/mage/cards/d/DawnglareInvoker.java +++ b/Mage.Sets/src/mage/cards/d/DawnglareInvoker.java @@ -30,7 +30,7 @@ public final class DawnglareInvoker extends CardImpl { this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new TapAllTargetPlayerControlsEffect(StaticFilters.FILTER_PERMANENT_CREATURES), new ManaCostsImpl<>("{8}")); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/d/DawntreaderElk.java b/Mage.Sets/src/mage/cards/d/DawntreaderElk.java index a27b988a3cd..764232847c3 100644 --- a/Mage.Sets/src/mage/cards/d/DawntreaderElk.java +++ b/Mage.Sets/src/mage/cards/d/DawntreaderElk.java @@ -31,7 +31,7 @@ public final class DawntreaderElk extends CardImpl { this.toughness = new MageInt(2); // {G}, Sacrifice Dawntreader Elk: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/d/DeathCultist.java b/Mage.Sets/src/mage/cards/d/DeathCultist.java index e0ff79c3dd6..677dd46bd2e 100644 --- a/Mage.Sets/src/mage/cards/d/DeathCultist.java +++ b/Mage.Sets/src/mage/cards/d/DeathCultist.java @@ -28,7 +28,7 @@ public final class DeathCultist extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new LoseLifeTargetEffect(1), new SacrificeSourceCost()); ability.addEffect(new GainLifeEffect(1).concatBy("and")); @@ -44,4 +44,4 @@ public final class DeathCultist extends CardImpl { public DeathCultist copy() { return new DeathCultist(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/d/DeathlessAngel.java b/Mage.Sets/src/mage/cards/d/DeathlessAngel.java index ac426435387..7baf1d7a5db 100644 --- a/Mage.Sets/src/mage/cards/d/DeathlessAngel.java +++ b/Mage.Sets/src/mage/cards/d/DeathlessAngel.java @@ -36,7 +36,7 @@ public final class DeathlessAngel extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {W}{W}: Target creature is indestructible this turn. Effect effect = new GainAbilityTargetEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( effect, new ManaCostsImpl<>("{W}{W}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DeathsporeThallid.java b/Mage.Sets/src/mage/cards/d/DeathsporeThallid.java index 65bf6423d0b..8059832f05c 100644 --- a/Mage.Sets/src/mage/cards/d/DeathsporeThallid.java +++ b/Mage.Sets/src/mage/cards/d/DeathsporeThallid.java @@ -36,7 +36,7 @@ public final class DeathsporeThallid extends CardImpl { // At the beginning of your upkeep, put a spore counter on Deathspore Thallid. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()))); // Remove three spore counters from Deathspore Thallid: Create a 1/1 green Saproling creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); // Sacrifice a Saproling: Target creature gets -1/-1 until end of turn. diff --git a/Mage.Sets/src/mage/cards/d/DefiantFalcon.java b/Mage.Sets/src/mage/cards/d/DefiantFalcon.java index 5e429047a2a..48c3659d56d 100644 --- a/Mage.Sets/src/mage/cards/d/DefiantFalcon.java +++ b/Mage.Sets/src/mage/cards/d/DefiantFalcon.java @@ -42,7 +42,7 @@ public final class DefiantFalcon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {4}, {tap}: Search your library for a Rebel permanent card with converted mana cost 3 or less and put it onto the battlefield. Then shuffle your library. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), false), new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/d/DefiantVanguard.java b/Mage.Sets/src/mage/cards/d/DefiantVanguard.java index c6c991bc857..fa476e12d76 100644 --- a/Mage.Sets/src/mage/cards/d/DefiantVanguard.java +++ b/Mage.Sets/src/mage/cards/d/DefiantVanguard.java @@ -56,7 +56,7 @@ public final class DefiantVanguard extends CardImpl { this.addAbility(new DefiantVanguardTriggeredAbility(effect)); // {5}, {tap}: Search your library for a Rebel permanent card with converted mana cost 4 or less and put it onto the battlefield. Then shuffle your library. - SimpleActivatedAbility ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability2 = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), false), new ManaCostsImpl<>("{5}")); ability2.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/d/DenethorStoneSeer.java b/Mage.Sets/src/mage/cards/d/DenethorStoneSeer.java index 1273ea92438..175c2087856 100644 --- a/Mage.Sets/src/mage/cards/d/DenethorStoneSeer.java +++ b/Mage.Sets/src/mage/cards/d/DenethorStoneSeer.java @@ -38,7 +38,7 @@ public final class DenethorStoneSeer extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new ScryEffect(2))); // {3}{R}, {T}, Sacrifice Denethor: Target player becomes the monarch. Denethor deals 3 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new DenethorStoneSeerEffect(), new ManaCostsImpl<>("{3}{R}") ); @@ -89,4 +89,4 @@ class DenethorStoneSeerEffect extends OneShotEffect { ); return true; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/d/DescendantOfSoramaro.java b/Mage.Sets/src/mage/cards/d/DescendantOfSoramaro.java index 94524962e60..41a9c725d78 100644 --- a/Mage.Sets/src/mage/cards/d/DescendantOfSoramaro.java +++ b/Mage.Sets/src/mage/cards/d/DescendantOfSoramaro.java @@ -30,7 +30,7 @@ public final class DescendantOfSoramaro extends CardImpl { // {1}{U}: Look at the top X cards of your library, where X is the number of cards in your hand, then put them back in any order. Effect effect = new LookLibraryControllerEffect(CardsInControllerHandCount.instance); effect.setText("Look at the top X cards of your library, where X is the number of cards in your hand, then put them back in any order"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( effect, new ManaCostsImpl<>("{1}{U}"))); } diff --git a/Mage.Sets/src/mage/cards/d/DesolateLighthouse.java b/Mage.Sets/src/mage/cards/d/DesolateLighthouse.java index e56a4cdea90..58a69d2aba7 100644 --- a/Mage.Sets/src/mage/cards/d/DesolateLighthouse.java +++ b/Mage.Sets/src/mage/cards/d/DesolateLighthouse.java @@ -24,7 +24,7 @@ public final class DesolateLighthouse extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {1}{U}{R}, {tap}: Draw a card, then discard a card. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{1}{U}{R}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/d/DiscordantDirge.java b/Mage.Sets/src/mage/cards/d/DiscordantDirge.java index 3006b979edf..1706b620ada 100644 --- a/Mage.Sets/src/mage/cards/d/DiscordantDirge.java +++ b/Mage.Sets/src/mage/cards/d/DiscordantDirge.java @@ -33,7 +33,7 @@ public final class DiscordantDirge extends CardImpl { new AddCountersSourceEffect(CounterType.VERSE.createInstance(), true), true)); // {B}, Sacrifice Discordant Dirge: Look at target opponent's hand and choose up to X cards from it, where X is the number of verse counters on Discordant Dirge. That player discards those cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new DiscordantDirgeEffect(), new ManaCostsImpl<>("{B}")); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/d/DragonHatchling.java b/Mage.Sets/src/mage/cards/d/DragonHatchling.java index cf8422a6ff1..8418c99b647 100644 --- a/Mage.Sets/src/mage/cards/d/DragonHatchling.java +++ b/Mage.Sets/src/mage/cards/d/DragonHatchling.java @@ -30,7 +30,7 @@ public final class DragonHatchling extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {R}: Dragon Hatchling gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } diff --git a/Mage.Sets/src/mage/cards/d/DragonWhelp.java b/Mage.Sets/src/mage/cards/d/DragonWhelp.java index aaf755cf27f..3d721f6e9c9 100644 --- a/Mage.Sets/src/mage/cards/d/DragonWhelp.java +++ b/Mage.Sets/src/mage/cards/d/DragonWhelp.java @@ -39,7 +39,7 @@ public final class DragonWhelp extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {R}: Dragon Whelp gets +1/+0 until end of turn. If this ability has been activated four or more times this turn, sacrifice Dragon Whelp at the beginning of the next end step. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addEffect(new DragonWhelpEffect()); diff --git a/Mage.Sets/src/mage/cards/d/DragonWhisperer.java b/Mage.Sets/src/mage/cards/d/DragonWhisperer.java index dd463346042..a747b2246f4 100644 --- a/Mage.Sets/src/mage/cards/d/DragonWhisperer.java +++ b/Mage.Sets/src/mage/cards/d/DragonWhisperer.java @@ -40,7 +40,7 @@ public final class DragonWhisperer extends CardImpl { Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); // {1}{R}: Dragon Whisperer get +1/+0 until end of turn - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); diff --git a/Mage.Sets/src/mage/cards/d/DreamstoneHedron.java b/Mage.Sets/src/mage/cards/d/DreamstoneHedron.java index de4ff8d9eb7..324ab6946c2 100644 --- a/Mage.Sets/src/mage/cards/d/DreamstoneHedron.java +++ b/Mage.Sets/src/mage/cards/d/DreamstoneHedron.java @@ -24,7 +24,7 @@ public final class DreamstoneHedron extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{6}"); this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(3), new TapSourceCost())); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new DrawCardSourceControllerEffect(3), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/d/DrossHopper.java b/Mage.Sets/src/mage/cards/d/DrossHopper.java index 03dbdf8d8f4..ceaafec2bd2 100644 --- a/Mage.Sets/src/mage/cards/d/DrossHopper.java +++ b/Mage.Sets/src/mage/cards/d/DrossHopper.java @@ -30,7 +30,7 @@ public final class DrossHopper extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE))); } diff --git a/Mage.Sets/src/mage/cards/e/ElvishPiper.java b/Mage.Sets/src/mage/cards/e/ElvishPiper.java index 230961e4947..552d3d408cf 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishPiper.java +++ b/Mage.Sets/src/mage/cards/e/ElvishPiper.java @@ -29,7 +29,7 @@ public final class ElvishPiper extends CardImpl { this.toughness = new MageInt(1); // {G}, {tap}: You may put a creature card from your hand onto the battlefield. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_CREATURE_A), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/e/EmbodimentOfSpring.java b/Mage.Sets/src/mage/cards/e/EmbodimentOfSpring.java index 195c0cfca16..00e5c48868a 100644 --- a/Mage.Sets/src/mage/cards/e/EmbodimentOfSpring.java +++ b/Mage.Sets/src/mage/cards/e/EmbodimentOfSpring.java @@ -31,7 +31,7 @@ public final class EmbodimentOfSpring extends CardImpl { this.toughness = new MageInt(3); // {1}{G}, {T}, Sacrifice Embodiment of Spring: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/e/EnslavedScout.java b/Mage.Sets/src/mage/cards/e/EnslavedScout.java index 33dd2a4c365..523ee5f149e 100644 --- a/Mage.Sets/src/mage/cards/e/EnslavedScout.java +++ b/Mage.Sets/src/mage/cards/e/EnslavedScout.java @@ -28,7 +28,7 @@ public final class EnslavedScout extends CardImpl { this.toughness = new MageInt(2); // {2}: Enslaved Scout gains mountainwalk until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(new MountainwalkAbility(false), Duration.EndOfTurn), new GenericManaCost(2))); } diff --git a/Mage.Sets/src/mage/cards/e/EsperBattlemage.java b/Mage.Sets/src/mage/cards/e/EsperBattlemage.java index fd434290c43..535763767e5 100644 --- a/Mage.Sets/src/mage/cards/e/EsperBattlemage.java +++ b/Mage.Sets/src/mage/cards/e/EsperBattlemage.java @@ -31,13 +31,13 @@ public final class EsperBattlemage extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); // {W}, {tap}: Prevent the next 2 damage that would be dealt to you this turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new PreventDamageToControllerEffect(Duration.EndOfTurn, 2), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {B}, {tap}: Target creature gets -1/-1 until end of turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + ability = new SimpleActivatedAbility( new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/e/EtherealUsher.java b/Mage.Sets/src/mage/cards/e/EtherealUsher.java index 41b2ac0645a..163742f7a9d 100644 --- a/Mage.Sets/src/mage/cards/e/EtherealUsher.java +++ b/Mage.Sets/src/mage/cards/e/EtherealUsher.java @@ -30,7 +30,7 @@ public final class EtherealUsher extends CardImpl { this.toughness = new MageInt(3); // {U}, {tap}: Target creature can't be blocked this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new CantBeBlockedTargetEffect(), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/e/ExpeditionMap.java b/Mage.Sets/src/mage/cards/e/ExpeditionMap.java index da74c07cb76..dc7a64ba4e8 100644 --- a/Mage.Sets/src/mage/cards/e/ExpeditionMap.java +++ b/Mage.Sets/src/mage/cards/e/ExpeditionMap.java @@ -25,7 +25,7 @@ public final class ExpeditionMap extends CardImpl { // {2}, {tap}, Sacrifice Expedition Map: Search your library for a land card, reveal it, and put it into your hand. Then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(new FilterLandCard()); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new SearchLibraryPutInHandEffect(target, true), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/e/EyeOfUgin.java b/Mage.Sets/src/mage/cards/e/EyeOfUgin.java index f6382c38d5f..9468b3c1f26 100644 --- a/Mage.Sets/src/mage/cards/e/EyeOfUgin.java +++ b/Mage.Sets/src/mage/cards/e/EyeOfUgin.java @@ -42,7 +42,7 @@ public final class EyeOfUgin extends CardImpl { this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filterSpells, 2))); // {7}, {tap}: Search your library for a colorless creature card, reveal it, and put it into your hand. Then shuffle your library. - Ability searchAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability searchAbility = new SimpleActivatedAbility( new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true), new TapSourceCost()); searchAbility.addCost(new ManaCostsImpl<>("{7}")); diff --git a/Mage.Sets/src/mage/cards/e/EzuriRenegadeLeader.java b/Mage.Sets/src/mage/cards/e/EzuriRenegadeLeader.java index 402b2d287de..c46368491ac 100644 --- a/Mage.Sets/src/mage/cards/e/EzuriRenegadeLeader.java +++ b/Mage.Sets/src/mage/cards/e/EzuriRenegadeLeader.java @@ -47,7 +47,7 @@ public final class EzuriRenegadeLeader extends CardImpl { this.addAbility(ezuriRegen); // {2}{G}{G}{G}: Elf creatures you control get +3/+3 and gain trample until end of turn. - Ability ezuriBoost = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ezuriBoost = new SimpleActivatedAbility( new BoostControlledEffect(3, 3, Duration.EndOfTurn, elfFilter, false) .setText("Elf creatures you control get +3/+3"), new ManaCostsImpl<>("{2}{G}{G}{G}")); diff --git a/Mage.Sets/src/mage/cards/f/FalkenrathAristocrat.java b/Mage.Sets/src/mage/cards/f/FalkenrathAristocrat.java index 2df24ef2dec..432f23b1ea2 100644 --- a/Mage.Sets/src/mage/cards/f/FalkenrathAristocrat.java +++ b/Mage.Sets/src/mage/cards/f/FalkenrathAristocrat.java @@ -38,7 +38,7 @@ public final class FalkenrathAristocrat extends CardImpl { this.addAbility(HasteAbility.getInstance()); // Sacrifice a creature: Falkenrath Aristocrat is indestructible this turn. // If the sacrificed creature was a Human, put a +1/+1 counter on Falkenrath Aristocrat. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addEffect(new FalkenrathAristocratEffect()); diff --git a/Mage.Sets/src/mage/cards/f/FalkenrathTorturer.java b/Mage.Sets/src/mage/cards/f/FalkenrathTorturer.java index d5377d291eb..1febd114273 100644 --- a/Mage.Sets/src/mage/cards/f/FalkenrathTorturer.java +++ b/Mage.Sets/src/mage/cards/f/FalkenrathTorturer.java @@ -34,7 +34,7 @@ public final class FalkenrathTorturer extends CardImpl { // Sacrifice a creature: Falkenrath Torturer gains flying until end of turn. // If the sacrificed creature was a Human, put a +1/+1 counter on Falkenrath Torturer. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addEffect(new FalkenrathAristocratEffect()); diff --git a/Mage.Sets/src/mage/cards/f/FanaticalDevotion.java b/Mage.Sets/src/mage/cards/f/FanaticalDevotion.java index 80e49acba2a..cbdd7e50322 100644 --- a/Mage.Sets/src/mage/cards/f/FanaticalDevotion.java +++ b/Mage.Sets/src/mage/cards/f/FanaticalDevotion.java @@ -24,7 +24,7 @@ public final class FanaticalDevotion extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); // Sacrifice a creature: Regenerate target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new RegenerateTargetEffect(), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/f/FaunaShaman.java b/Mage.Sets/src/mage/cards/f/FaunaShaman.java index 1e8df9a747f..3031318fa38 100644 --- a/Mage.Sets/src/mage/cards/f/FaunaShaman.java +++ b/Mage.Sets/src/mage/cards/f/FaunaShaman.java @@ -33,7 +33,7 @@ public final class FaunaShaman extends CardImpl { this.toughness = new MageInt(2); // {G}, {tap}, Discard a creature card: Search your library for a creature card, reveal it, and put it into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_CREATURE_A), true), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/f/FeralAnimist.java b/Mage.Sets/src/mage/cards/f/FeralAnimist.java index bca5b3aae15..d8a8c6c6284 100644 --- a/Mage.Sets/src/mage/cards/f/FeralAnimist.java +++ b/Mage.Sets/src/mage/cards/f/FeralAnimist.java @@ -30,7 +30,7 @@ public final class FeralAnimist extends CardImpl { this.toughness = new MageInt(1); // {3}: Feral Animist gets +X/+0 until end of turn, where X is its power. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect(SourcePermanentPowerValue.NOT_NEGATIVE, StaticValue.get(0), Duration.EndOfTurn), new GenericManaCost(3))); } diff --git a/Mage.Sets/src/mage/cards/f/FireShrineKeeper.java b/Mage.Sets/src/mage/cards/f/FireShrineKeeper.java index f94593d22e3..e40fc0b2002 100644 --- a/Mage.Sets/src/mage/cards/f/FireShrineKeeper.java +++ b/Mage.Sets/src/mage/cards/f/FireShrineKeeper.java @@ -34,7 +34,7 @@ public final class FireShrineKeeper extends CardImpl { this.addAbility(new MenaceAbility(false)); // {7}{R}, {T}, Sacrifice Fire Shrine Keeper: It deals 3 damage to each of up to two target creatures. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new DamageTargetEffect(3).setText("It deals 3 damage to each of up to two target creatures"), new ManaCostsImpl<>("{7}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/f/FirebrandRanger.java b/Mage.Sets/src/mage/cards/f/FirebrandRanger.java index e9047aa9d3d..7aec90d1e23 100644 --- a/Mage.Sets/src/mage/cards/f/FirebrandRanger.java +++ b/Mage.Sets/src/mage/cards/f/FirebrandRanger.java @@ -30,7 +30,7 @@ public final class FirebrandRanger extends CardImpl { this.toughness = new MageInt(1); // {G}, {T}: You may put a basic land card from your hand onto the battlefield. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_BASIC_LAND_A), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FlamekinVillage.java b/Mage.Sets/src/mage/cards/f/FlamekinVillage.java index b0e97ca7a55..b59196673bf 100644 --- a/Mage.Sets/src/mage/cards/f/FlamekinVillage.java +++ b/Mage.Sets/src/mage/cards/f/FlamekinVillage.java @@ -43,7 +43,7 @@ public final class FlamekinVillage extends CardImpl { this.addAbility(new RedManaAbility()); // {R}, {tap}: Target creature gains haste until end of turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/f/FlinthoofBoar.java b/Mage.Sets/src/mage/cards/f/FlinthoofBoar.java index 4dc0d23dbaa..b0827324c4c 100644 --- a/Mage.Sets/src/mage/cards/f/FlinthoofBoar.java +++ b/Mage.Sets/src/mage/cards/f/FlinthoofBoar.java @@ -40,7 +40,7 @@ public final class FlinthoofBoar extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filter, 1, 1))); // {R}: Flinthoof Boar gains haste until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneMauler.java b/Mage.Sets/src/mage/cards/f/FlowstoneMauler.java index 653adb57c35..9710f794a82 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneMauler.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneMauler.java @@ -30,7 +30,7 @@ public final class FlowstoneMauler extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // {R}: Flowstone Mauler gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } diff --git a/Mage.Sets/src/mage/cards/f/FreewindEquenaut.java b/Mage.Sets/src/mage/cards/f/FreewindEquenaut.java index f07d673d300..a656674ee8e 100644 --- a/Mage.Sets/src/mage/cards/f/FreewindEquenaut.java +++ b/Mage.Sets/src/mage/cards/f/FreewindEquenaut.java @@ -35,7 +35,7 @@ public final class FreewindEquenaut extends CardImpl { this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new DamageTargetEffect(2), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(new FilterAttackingOrBlockingCreature())); diff --git a/Mage.Sets/src/mage/cards/f/FromBeyond.java b/Mage.Sets/src/mage/cards/f/FromBeyond.java index 0aba27c0fc2..6f595efa3d6 100644 --- a/Mage.Sets/src/mage/cards/f/FromBeyond.java +++ b/Mage.Sets/src/mage/cards/f/FromBeyond.java @@ -42,7 +42,7 @@ public final class FromBeyond extends CardImpl { new EldraziScionToken()).withTextOptions(true))); // {1}{G}, Sacrifice From Beyond: Search your library for an Eldrazi card, reveal it, put it into your hand, then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/f/FrontierGuide.java b/Mage.Sets/src/mage/cards/f/FrontierGuide.java index af52ba1e875..6a51996c5ae 100644 --- a/Mage.Sets/src/mage/cards/f/FrontierGuide.java +++ b/Mage.Sets/src/mage/cards/f/FrontierGuide.java @@ -30,7 +30,7 @@ public final class FrontierGuide extends CardImpl { this.toughness = new MageInt(1); //{3}{G}, {T}: Search your library for a basic land card and put it onto the battlefield tapped. Then shuffle your library. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), new ManaCostsImpl<>("{3}{G}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/f/FungalBloom.java b/Mage.Sets/src/mage/cards/f/FungalBloom.java index def6c4fb7cd..e58a24784ae 100644 --- a/Mage.Sets/src/mage/cards/f/FungalBloom.java +++ b/Mage.Sets/src/mage/cards/f/FungalBloom.java @@ -31,7 +31,7 @@ public final class FungalBloom extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{G}{G}"); // {G}{G}: Put a spore counter on target Fungus. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new AddCountersTargetEffect(CounterType.SPORE.createInstance()), new ManaCostsImpl<>("{G}{G}")); ability.addTarget(new TargetPermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/f/FungalPlots.java b/Mage.Sets/src/mage/cards/f/FungalPlots.java index be19aff9cfa..0b0c463bba4 100644 --- a/Mage.Sets/src/mage/cards/f/FungalPlots.java +++ b/Mage.Sets/src/mage/cards/f/FungalPlots.java @@ -37,7 +37,7 @@ public final class FungalPlots extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); // {1}{G}, Exile a creature card from your graveyard: Create a 1/1 green Saproling creature token. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(filter))); diff --git a/Mage.Sets/src/mage/cards/g/GearseekerSerpent.java b/Mage.Sets/src/mage/cards/g/GearseekerSerpent.java index cd7af91104f..fdb8c1f1746 100644 --- a/Mage.Sets/src/mage/cards/g/GearseekerSerpent.java +++ b/Mage.Sets/src/mage/cards/g/GearseekerSerpent.java @@ -34,7 +34,7 @@ public final class GearseekerSerpent extends CardImpl { ).addHint(ArtifactYouControlHint.instance)); // 5U: Gearseeker Serpent can't be blocked this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new CantBeBlockedSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{5}{U}"))); } diff --git a/Mage.Sets/src/mage/cards/g/GeneralHux.java b/Mage.Sets/src/mage/cards/g/GeneralHux.java index 7ecbc558194..9d757ca2774 100644 --- a/Mage.Sets/src/mage/cards/g/GeneralHux.java +++ b/Mage.Sets/src/mage/cards/g/GeneralHux.java @@ -38,7 +38,7 @@ public final class GeneralHux extends CardImpl { this.toughness = new MageInt(3); // Whenever General Hux or another nontoken creature you control enters, until end of turn, target creature gains "{B}: This creature gets +1/+1 until end of turn." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new BoostSourceEffect(1, 1, Duration.EndOfTurn) .setText("This creature gets +1/+1 until end of turn"), new ManaCostsImpl<>("{B}")); diff --git a/Mage.Sets/src/mage/cards/g/GerrardsBattleCry.java b/Mage.Sets/src/mage/cards/g/GerrardsBattleCry.java index 930acdf5fed..f5e479c7888 100644 --- a/Mage.Sets/src/mage/cards/g/GerrardsBattleCry.java +++ b/Mage.Sets/src/mage/cards/g/GerrardsBattleCry.java @@ -20,7 +20,7 @@ public final class GerrardsBattleCry extends CardImpl { public GerrardsBattleCry(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{W}"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostControlledEffect(1, 1, Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES, false), new ManaCostsImpl<>("{2}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/g/GhirapurAetherGrid.java b/Mage.Sets/src/mage/cards/g/GhirapurAetherGrid.java index 72b144e16bb..30f455885ff 100644 --- a/Mage.Sets/src/mage/cards/g/GhirapurAetherGrid.java +++ b/Mage.Sets/src/mage/cards/g/GhirapurAetherGrid.java @@ -31,7 +31,7 @@ public final class GhirapurAetherGrid extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}"); // Tap two untaped artifacts you control: Ghirapur Aether Grid deals 1 damage to any target - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new DamageTargetEffect(1), new TapTargetCost(new TargetControlledPermanent(2, 2, filter, true))); ability.addTarget(new TargetAnyTarget().withChooseHint("deals 1 damage to")); diff --git a/Mage.Sets/src/mage/cards/g/GhituEncampment.java b/Mage.Sets/src/mage/cards/g/GhituEncampment.java index 5d90baff570..9ef92350721 100644 --- a/Mage.Sets/src/mage/cards/g/GhituEncampment.java +++ b/Mage.Sets/src/mage/cards/g/GhituEncampment.java @@ -28,7 +28,7 @@ public final class GhituEncampment extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); this.addAbility(new RedManaAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BecomesCreatureSourceEffect(new GhituEncampmentToken(), CardType.LAND, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } diff --git a/Mage.Sets/src/mage/cards/g/GnarledEffigy.java b/Mage.Sets/src/mage/cards/g/GnarledEffigy.java index f4c12c554ed..c630534e14f 100644 --- a/Mage.Sets/src/mage/cards/g/GnarledEffigy.java +++ b/Mage.Sets/src/mage/cards/g/GnarledEffigy.java @@ -23,7 +23,7 @@ public final class GnarledEffigy extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {4}, {tap}: Put a -1/-1 counter on target creature. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/g/GoblinChirurgeon.java b/Mage.Sets/src/mage/cards/g/GoblinChirurgeon.java index 6e31d024bc9..06b637c8f01 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinChirurgeon.java +++ b/Mage.Sets/src/mage/cards/g/GoblinChirurgeon.java @@ -33,7 +33,7 @@ public final class GoblinChirurgeon extends CardImpl { this.toughness = new MageInt(2); // Sacrifice a Goblin: Regenerate target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new RegenerateTargetEffect(), new SacrificeTargetCost(filter)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/g/GoblinDiplomats.java b/Mage.Sets/src/mage/cards/g/GoblinDiplomats.java index 767bb70d7a3..ae62e6889dd 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinDiplomats.java +++ b/Mage.Sets/src/mage/cards/g/GoblinDiplomats.java @@ -28,7 +28,7 @@ public final class GoblinDiplomats extends CardImpl { this.toughness = new MageInt(1); // {T}: Each creature attacks this turn if able. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new AttacksIfAbleAllEffect(StaticFilters.FILTER_PERMANENT_ALL_CREATURES, Duration.EndOfTurn) .setText("Each creature attacks this turn if able"), new TapSourceCost())); diff --git a/Mage.Sets/src/mage/cards/g/GoblinKites.java b/Mage.Sets/src/mage/cards/g/GoblinKites.java index 689cd4e24c1..d97bf0b1b57 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinKites.java +++ b/Mage.Sets/src/mage/cards/g/GoblinKites.java @@ -39,7 +39,7 @@ public final class GoblinKites extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{R}"); // {R}: Target creature you control with toughness 2 or less gains flying until end of turn. Flip a coin at the beginning of the next end step. If you lose the flip, sacrifice that creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addTarget(new TargetPermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/g/GoblinWizard.java b/Mage.Sets/src/mage/cards/g/GoblinWizard.java index 9517b2d5dbc..e3af000fcca 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinWizard.java +++ b/Mage.Sets/src/mage/cards/g/GoblinWizard.java @@ -42,12 +42,12 @@ public final class GoblinWizard extends CardImpl { this.toughness = new MageInt(1); // {tap}: You may put a Goblin permanent card from your hand onto the battlefield. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new PutCardFromHandOntoBattlefieldEffect(filterCard), new TapSourceCost())); // {R}: Target Goblin gains protection from white until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(ProtectionAbility.from(ObjectColor.WHITE), Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); Target target = new TargetPermanent(filter2); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/g/GoreVassal.java b/Mage.Sets/src/mage/cards/g/GoreVassal.java index 83d42417e7d..ce06f6ffddf 100644 --- a/Mage.Sets/src/mage/cards/g/GoreVassal.java +++ b/Mage.Sets/src/mage/cards/g/GoreVassal.java @@ -33,7 +33,7 @@ public final class GoreVassal extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Gore Vassal: Put a -1/-1 counter on target creature. Then if that creature's toughness is 1 or greater, regenerate it. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/g/GreaterStoneSpirit.java b/Mage.Sets/src/mage/cards/g/GreaterStoneSpirit.java index dc73967e12c..e193a529440 100644 --- a/Mage.Sets/src/mage/cards/g/GreaterStoneSpirit.java +++ b/Mage.Sets/src/mage/cards/g/GreaterStoneSpirit.java @@ -46,7 +46,7 @@ public final class GreaterStoneSpirit extends CardImpl { this.addAbility(new SimpleEvasionAbility(new CantBeBlockedByCreaturesSourceEffect(filter, Duration.WhileOnBattlefield))); // {2}{R}: Until end of turn, target creature gets +0/+2 and gains "{R}: This creature gets +1/+0 until end of turn." - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability gainedAbility = new SimpleActivatedAbility( new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}") ); diff --git a/Mage.Sets/src/mage/cards/g/GreenManaBattery.java b/Mage.Sets/src/mage/cards/g/GreenManaBattery.java index 4981a108587..80de5aad2e6 100644 --- a/Mage.Sets/src/mage/cards/g/GreenManaBattery.java +++ b/Mage.Sets/src/mage/cards/g/GreenManaBattery.java @@ -28,7 +28,7 @@ public final class GreenManaBattery extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {2}, {T}: Put a charge counter on Green Mana Battery. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new AddCountersSourceEffect(CounterType.CHARGE.createInstance(1)), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/Greenseeker.java b/Mage.Sets/src/mage/cards/g/Greenseeker.java index 587d891de60..bcd65efe6dd 100644 --- a/Mage.Sets/src/mage/cards/g/Greenseeker.java +++ b/Mage.Sets/src/mage/cards/g/Greenseeker.java @@ -32,7 +32,7 @@ public final class Greenseeker extends CardImpl { this.toughness = new MageInt(1); // {G}, {tap}, Discard a card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInHandEffect(new TargetCardInLibrary(1, 1, StaticFilters.FILTER_CARD_BASIC_LAND), true), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/g/GrimoireThief.java b/Mage.Sets/src/mage/cards/g/GrimoireThief.java index 8f9da4e6f2a..e521250b5e0 100644 --- a/Mage.Sets/src/mage/cards/g/GrimoireThief.java +++ b/Mage.Sets/src/mage/cards/g/GrimoireThief.java @@ -51,7 +51,7 @@ public final class GrimoireThief extends CardImpl { // {U}, Sacrifice Grimoire Thief: Turn all cards exiled with //Grimoire Thief face up. Counter all spells with those names. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability2 = new SimpleActivatedAbility( new GrimoireThiefCounterspellEffect(), new ManaCostsImpl<>("{U}")); ability2.addCost(new SacrificeSourceCost()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/g/Gristleback.java b/Mage.Sets/src/mage/cards/g/Gristleback.java index ad91569035f..27d99e4867f 100644 --- a/Mage.Sets/src/mage/cards/g/Gristleback.java +++ b/Mage.Sets/src/mage/cards/g/Gristleback.java @@ -31,7 +31,7 @@ public final class Gristleback extends CardImpl { this.addAbility(new BloodthirstAbility(1)); // Sacrifice Gristleback: You gain life equal to Gristleback's power. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainLifeEffect(SourcePermanentPowerValue.NOT_NEGATIVE).setText("You gain life equal to {this}'s power"), new SacrificeSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/h/HairStrungKoto.java b/Mage.Sets/src/mage/cards/h/HairStrungKoto.java index 9fb5eab813a..9c339dd0103 100644 --- a/Mage.Sets/src/mage/cards/h/HairStrungKoto.java +++ b/Mage.Sets/src/mage/cards/h/HairStrungKoto.java @@ -31,7 +31,7 @@ public final class HairStrungKoto extends CardImpl { /* Tap an untapped creature you control: Target player puts the top * card of their library into their graveyard. */ - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new MillCardsTargetEffect(1), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false))); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/h/HarborBandit.java b/Mage.Sets/src/mage/cards/h/HarborBandit.java index f25c30cd42b..827bf6921b3 100644 --- a/Mage.Sets/src/mage/cards/h/HarborBandit.java +++ b/Mage.Sets/src/mage/cards/h/HarborBandit.java @@ -45,7 +45,7 @@ public final class HarborBandit extends CardImpl { this.addAbility(new SimpleStaticAbility(effect)); // {1}{U}: Harbor Bandit can't be blocked this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new CantBeBlockedSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}"))); } diff --git a/Mage.Sets/src/mage/cards/h/HavengulRunebinder.java b/Mage.Sets/src/mage/cards/h/HavengulRunebinder.java index 036d7afbb7e..84a50239217 100644 --- a/Mage.Sets/src/mage/cards/h/HavengulRunebinder.java +++ b/Mage.Sets/src/mage/cards/h/HavengulRunebinder.java @@ -43,7 +43,7 @@ public final class HavengulRunebinder extends CardImpl { // {2}{U}, {tap}, Exile a creature card from your graveyard: Create a 2/2 black Zombie creature token, // then put a +1/+1 counter on each Zombie creature you control. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new CreateTokenEffect(new ZombieToken()), new ManaCostsImpl<>("{2}{U}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/h/HecklingFiends.java b/Mage.Sets/src/mage/cards/h/HecklingFiends.java index 5aa5e9eeeff..daf908df67a 100644 --- a/Mage.Sets/src/mage/cards/h/HecklingFiends.java +++ b/Mage.Sets/src/mage/cards/h/HecklingFiends.java @@ -28,7 +28,7 @@ public final class HecklingFiends extends CardImpl { this.toughness = new MageInt(2); // {2}{R}: Target creature attacks this turn if able. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new AttacksIfAbleTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}")); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/h/HelixPinnacle.java b/Mage.Sets/src/mage/cards/h/HelixPinnacle.java index 53417ecad9d..23dc34ade0b 100644 --- a/Mage.Sets/src/mage/cards/h/HelixPinnacle.java +++ b/Mage.Sets/src/mage/cards/h/HelixPinnacle.java @@ -32,7 +32,7 @@ public final class HelixPinnacle extends CardImpl { this.addAbility(ShroudAbility.getInstance()); // {X}: Put X tower counters on Helix Pinnacle. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new AddCountersSourceEffect(CounterType.TOWER.createInstance(), GetXValue.instance, true), new ManaCostsImpl<>("{X}"))); diff --git a/Mage.Sets/src/mage/cards/h/HellkiteIgniter.java b/Mage.Sets/src/mage/cards/h/HellkiteIgniter.java index 4e807bfb029..1fc12401c37 100644 --- a/Mage.Sets/src/mage/cards/h/HellkiteIgniter.java +++ b/Mage.Sets/src/mage/cards/h/HellkiteIgniter.java @@ -42,7 +42,7 @@ public final class HellkiteIgniter extends CardImpl { this.addAbility(FlyingAbility.getInstance()); this.addAbility(HasteAbility.getInstance()); // {1}{R}: Hellkite Igniter gets +X/+0 until end of turn, where X is the number of artifacts you control. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect( new PermanentsOnBattlefieldCount(filter), StaticValue.get(0), diff --git a/Mage.Sets/src/mage/cards/h/HorizonSpellbomb.java b/Mage.Sets/src/mage/cards/h/HorizonSpellbomb.java index 158965ea83c..63f4f6d624a 100644 --- a/Mage.Sets/src/mage/cards/h/HorizonSpellbomb.java +++ b/Mage.Sets/src/mage/cards/h/HorizonSpellbomb.java @@ -28,7 +28,7 @@ public final class HorizonSpellbomb extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {2}, {tap}, Sacrifice Horizon Spellbomb: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/i/ImmaculateMagistrate.java b/Mage.Sets/src/mage/cards/i/ImmaculateMagistrate.java index ca17fd4be2c..e6fd1511449 100644 --- a/Mage.Sets/src/mage/cards/i/ImmaculateMagistrate.java +++ b/Mage.Sets/src/mage/cards/i/ImmaculateMagistrate.java @@ -34,7 +34,7 @@ public final class ImmaculateMagistrate extends CardImpl { this.toughness = new MageInt(2); // {tap}: Put a +1/+1 counter on target creature for each Elf you control. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new ImmaculateMagistrateEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/i/IncendiaryOracle.java b/Mage.Sets/src/mage/cards/i/IncendiaryOracle.java index 8279a536d1e..a05ce3183ef 100644 --- a/Mage.Sets/src/mage/cards/i/IncendiaryOracle.java +++ b/Mage.Sets/src/mage/cards/i/IncendiaryOracle.java @@ -30,7 +30,7 @@ public final class IncendiaryOracle extends CardImpl { this.toughness = new MageInt(2); // {1}{R}: Incendiary Oracle gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); // If a creature dealt damage by Incendiary Oracle this turn would die, exile it instead. diff --git a/Mage.Sets/src/mage/cards/i/IsochronScepter.java b/Mage.Sets/src/mage/cards/i/IsochronScepter.java index a18c8fc6831..9b04b5623c6 100644 --- a/Mage.Sets/src/mage/cards/i/IsochronScepter.java +++ b/Mage.Sets/src/mage/cards/i/IsochronScepter.java @@ -37,7 +37,7 @@ public final class IsochronScepter extends CardImpl { ); // {2}, {T}: You may copy the exiled card. If you do, you may cast the copy without paying its mana cost. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new IsochronScepterCopyEffect(), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/IvyDancer.java b/Mage.Sets/src/mage/cards/i/IvyDancer.java index 1bdf7f020e3..709c9d2a193 100644 --- a/Mage.Sets/src/mage/cards/i/IvyDancer.java +++ b/Mage.Sets/src/mage/cards/i/IvyDancer.java @@ -31,7 +31,7 @@ public final class IvyDancer extends CardImpl { this.toughness = new MageInt(2); // {tap}: Target creature gains forestwalk until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(new ForestwalkAbility(false), Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/i/IxallisKeeper.java b/Mage.Sets/src/mage/cards/i/IxallisKeeper.java index ace1de130da..1fee2a1c8d7 100644 --- a/Mage.Sets/src/mage/cards/i/IxallisKeeper.java +++ b/Mage.Sets/src/mage/cards/i/IxallisKeeper.java @@ -33,7 +33,7 @@ public final class IxallisKeeper extends CardImpl { this.toughness = new MageInt(2); // {7}{G}, {T}, Sacrifice Ixalli's Keeper: Target creature gets +5/+5 and gains trample until end of turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new BoostTargetEffect(5, 5, Duration.EndOfTurn) .setText("Target creature gets +5/+5"), new ManaCostsImpl<>("{7}{G}")); ability.addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn) diff --git a/Mage.Sets/src/mage/cards/j/JourneyersKite.java b/Mage.Sets/src/mage/cards/j/JourneyersKite.java index d6ea31d7280..b9932ab3f85 100644 --- a/Mage.Sets/src/mage/cards/j/JourneyersKite.java +++ b/Mage.Sets/src/mage/cards/j/JourneyersKite.java @@ -27,7 +27,7 @@ public final class JourneyersKite extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {3}, {tap}: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/j/JudgesFamiliar.java b/Mage.Sets/src/mage/cards/j/JudgesFamiliar.java index 6437e81e688..4eeffdb1485 100644 --- a/Mage.Sets/src/mage/cards/j/JudgesFamiliar.java +++ b/Mage.Sets/src/mage/cards/j/JudgesFamiliar.java @@ -34,7 +34,7 @@ public final class JudgesFamiliar extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Sacrifice Judge's Familiar: Counter target instant or sorcery spell unless its controller pays {1}. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new CounterUnlessPaysEffect(new GenericManaCost(1)), new SacrificeSourceCost()); ability.addTarget(new TargetSpell(StaticFilters.FILTER_SPELL_INSTANT_OR_SORCERY)); @@ -49,4 +49,4 @@ public final class JudgesFamiliar extends CardImpl { public JudgesFamiliar copy() { return new JudgesFamiliar(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/j/JungleDelver.java b/Mage.Sets/src/mage/cards/j/JungleDelver.java index baa4373b82f..9faefde8611 100644 --- a/Mage.Sets/src/mage/cards/j/JungleDelver.java +++ b/Mage.Sets/src/mage/cards/j/JungleDelver.java @@ -28,7 +28,7 @@ public final class JungleDelver extends CardImpl { this.toughness = new MageInt(1); // {3}{G}: Put a +1/+1 counter on Jungle Delver. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{3}{G}"))); } diff --git a/Mage.Sets/src/mage/cards/k/KahoMinamoHistorian.java b/Mage.Sets/src/mage/cards/k/KahoMinamoHistorian.java index bf6d37604de..1a1df2ee408 100644 --- a/Mage.Sets/src/mage/cards/k/KahoMinamoHistorian.java +++ b/Mage.Sets/src/mage/cards/k/KahoMinamoHistorian.java @@ -43,7 +43,7 @@ public final class KahoMinamoHistorian extends CardImpl { // {X}, {tap}: You may cast a card with converted mana cost X exiled with // Kaho without paying its mana cost. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new KahoMinamoHistorianCastEffect(), new ManaCostsImpl<>("{X}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KamahlFistOfKrosa.java b/Mage.Sets/src/mage/cards/k/KamahlFistOfKrosa.java index cb8890b33cf..aea3dce1064 100644 --- a/Mage.Sets/src/mage/cards/k/KamahlFistOfKrosa.java +++ b/Mage.Sets/src/mage/cards/k/KamahlFistOfKrosa.java @@ -37,14 +37,14 @@ public final class KamahlFistOfKrosa extends CardImpl { this.toughness = new MageInt(3); // {G}: Target land becomes a 1/1 creature until end of turn. It's still a land. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new BecomesCreatureTargetEffect(new CreatureToken(1, 1), false, true, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); // {2}{G}{G}{G}: Creatures you control get +3/+3 and gain trample until end of turn. - SimpleActivatedAbility boostAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility boostAbility = new SimpleActivatedAbility( new BoostControlledEffect(3, 3, Duration.EndOfTurn).setText("Creatures you control get +3/+3"), new ManaCostsImpl<>("{2}{G}{G}{G}")); boostAbility.addEffect(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES).setText("and gain trample until end of turn")); diff --git a/Mage.Sets/src/mage/cards/k/KazanduTuskcaller.java b/Mage.Sets/src/mage/cards/k/KazanduTuskcaller.java index 9281a06e463..7560d71239d 100644 --- a/Mage.Sets/src/mage/cards/k/KazanduTuskcaller.java +++ b/Mage.Sets/src/mage/cards/k/KazanduTuskcaller.java @@ -36,12 +36,12 @@ public final class KazanduTuskcaller extends LevelerCard { this.addAbility(new LevelUpAbility(new ManaCostsImpl<>("{1}{G}"))); Abilities abilities1 = new AbilitiesImpl<>(); - abilities1.add(new SimpleActivatedAbility(Zone.BATTLEFIELD, + abilities1.add(new SimpleActivatedAbility( new CreateTokenEffect(new ElephantToken()), new TapSourceCost())); Abilities abilities2 = new AbilitiesImpl<>(); - abilities2.add(new SimpleActivatedAbility(Zone.BATTLEFIELD, + abilities2.add(new SimpleActivatedAbility( new CreateTokenEffect(new ElephantToken(), 2), new TapSourceCost())); diff --git a/Mage.Sets/src/mage/cards/k/KeeperOfTheLight.java b/Mage.Sets/src/mage/cards/k/KeeperOfTheLight.java index d6b68d1c17c..6e24e7d16b2 100644 --- a/Mage.Sets/src/mage/cards/k/KeeperOfTheLight.java +++ b/Mage.Sets/src/mage/cards/k/KeeperOfTheLight.java @@ -36,7 +36,7 @@ public final class KeeperOfTheLight extends CardImpl { this.toughness = new MageInt(2); // {W}, {T}: Choose target opponent who had more life than you did as you activated this ability. You gain 3 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainLifeEffect(3).setText("Choose target opponent who had more life than you did as you activated this ability. You gain 3 life."), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/k/KessigWolf.java b/Mage.Sets/src/mage/cards/k/KessigWolf.java index e9f169879ec..59578605c24 100644 --- a/Mage.Sets/src/mage/cards/k/KessigWolf.java +++ b/Mage.Sets/src/mage/cards/k/KessigWolf.java @@ -28,7 +28,7 @@ public final class KessigWolf extends CardImpl { this.toughness = new MageInt(1); // {1}{R}: Kessig Wolf gains first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } diff --git a/Mage.Sets/src/mage/cards/k/KilnmouthDragon.java b/Mage.Sets/src/mage/cards/k/KilnmouthDragon.java index bb993078529..167e024c985 100644 --- a/Mage.Sets/src/mage/cards/k/KilnmouthDragon.java +++ b/Mage.Sets/src/mage/cards/k/KilnmouthDragon.java @@ -38,7 +38,7 @@ public final class KilnmouthDragon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {T}: Kilnmouth Dragon deals damage equal to the number of +1/+1 counters on it to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new DamageTargetEffect(new CountersSourceCount(CounterType.P1P1)) .setText("{this} deals damage equal to the number of +1/+1 counters on it to any target"), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/k/KithkinShielddare.java b/Mage.Sets/src/mage/cards/k/KithkinShielddare.java index 12b044c4480..2632b782776 100644 --- a/Mage.Sets/src/mage/cards/k/KithkinShielddare.java +++ b/Mage.Sets/src/mage/cards/k/KithkinShielddare.java @@ -34,7 +34,7 @@ public final class KithkinShielddare extends CardImpl { this.toughness = new MageInt(1); // {W}, {tap}: Target blocking creature gets +2/+2 until end of turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new BoostTargetEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/k/KjeldoranJavelineer.java b/Mage.Sets/src/mage/cards/k/KjeldoranJavelineer.java index 3a190ba15ab..1b2efa8d7e1 100644 --- a/Mage.Sets/src/mage/cards/k/KjeldoranJavelineer.java +++ b/Mage.Sets/src/mage/cards/k/KjeldoranJavelineer.java @@ -36,7 +36,7 @@ public final class KjeldoranJavelineer extends CardImpl { this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}"))); // {T}: Kjeldoran Javelineer deals damage equal to the number of age counters on it to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new DamageTargetEffect(new CountersSourceCount(CounterType.AGE)) .setText("{this} deals damage equal to the number of age counters on it to target attacking or blocking creature."), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/k/KrosanWarchief.java b/Mage.Sets/src/mage/cards/k/KrosanWarchief.java index e5a256d19c2..cc836a57493 100644 --- a/Mage.Sets/src/mage/cards/k/KrosanWarchief.java +++ b/Mage.Sets/src/mage/cards/k/KrosanWarchief.java @@ -42,7 +42,7 @@ public final class KrosanWarchief extends CardImpl { // Beast spells you cast cost {1} less to cast. this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); // {1}{G}: Regenerate target Beast. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new RegenerateTargetEffect(), new ManaCostsImpl<>("{1}{G}")); Target target = new TargetCreaturePermanent(filterTarget); diff --git a/Mage.Sets/src/mage/cards/k/KrosanWayfarer.java b/Mage.Sets/src/mage/cards/k/KrosanWayfarer.java index 33e3befb710..058440af8a1 100644 --- a/Mage.Sets/src/mage/cards/k/KrosanWayfarer.java +++ b/Mage.Sets/src/mage/cards/k/KrosanWayfarer.java @@ -26,7 +26,7 @@ public final class KrosanWayfarer extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Krosan Wayfarer: You may put a land card from your hand onto the battlefield. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_LAND_A), new SacrificeSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/k/KuldothaForgemaster.java b/Mage.Sets/src/mage/cards/k/KuldothaForgemaster.java index 692a94c24ad..42d66093563 100644 --- a/Mage.Sets/src/mage/cards/k/KuldothaForgemaster.java +++ b/Mage.Sets/src/mage/cards/k/KuldothaForgemaster.java @@ -34,7 +34,7 @@ public final class KuldothaForgemaster extends CardImpl { this.toughness = new MageInt(5); // {T}, Sacrifice three artifacts: Search your library for an artifact card and put it onto the battlefield. Then shuffle your library. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterArtifactCard())), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(3, filter)); diff --git a/Mage.Sets/src/mage/cards/k/KumenaTyrantOfOrazca.java b/Mage.Sets/src/mage/cards/k/KumenaTyrantOfOrazca.java index 26dbfe02a08..e8551c94933 100644 --- a/Mage.Sets/src/mage/cards/k/KumenaTyrantOfOrazca.java +++ b/Mage.Sets/src/mage/cards/k/KumenaTyrantOfOrazca.java @@ -52,17 +52,17 @@ public final class KumenaTyrantOfOrazca extends CardImpl { this.toughness = new MageInt(4); // Tap another untapped Merfolk you control: Kumena, Tyrant of Orzca can't be blocked this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new CantBeBlockedSourceEffect(Duration.EndOfTurn), new TapTargetCost(new TargetControlledPermanent(1, 1, filterAnotherNotTapped, true)))); // Tap three untapped Merfolk you control: Draw a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new DrawCardSourceControllerEffect(1), new TapTargetCost(new TargetControlledPermanent(3, 3, filterNotTapped, true)))); // Tap five untapped Merfolk you control: Put a +1/+1 counter on each Merfolk you control. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new AddCountersAllEffect(CounterType.P1P1.createInstance(), filterAll), new TapTargetCost(new TargetControlledPermanent(5, 5, filterNotTapped, true)))); diff --git a/Mage.Sets/src/mage/cards/l/LavafumeInvoker.java b/Mage.Sets/src/mage/cards/l/LavafumeInvoker.java index dceda4ad9c2..763ab77600f 100644 --- a/Mage.Sets/src/mage/cards/l/LavafumeInvoker.java +++ b/Mage.Sets/src/mage/cards/l/LavafumeInvoker.java @@ -27,7 +27,7 @@ public final class LavafumeInvoker extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostControlledEffect(3, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{8}"))); } diff --git a/Mage.Sets/src/mage/cards/l/LegacyWeapon.java b/Mage.Sets/src/mage/cards/l/LegacyWeapon.java index 162172e34a8..51f2b826399 100644 --- a/Mage.Sets/src/mage/cards/l/LegacyWeapon.java +++ b/Mage.Sets/src/mage/cards/l/LegacyWeapon.java @@ -25,7 +25,7 @@ public final class LegacyWeapon extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // {W}{U}{B}{R}{G}: Exile target permanent. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new ExileTargetEffect(), new ManaCostsImpl<>("{W}{U}{B}{R}{G}")); ability.addTarget(new TargetPermanent()); diff --git a/Mage.Sets/src/mage/cards/l/LifeMatrix.java b/Mage.Sets/src/mage/cards/l/LifeMatrix.java index 52aa1806074..803cc8a4f74 100644 --- a/Mage.Sets/src/mage/cards/l/LifeMatrix.java +++ b/Mage.Sets/src/mage/cards/l/LifeMatrix.java @@ -39,7 +39,7 @@ public final class LifeMatrix extends CardImpl { new IsStepCondition(PhaseStep.UPKEEP), "{4}, {T}: Put a matrix counter on target creature and " + "that creature gains \"Remove a matrix counter from this creature: " + "Regenerate this creature.\" Activate only during your upkeep."); - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability2 = new SimpleActivatedAbility( new RegenerateSourceEffect(), new RemoveCountersSourceCost(CounterType.MATRIX.createInstance())); ability.addEffect(new GainAbilityTargetEffect(ability2, Duration.Custom)); diff --git a/Mage.Sets/src/mage/cards/l/LifesparkSpellbomb.java b/Mage.Sets/src/mage/cards/l/LifesparkSpellbomb.java index fb4f30293dc..32ade1149fd 100644 --- a/Mage.Sets/src/mage/cards/l/LifesparkSpellbomb.java +++ b/Mage.Sets/src/mage/cards/l/LifesparkSpellbomb.java @@ -28,7 +28,7 @@ public final class LifesparkSpellbomb extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // {G}, Sacrifice Lifespark Spellbomb: Until end of turn, target land becomes a 3/3 creature that's still a land. - Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability firstAbility = new SimpleActivatedAbility( new BecomesCreatureTargetEffect( new CreatureToken(3, 3), false, true, Duration.EndOfTurn) diff --git a/Mage.Sets/src/mage/cards/l/Lifespinner.java b/Mage.Sets/src/mage/cards/l/Lifespinner.java index db49ac4e601..fe5daf10cf4 100644 --- a/Mage.Sets/src/mage/cards/l/Lifespinner.java +++ b/Mage.Sets/src/mage/cards/l/Lifespinner.java @@ -41,7 +41,7 @@ public final class Lifespinner extends CardImpl { this.toughness = new MageInt(3); // {t}, Sacrifice three Spirits: Search your library for a legendary Spirit permanent card and put it onto the battlefield. Then shuffle your library. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(3, filterSac)); diff --git a/Mage.Sets/src/mage/cards/l/LightningBerserker.java b/Mage.Sets/src/mage/cards/l/LightningBerserker.java index 65f5612f9dc..cd6b0903309 100644 --- a/Mage.Sets/src/mage/cards/l/LightningBerserker.java +++ b/Mage.Sets/src/mage/cards/l/LightningBerserker.java @@ -28,7 +28,7 @@ public final class LightningBerserker extends CardImpl { this.toughness = new MageInt(1); // {R}: Lightning Berserker gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); diff --git a/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java b/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java index ac0136a5f0a..f0f5ed8b873 100644 --- a/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java +++ b/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java @@ -48,7 +48,7 @@ public final class LinSivviDefiantHero extends CardImpl { this.toughness = new MageInt(3); // {X}, {tap}: Search your library for a Rebel permanent card with converted mana cost X or less and put it onto the battlefield. Then shuffle your library. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new LinSivviDefiantHeroEffect(), new ManaCostsImpl<>("{X}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/l/LlanowarDruid.java b/Mage.Sets/src/mage/cards/l/LlanowarDruid.java index e3578069386..e861095ddc4 100644 --- a/Mage.Sets/src/mage/cards/l/LlanowarDruid.java +++ b/Mage.Sets/src/mage/cards/l/LlanowarDruid.java @@ -34,7 +34,7 @@ public final class LlanowarDruid extends CardImpl { this.toughness = new MageInt(2); // {tap}, Sacrifice Llanowar Druid: Untap all Forests. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new LlanowarDruidEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/l/LlanowarScout.java b/Mage.Sets/src/mage/cards/l/LlanowarScout.java index ed6a763920c..fee1515e6b2 100644 --- a/Mage.Sets/src/mage/cards/l/LlanowarScout.java +++ b/Mage.Sets/src/mage/cards/l/LlanowarScout.java @@ -28,7 +28,7 @@ public final class LlanowarScout extends CardImpl { this.toughness = new MageInt(3); // {T}: You may put a land card from your hand onto the battlefield. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_LAND_A), new TapSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/l/LunarchMantle.java b/Mage.Sets/src/mage/cards/l/LunarchMantle.java index d699d39d9bd..b5b65ff632f 100644 --- a/Mage.Sets/src/mage/cards/l/LunarchMantle.java +++ b/Mage.Sets/src/mage/cards/l/LunarchMantle.java @@ -47,7 +47,7 @@ public final class LunarchMantle extends CardImpl { // Enchanted creature gets +2/+2 and has "{1}, Sacrifice a permanent: This creature gains flying until end of turn." SimpleStaticAbility ability2 = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); - Ability abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability abilityToGain = new SimpleActivatedAbility( new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); abilityToGain.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT)); ability2.addEffect(new GainAbilityAttachedEffect(abilityToGain, AttachmentType.AURA, Duration.WhileOnBattlefield, rule)); diff --git a/Mage.Sets/src/mage/cards/m/MagmaSliver.java b/Mage.Sets/src/mage/cards/m/MagmaSliver.java index a66838798d0..d5d4217f715 100644 --- a/Mage.Sets/src/mage/cards/m/MagmaSliver.java +++ b/Mage.Sets/src/mage/cards/m/MagmaSliver.java @@ -37,7 +37,7 @@ public final class MagmaSliver extends CardImpl { // All Slivers have "{tap}: Target Sliver creature gets +X/+0 until end of turn, // where X is the number of Slivers on the battlefield." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new BoostTargetEffect(new PermanentsOnBattlefieldCount( StaticFilters.FILTER_PERMANENT_ALL_SLIVERS), StaticValue.get(0), Duration.EndOfTurn), diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheWill.java b/Mage.Sets/src/mage/cards/m/MagusOfTheWill.java index 782e10e775d..b3c036ca226 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheWill.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheWill.java @@ -33,7 +33,7 @@ public final class MagusOfTheWill extends CardImpl { // {2}{B}, {T}, Exile Magus of the Will: Until end of turn, you may play lands and cast spells from your graveyard. // If a card would be put into your graveyard from anywhere else this turn, exile that card instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( PlayFromGraveyardControllerEffect.playLandsAndCastSpells(Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}")); ability.addEffect(new GraveyardFromAnywhereExileReplacementEffect(Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/cards/m/MarneusCalgar.java b/Mage.Sets/src/mage/cards/m/MarneusCalgar.java index 84fff581ef2..9bcb49673e3 100644 --- a/Mage.Sets/src/mage/cards/m/MarneusCalgar.java +++ b/Mage.Sets/src/mage/cards/m/MarneusCalgar.java @@ -45,7 +45,7 @@ public final class MarneusCalgar extends CardImpl { ).withFlavorWord("Master Tactician")); // Chapter Master — {6}: Create two 2/2 white Astartes Warrior creature tokens with vigilance. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new CreateTokenEffect(new WhiteAstartesWarriorToken(), 2), new ManaCostsImpl<>("{6}") ).withFlavorWord("Chapter Master")); diff --git a/Mage.Sets/src/mage/cards/m/MatsuTribeBirdstalker.java b/Mage.Sets/src/mage/cards/m/MatsuTribeBirdstalker.java index b096810cde9..62f0bddf325 100644 --- a/Mage.Sets/src/mage/cards/m/MatsuTribeBirdstalker.java +++ b/Mage.Sets/src/mage/cards/m/MatsuTribeBirdstalker.java @@ -40,7 +40,7 @@ public final class MatsuTribeBirdstalker extends CardImpl { this.addAbility(ability); // {G}: Matsu-Tribe Birdstalker gains reach until end of turn. (It can block creatures with flying.) - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(ReachAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); } @@ -53,4 +53,4 @@ public final class MatsuTribeBirdstalker extends CardImpl { public MatsuTribeBirdstalker copy() { return new MatsuTribeBirdstalker(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/m/MirrorOfFate.java b/Mage.Sets/src/mage/cards/m/MirrorOfFate.java index ce6913b2154..93b35e1a10f 100644 --- a/Mage.Sets/src/mage/cards/m/MirrorOfFate.java +++ b/Mage.Sets/src/mage/cards/m/MirrorOfFate.java @@ -31,7 +31,7 @@ public final class MirrorOfFate extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{5}"); // {tap}, Sacrifice Mirror of Fate: Choose up to seven face-up exiled cards you own. Exile all the cards from your library, then put the chosen cards on top of your library. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new MirrorOfFateEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/m/MirrorWall.java b/Mage.Sets/src/mage/cards/m/MirrorWall.java index 80d634852bc..2ab21a234d4 100644 --- a/Mage.Sets/src/mage/cards/m/MirrorWall.java +++ b/Mage.Sets/src/mage/cards/m/MirrorWall.java @@ -30,7 +30,7 @@ public final class MirrorWall extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {W}: Mirror Wall can attack this turn as though it didn't have defender. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } diff --git a/Mage.Sets/src/mage/cards/m/MoorlandHaunt.java b/Mage.Sets/src/mage/cards/m/MoorlandHaunt.java index f6fcff3f60b..af0157f57f7 100644 --- a/Mage.Sets/src/mage/cards/m/MoorlandHaunt.java +++ b/Mage.Sets/src/mage/cards/m/MoorlandHaunt.java @@ -30,7 +30,7 @@ public final class MoorlandHaunt extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {W}{U}, {tap}, Exile a creature card from your graveyard: Create a 1/1 white Spirit creature token with flying. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new CreateTokenEffect(new SpiritWhiteToken()), new ManaCostsImpl<>("{W}{U}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/m/Mortarpod.java b/Mage.Sets/src/mage/cards/m/Mortarpod.java index 2344a3902e7..fe9aae780d7 100644 --- a/Mage.Sets/src/mage/cards/m/Mortarpod.java +++ b/Mage.Sets/src/mage/cards/m/Mortarpod.java @@ -37,7 +37,7 @@ public final class Mortarpod extends CardImpl { // Equipped creature gets +0/+1 and has "Sacrifice this creature: This creature deals 1 damage to any target." Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(0, 1)); - SimpleActivatedAbility abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility abilityToGain = new SimpleActivatedAbility( new DamageTargetEffect(1), new SacrificeSourceCost()); abilityToGain.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/m/Mosstodon.java b/Mage.Sets/src/mage/cards/m/Mosstodon.java index d4f27ba0b30..96b104ab4e8 100644 --- a/Mage.Sets/src/mage/cards/m/Mosstodon.java +++ b/Mage.Sets/src/mage/cards/m/Mosstodon.java @@ -38,7 +38,7 @@ public final class Mosstodon extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(3); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); ability.addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/m/MudTrooper.java b/Mage.Sets/src/mage/cards/m/MudTrooper.java index 6ba5f9c4b6c..162d242446b 100644 --- a/Mage.Sets/src/mage/cards/m/MudTrooper.java +++ b/Mage.Sets/src/mage/cards/m/MudTrooper.java @@ -37,7 +37,7 @@ public final class MudTrooper extends CardImpl { this.toughness = new MageInt(1); // Trooper creatures you control have "2: This creature gets +1/+1 until end of turn." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new BoostSourceEffect(1, 1, Duration.EndOfTurn) .setText("This creature gets +1/+1 until end of turn"), new GenericManaCost(2)); diff --git a/Mage.Sets/src/mage/cards/m/Mutavault.java b/Mage.Sets/src/mage/cards/m/Mutavault.java index 48ca16c7c0b..62ab683908b 100644 --- a/Mage.Sets/src/mage/cards/m/Mutavault.java +++ b/Mage.Sets/src/mage/cards/m/Mutavault.java @@ -26,7 +26,7 @@ public final class Mutavault extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {1}: Mutavault becomes a 2/2 creature with all creature types until end of turn. It's still a land. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BecomesCreatureSourceEffect(new MutavaultToken(), CardType.LAND, Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); } diff --git a/Mage.Sets/src/mage/cards/m/MyrGalvanizer.java b/Mage.Sets/src/mage/cards/m/MyrGalvanizer.java index b2a2e929471..ccb8dd48355 100644 --- a/Mage.Sets/src/mage/cards/m/MyrGalvanizer.java +++ b/Mage.Sets/src/mage/cards/m/MyrGalvanizer.java @@ -39,7 +39,7 @@ public final class MyrGalvanizer extends CardImpl { new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); // {1}, {T}: Untap each other Myr you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new MyrGalvanizerEffect(), new TapSourceCost()); ability.addCost(new GenericManaCost(1)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MyrTurbine.java b/Mage.Sets/src/mage/cards/m/MyrTurbine.java index 9b3fc4eed1c..0dc41b4738c 100644 --- a/Mage.Sets/src/mage/cards/m/MyrTurbine.java +++ b/Mage.Sets/src/mage/cards/m/MyrTurbine.java @@ -37,10 +37,10 @@ public final class MyrTurbine extends CardImpl { public MyrTurbine(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new CreateTokenEffect(new MyrToken()), new TapSourceCost())); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filterCard)), new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledPermanent(5, 5, filterMyr, true))); diff --git a/Mage.Sets/src/mage/cards/n/NakayaShade.java b/Mage.Sets/src/mage/cards/n/NakayaShade.java index 58ab824fa1d..aa626492a9b 100644 --- a/Mage.Sets/src/mage/cards/n/NakayaShade.java +++ b/Mage.Sets/src/mage/cards/n/NakayaShade.java @@ -29,7 +29,7 @@ public final class NakayaShade extends CardImpl { this.toughness = new MageInt(1); // {B}: Nakaya Shade gets +1/+1 until end of turn unless any player pays {2}. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new DoUnlessAnyPlayerPaysEffect(new BoostSourceEffect(1,1, Duration.EndOfTurn),new GenericManaCost(2)), new ManaCostsImpl<>("{B}"))); } diff --git a/Mage.Sets/src/mage/cards/n/NalathniDragon.java b/Mage.Sets/src/mage/cards/n/NalathniDragon.java index 958b908e2df..1ef194771d7 100644 --- a/Mage.Sets/src/mage/cards/n/NalathniDragon.java +++ b/Mage.Sets/src/mage/cards/n/NalathniDragon.java @@ -43,7 +43,7 @@ public final class NalathniDragon extends CardImpl { this.addAbility(BandingAbility.getInstance()); // {R}: Nalathni Dragon gets +1/+0 until end of turn. If this ability has been activated four or more times this turn, sacrifice Nalathni Dragon at the beginning of the next end step. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addEffect(new NalathniDragonEffect()); diff --git a/Mage.Sets/src/mage/cards/n/NarnamCobra.java b/Mage.Sets/src/mage/cards/n/NarnamCobra.java index 93ec9a9c261..9b528f2f536 100644 --- a/Mage.Sets/src/mage/cards/n/NarnamCobra.java +++ b/Mage.Sets/src/mage/cards/n/NarnamCobra.java @@ -28,7 +28,7 @@ public final class NarnamCobra extends CardImpl { this.toughness = new MageInt(1); // {G}: Narnam Cobra gains deathtouch until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.G))); } diff --git a/Mage.Sets/src/mage/cards/n/NemataPrimevalWarden.java b/Mage.Sets/src/mage/cards/n/NemataPrimevalWarden.java index bf09226f059..d4d2ce73d92 100644 --- a/Mage.Sets/src/mage/cards/n/NemataPrimevalWarden.java +++ b/Mage.Sets/src/mage/cards/n/NemataPrimevalWarden.java @@ -52,14 +52,14 @@ public final class NemataPrimevalWarden extends CardImpl { this.addAbility(new SimpleStaticAbility(new NemataPrimevalWardenEffect())); // {G}, Sacrifice a Saproling: Nemata, Primeval Warden gets +2/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); // {1}{B}, Sacrifice 2 Saprolings: Draw a card. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability2 = new SimpleActivatedAbility( new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{1}{B}")); ability2.addCost(new SacrificeTargetCost(2, filter2)); diff --git a/Mage.Sets/src/mage/cards/n/NinThePainArtist.java b/Mage.Sets/src/mage/cards/n/NinThePainArtist.java index eb960a8fce7..65a29f6310b 100644 --- a/Mage.Sets/src/mage/cards/n/NinThePainArtist.java +++ b/Mage.Sets/src/mage/cards/n/NinThePainArtist.java @@ -34,7 +34,7 @@ public final class NinThePainArtist extends CardImpl { this.toughness = new MageInt(1); // {X}{U}{R}, {tap}: Nin, the Pain Artist deals X damage to target creature. That creature's controller draws X cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new DamageTargetEffect(GetXValue.instance), new ManaCostsImpl<>("{X}{U}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/n/NullCaller.java b/Mage.Sets/src/mage/cards/n/NullCaller.java index d6988315492..2de4cbad90f 100644 --- a/Mage.Sets/src/mage/cards/n/NullCaller.java +++ b/Mage.Sets/src/mage/cards/n/NullCaller.java @@ -31,7 +31,7 @@ public final class NullCaller extends CardImpl { this.toughness = new MageInt(4); // {3}{B}, Exile a creature card from your graveyard: Create a tapped 2/2 black Zombie creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new CreateTokenEffect(new ZombieToken(), 1, true, false), new ManaCostsImpl<>("{3}{B}")); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD))); diff --git a/Mage.Sets/src/mage/cards/o/OashraCultivator.java b/Mage.Sets/src/mage/cards/o/OashraCultivator.java index 5fcb273bdc6..96a15940259 100644 --- a/Mage.Sets/src/mage/cards/o/OashraCultivator.java +++ b/Mage.Sets/src/mage/cards/o/OashraCultivator.java @@ -33,7 +33,7 @@ public final class OashraCultivator extends CardImpl { this.toughness = new MageInt(3); // {2}{G}, {T}, Sacrifice Oashra Cultivator: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), new ManaCostsImpl<>("{2}{G}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/o/ObsidianFireheart.java b/Mage.Sets/src/mage/cards/o/ObsidianFireheart.java index 8e0b87090d6..9575ce891a9 100644 --- a/Mage.Sets/src/mage/cards/o/ObsidianFireheart.java +++ b/Mage.Sets/src/mage/cards/o/ObsidianFireheart.java @@ -53,7 +53,7 @@ public final class ObsidianFireheart extends CardImpl { // For as long as that land has a blaze counter on it, it has "At the beginning // of your upkeep, this land deals 1 damage to you." (The land continues to burn // after Obsidian Fireheart has left the battlefield.) - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new AddCountersTargetEffect(CounterType.BLAZE.createInstance()), new ManaCostsImpl<>("{1}{R}{R}")); ability.addTarget(new TargetLandPermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/o/Occupation.java b/Mage.Sets/src/mage/cards/o/Occupation.java index bd4c7e121be..a034fb20f8b 100644 --- a/Mage.Sets/src/mage/cards/o/Occupation.java +++ b/Mage.Sets/src/mage/cards/o/Occupation.java @@ -32,7 +32,7 @@ public final class Occupation extends CardImpl { 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, + Ability ability = new SimpleActivatedAbility( new OccupationOneShotEffect("Target creature can't attack or block this turn, and its activated abilities can't be activated until end of turn"), new ManaCostsImpl<>("{W}{B}")); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/o/OrderOfTheSacredTorch.java b/Mage.Sets/src/mage/cards/o/OrderOfTheSacredTorch.java index ee21828e365..f3015183048 100644 --- a/Mage.Sets/src/mage/cards/o/OrderOfTheSacredTorch.java +++ b/Mage.Sets/src/mage/cards/o/OrderOfTheSacredTorch.java @@ -37,7 +37,7 @@ public final class OrderOfTheSacredTorch extends CardImpl { this.toughness = new MageInt(2); // {tap}, Pay 1 life: Counter target black spell. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new mage.abilities.effects.common.CounterTargetEffect(), new TapSourceCost()); ability.addCost(new PayLifeCost(1)); diff --git a/Mage.Sets/src/mage/cards/o/OxiddaDaredevil.java b/Mage.Sets/src/mage/cards/o/OxiddaDaredevil.java index 3c1da4ffeb9..39e63cd711b 100644 --- a/Mage.Sets/src/mage/cards/o/OxiddaDaredevil.java +++ b/Mage.Sets/src/mage/cards/o/OxiddaDaredevil.java @@ -36,7 +36,7 @@ public final class OxiddaDaredevil extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(filter))); } diff --git a/Mage.Sets/src/mage/cards/p/PerilousForays.java b/Mage.Sets/src/mage/cards/p/PerilousForays.java index e5221d32969..894d4b675ef 100644 --- a/Mage.Sets/src/mage/cards/p/PerilousForays.java +++ b/Mage.Sets/src/mage/cards/p/PerilousForays.java @@ -39,7 +39,7 @@ public final class PerilousForays extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{G}{G}"); // {1}, Sacrifice a creature: Search your library for a land card with a basic land type and put it onto the battlefield tapped. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), true), new ManaCostsImpl<>("{1}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianColossus.java b/Mage.Sets/src/mage/cards/p/PhyrexianColossus.java index 25ceb423688..a52db027ac1 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianColossus.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianColossus.java @@ -31,7 +31,7 @@ public final class PhyrexianColossus extends CardImpl { // {this} doesn't untap during your untap step. this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // Pay 8 life: Untap {this}. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new UntapSourceEffect(), new PayLifeCost(8))); // {this} can't be blocked except by three or more creatures. this.addAbility(new SimpleStaticAbility(new CantBeBlockedByOneEffect(3))); diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianPlaguelord.java b/Mage.Sets/src/mage/cards/p/PhyrexianPlaguelord.java index dabb20edc9a..28ebf2422bf 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianPlaguelord.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianPlaguelord.java @@ -34,14 +34,14 @@ public final class PhyrexianPlaguelord extends CardImpl { this.toughness = new MageInt(4); // {tap}, Sacrifice Phyrexian Plaguelord: Target creature gets -4/-4 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new BoostTargetEffect(-4, -4, Duration.EndOfTurn), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Sacrifice a creature: Target creature gets -1/-1 until end of turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + ability = new SimpleActivatedAbility( new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/p/PrakhataPillarBug.java b/Mage.Sets/src/mage/cards/p/PrakhataPillarBug.java index fd24fdd968b..63c3aaed7ba 100644 --- a/Mage.Sets/src/mage/cards/p/PrakhataPillarBug.java +++ b/Mage.Sets/src/mage/cards/p/PrakhataPillarBug.java @@ -28,7 +28,7 @@ public final class PrakhataPillarBug extends CardImpl { this.toughness = new MageInt(3); // {B}: Prakhata Pillar-Bug gains lifelink until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B))); } diff --git a/Mage.Sets/src/mage/cards/p/PrimordialMist.java b/Mage.Sets/src/mage/cards/p/PrimordialMist.java index dc323142e78..8960f2f2ef2 100644 --- a/Mage.Sets/src/mage/cards/p/PrimordialMist.java +++ b/Mage.Sets/src/mage/cards/p/PrimordialMist.java @@ -41,7 +41,7 @@ public final class PrimordialMist extends CardImpl { // Exile a face-down permanent you control face-up: You may play that card this turn TargetPermanent target = new TargetPermanent(filter); target.withNotTarget(true); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new PrimordialMistCastFromExileEffect(), new PrimordialMistCost(target)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PrismArray.java b/Mage.Sets/src/mage/cards/p/PrismArray.java index 45ba34d6606..6e6bbf82592 100644 --- a/Mage.Sets/src/mage/cards/p/PrismArray.java +++ b/Mage.Sets/src/mage/cards/p/PrismArray.java @@ -33,7 +33,7 @@ public final class PrismArray extends CardImpl { null, "Converge — {this} enters with a +1/+1 counter on it for each color of mana spent to cast it.", null)); // Remove a crystal counter from Prism Array: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new TapTargetEffect(), new RemoveCountersSourceCost(CounterType.CRYSTAL.createInstance(1))); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/p/PsychotropeThallid.java b/Mage.Sets/src/mage/cards/p/PsychotropeThallid.java index 62935979b8b..5912683f428 100644 --- a/Mage.Sets/src/mage/cards/p/PsychotropeThallid.java +++ b/Mage.Sets/src/mage/cards/p/PsychotropeThallid.java @@ -37,11 +37,11 @@ public final class PsychotropeThallid extends CardImpl { // At the beginning of your upkeep, put a spore counter on Psychotrope Thallid. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()))); // Remove three spore counters from Psychotrope Thallid: Create a 1/1 green Saproling creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); // {1}, Sacrifice a Saproling: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new DrawCardSourceControllerEffect(1), new SacrificeTargetCost(filter)); ability.addCost(new GenericManaCost(1)); diff --git a/Mage.Sets/src/mage/cards/q/Quicksand.java b/Mage.Sets/src/mage/cards/q/Quicksand.java index 32920903217..9229168c64e 100644 --- a/Mage.Sets/src/mage/cards/q/Quicksand.java +++ b/Mage.Sets/src/mage/cards/q/Quicksand.java @@ -34,7 +34,7 @@ public final class Quicksand extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); this.addAbility(new ColorlessManaAbility()); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new BoostTargetEffect(-1, -2, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/q/QuicksilverAmulet.java b/Mage.Sets/src/mage/cards/q/QuicksilverAmulet.java index 98bca82d4b0..fb23549fa53 100644 --- a/Mage.Sets/src/mage/cards/q/QuicksilverAmulet.java +++ b/Mage.Sets/src/mage/cards/q/QuicksilverAmulet.java @@ -22,7 +22,7 @@ public final class QuicksilverAmulet extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {4}, {tap}: You may put a creature card from your hand onto the battlefield. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_CREATURE_A), new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/r/RageNimbus.java b/Mage.Sets/src/mage/cards/r/RageNimbus.java index 0943c7ccfcd..fb4549e79c3 100644 --- a/Mage.Sets/src/mage/cards/r/RageNimbus.java +++ b/Mage.Sets/src/mage/cards/r/RageNimbus.java @@ -31,7 +31,7 @@ public final class RageNimbus extends CardImpl { this.addAbility(DefenderAbility.getInstance()); this.addAbility(FlyingAbility.getInstance()); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new AttacksIfAbleTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/r/Rakalite.java b/Mage.Sets/src/mage/cards/r/Rakalite.java index a3930213e1c..273195f5ce9 100644 --- a/Mage.Sets/src/mage/cards/r/Rakalite.java +++ b/Mage.Sets/src/mage/cards/r/Rakalite.java @@ -26,7 +26,7 @@ public final class Rakalite extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{6}"); // {2}: Prevent the next 1 damage that would be dealt to any target this turn. Return Rakalite to its owner's hand at the beginning of the next end step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new PreventDamageToTargetEffect(Duration.EndOfTurn, 1, false), new GenericManaCost(2)); ability.addTarget(new TargetAnyTarget()); ability.addEffect(new CreateDelayedTriggeredAbilityEffect(new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new ReturnToHandSourceEffect(true)))); diff --git a/Mage.Sets/src/mage/cards/r/RakeclawGargantuan.java b/Mage.Sets/src/mage/cards/r/RakeclawGargantuan.java index ed13a419cf2..2d6361b7812 100644 --- a/Mage.Sets/src/mage/cards/r/RakeclawGargantuan.java +++ b/Mage.Sets/src/mage/cards/r/RakeclawGargantuan.java @@ -37,7 +37,7 @@ public final class RakeclawGargantuan extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(3); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); ability.addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/r/RedManaBattery.java b/Mage.Sets/src/mage/cards/r/RedManaBattery.java index e29bbad4065..3af1f439d64 100644 --- a/Mage.Sets/src/mage/cards/r/RedManaBattery.java +++ b/Mage.Sets/src/mage/cards/r/RedManaBattery.java @@ -28,7 +28,7 @@ public final class RedManaBattery extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {2}, {T}: Put a charge counter on Red Mana Battery. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new AddCountersSourceEffect(CounterType.CHARGE.createInstance(1)), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RhysticCircle.java b/Mage.Sets/src/mage/cards/r/RhysticCircle.java index 469ae0d6424..3be16bf322d 100644 --- a/Mage.Sets/src/mage/cards/r/RhysticCircle.java +++ b/Mage.Sets/src/mage/cards/r/RhysticCircle.java @@ -24,7 +24,7 @@ public final class RhysticCircle extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}{W}"); // {1}: Any player may pay {1}. If no one does, the next time a source of your choice would deal damage to you this turn, prevent that damage. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new DoUnlessAnyPlayerPaysEffect(new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn),new GenericManaCost(1)), new ManaCostsImpl<>("{1}"))); } diff --git a/Mage.Sets/src/mage/cards/r/RimescaleDragon.java b/Mage.Sets/src/mage/cards/r/RimescaleDragon.java index 2f8d1a27f7c..ebfd7ba63f1 100644 --- a/Mage.Sets/src/mage/cards/r/RimescaleDragon.java +++ b/Mage.Sets/src/mage/cards/r/RimescaleDragon.java @@ -43,7 +43,7 @@ public final class RimescaleDragon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {2}{snow}: Tap target creature and put an ice counter on it. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new TapTargetEffect("tap target creature"), new ManaCostsImpl<>("{2}{S}") ); diff --git a/Mage.Sets/src/mage/cards/r/RiptideDirector.java b/Mage.Sets/src/mage/cards/r/RiptideDirector.java index d382e00e5c0..6879a59665e 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideDirector.java +++ b/Mage.Sets/src/mage/cards/r/RiptideDirector.java @@ -32,7 +32,7 @@ public final class RiptideDirector extends CardImpl { this.toughness = new MageInt(3); // {2}{U}{U}, {tap}: Draw a card for each Wizard you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new DrawCardSourceControllerEffect(new PermanentsOnBattlefieldCount(filter)), new ManaCostsImpl<>("{2}{U}{U}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/r/RiverMerfolk.java b/Mage.Sets/src/mage/cards/r/RiverMerfolk.java index 9f93ae284f7..ee2afb80499 100644 --- a/Mage.Sets/src/mage/cards/r/RiverMerfolk.java +++ b/Mage.Sets/src/mage/cards/r/RiverMerfolk.java @@ -27,7 +27,7 @@ public final class RiverMerfolk extends CardImpl { this.toughness = new MageInt(1); // {U}: River Merfolk gains mountainwalk until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(new MountainwalkAbility(false), Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); } diff --git a/Mage.Sets/src/mage/cards/s/SakashimaTheImpostor.java b/Mage.Sets/src/mage/cards/s/SakashimaTheImpostor.java index dce3f9ff16a..e27e53e61dd 100644 --- a/Mage.Sets/src/mage/cards/s/SakashimaTheImpostor.java +++ b/Mage.Sets/src/mage/cards/s/SakashimaTheImpostor.java @@ -59,7 +59,7 @@ class SakashimaTheImpostorCopyApplier extends CopyApplier { blueprint.addSuperType(SuperType.LEGENDARY); blueprint.setName("Sakashima the Impostor"); // {2}{U}{U}: Return Sakashima the Impostor to its owner's hand at the beginning of the next end step - blueprint.getAbilities().add(new SimpleActivatedAbility(Zone.BATTLEFIELD, + blueprint.getAbilities().add(new SimpleActivatedAbility( new CreateDelayedTriggeredAbilityEffect(new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new ReturnToHandSourceEffect(true)), false), new ManaCostsImpl<>("{2}{U}{U}") )); diff --git a/Mage.Sets/src/mage/cards/s/SalvageTrader.java b/Mage.Sets/src/mage/cards/s/SalvageTrader.java index eb31a44a3e7..10e7253c9cf 100644 --- a/Mage.Sets/src/mage/cards/s/SalvageTrader.java +++ b/Mage.Sets/src/mage/cards/s/SalvageTrader.java @@ -32,7 +32,7 @@ public final class SalvageTrader extends CardImpl { this.toughness = new MageInt(3); // {T}: Exchange control of target artifact you control and target artifact an opponent controls with the same converted mana cost. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new ExchangeControlTargetEffect(Duration.EndOfGame, "Exchange control of target artifact you control and target artifact an opponent controls with the same mana value", false, true), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/s/SanctifierOfSouls.java b/Mage.Sets/src/mage/cards/s/SanctifierOfSouls.java index 9d81a216afe..81f52b530be 100644 --- a/Mage.Sets/src/mage/cards/s/SanctifierOfSouls.java +++ b/Mage.Sets/src/mage/cards/s/SanctifierOfSouls.java @@ -45,7 +45,7 @@ public final class SanctifierOfSouls extends CardImpl { this.addAbility(new EntersBattlefieldControlledTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), filter)); // {2}{W}, Exile a creature card from your graveyard: Create a 1/1 white Spirit creature token with flying. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new CreateTokenEffect(new SpiritWhiteToken()), new ManaCostsImpl<>("{2}{W}")); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(new FilterCreatureCard("a creature card from your graveyard")))); diff --git a/Mage.Sets/src/mage/cards/s/ScarredVinebreeder.java b/Mage.Sets/src/mage/cards/s/ScarredVinebreeder.java index aaf0331ad29..153081d59eb 100644 --- a/Mage.Sets/src/mage/cards/s/ScarredVinebreeder.java +++ b/Mage.Sets/src/mage/cards/s/ScarredVinebreeder.java @@ -37,7 +37,7 @@ public final class ScarredVinebreeder extends CardImpl { this.toughness = new MageInt(1); // {2}{B}, Exile an Elf card from your graveyard: Scarred Vinebreeder gets +3/+3 until end of turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new BoostSourceEffect(3, 3, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(filter))); diff --git a/Mage.Sets/src/mage/cards/s/ScarwoodBandits.java b/Mage.Sets/src/mage/cards/s/ScarwoodBandits.java index 92b01a83543..7a5c36a5071 100644 --- a/Mage.Sets/src/mage/cards/s/ScarwoodBandits.java +++ b/Mage.Sets/src/mage/cards/s/ScarwoodBandits.java @@ -43,7 +43,7 @@ public final class ScarwoodBandits extends CardImpl { this.addAbility(new ForestwalkAbility()); // {2}{G}, {tap}: Unless an opponent pays {2}, gain control of target artifact for as long as Scarwood Bandits remains on the battlefield. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new DoUnlessAnyOpponentPaysEffect( new ConditionalContinuousEffect( new GainControlTargetEffect(Duration.Custom, true), diff --git a/Mage.Sets/src/mage/cards/s/ScarwoodHag.java b/Mage.Sets/src/mage/cards/s/ScarwoodHag.java index ebfafbc0968..b95f88ce970 100644 --- a/Mage.Sets/src/mage/cards/s/ScarwoodHag.java +++ b/Mage.Sets/src/mage/cards/s/ScarwoodHag.java @@ -32,7 +32,7 @@ public final class ScarwoodHag extends CardImpl { this.toughness = new MageInt(1); // {G}{G}{G}{G}, {tap}: Target creature gains forestwalk until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(new ForestwalkAbility(false), Duration.EndOfTurn), new ManaCostsImpl<>("{G}{G}{G}{G}")); ability.addCost(new TapSourceCost()); @@ -42,7 +42,7 @@ public final class ScarwoodHag extends CardImpl { // {tap}: Target creature loses forestwalk until end of turn. Effect effect = new LoseAbilityTargetEffect(new ForestwalkAbility(true), Duration.EndOfTurn); effect.setText("Target creature loses forestwalk until end of turn"); - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + ability = new SimpleActivatedAbility( effect, new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/s/ScionOfTheUrDragon.java b/Mage.Sets/src/mage/cards/s/ScionOfTheUrDragon.java index bd3a6710f6e..c941e3688a1 100644 --- a/Mage.Sets/src/mage/cards/s/ScionOfTheUrDragon.java +++ b/Mage.Sets/src/mage/cards/s/ScionOfTheUrDragon.java @@ -36,7 +36,7 @@ public final class ScionOfTheUrDragon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {2}: Search your library for a Dragon permanent card and put it into your graveyard. If you do, Scion of the Ur-Dragon becomes a copy of that card until end of turn. Then shuffle your library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new ScionOfTheUrDragonEffect(), new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/s/SeaGateLoremaster.java b/Mage.Sets/src/mage/cards/s/SeaGateLoremaster.java index da1c02460cd..49a258eef95 100644 --- a/Mage.Sets/src/mage/cards/s/SeaGateLoremaster.java +++ b/Mage.Sets/src/mage/cards/s/SeaGateLoremaster.java @@ -31,7 +31,7 @@ public final class SeaGateLoremaster extends CardImpl { this.toughness = new MageInt(3); // {T}: Draw a card for each Ally you control. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new DrawCardSourceControllerEffect(new PermanentsOnBattlefieldCount(filter)), new TapSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/s/SearchlightGeist.java b/Mage.Sets/src/mage/cards/s/SearchlightGeist.java index ecdf58ea8ff..56bb34b5a71 100644 --- a/Mage.Sets/src/mage/cards/s/SearchlightGeist.java +++ b/Mage.Sets/src/mage/cards/s/SearchlightGeist.java @@ -30,7 +30,7 @@ public final class SearchlightGeist extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {3}{B}: Searchlight Geist gains deathtouch until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{3}{B}"))); } diff --git a/Mage.Sets/src/mage/cards/s/SerrasHymn.java b/Mage.Sets/src/mage/cards/s/SerrasHymn.java index 2d26a7a8cdc..fc97f30a71b 100644 --- a/Mage.Sets/src/mage/cards/s/SerrasHymn.java +++ b/Mage.Sets/src/mage/cards/s/SerrasHymn.java @@ -32,7 +32,7 @@ public final class SerrasHymn extends CardImpl { new AddCountersSourceEffect(CounterType.VERSE.createInstance(), true), true)); // Sacrifice Serra's Hymn: Prevent the next X damage that would be dealt this turn to any number of target creatures and/or players, divided as you choose, where X is the number of verse counters on Serra's Hymn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new PreventDamageToTargetMultiAmountEffect( Duration.EndOfTurn, 1, false, true, // the integer 1 is ignored due to the dynamic number being set diff --git a/Mage.Sets/src/mage/cards/s/SerratedArrows.java b/Mage.Sets/src/mage/cards/s/SerratedArrows.java index bbc965e9288..e65cf0ba033 100644 --- a/Mage.Sets/src/mage/cards/s/SerratedArrows.java +++ b/Mage.Sets/src/mage/cards/s/SerratedArrows.java @@ -43,7 +43,7 @@ public final class SerratedArrows extends CardImpl { )); // {T}, Remove an arrowhead counter from Serrated Arrows: Put a -1/-1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.ARROWHEAD.createInstance())); diff --git a/Mage.Sets/src/mage/cards/s/ShadowcloakVampire.java b/Mage.Sets/src/mage/cards/s/ShadowcloakVampire.java index e82b8de40b3..4a15281aec9 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowcloakVampire.java +++ b/Mage.Sets/src/mage/cards/s/ShadowcloakVampire.java @@ -28,7 +28,7 @@ public final class ShadowcloakVampire extends CardImpl { this.toughness = new MageInt(3); // Pay 2 life: Shadowcloak Vampire gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn),new PayLifeCost(2))); } diff --git a/Mage.Sets/src/mage/cards/s/ShalaiVoiceOfPlenty.java b/Mage.Sets/src/mage/cards/s/ShalaiVoiceOfPlenty.java index df3142c642e..7a55323f6ba 100644 --- a/Mage.Sets/src/mage/cards/s/ShalaiVoiceOfPlenty.java +++ b/Mage.Sets/src/mage/cards/s/ShalaiVoiceOfPlenty.java @@ -60,7 +60,7 @@ public final class ShalaiVoiceOfPlenty extends CardImpl { this.addAbility(ability); // {4}{G}{G}: Put a +1/+1 counter on each creature you control. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new AddCountersAllEffect( CounterType.P1P1.createInstance(), StaticFilters.FILTER_PERMANENT_CREATURE_CONTROLLED diff --git a/Mage.Sets/src/mage/cards/s/ShamanEnKor.java b/Mage.Sets/src/mage/cards/s/ShamanEnKor.java index 7b56565fa1f..5ec6cfaf26b 100644 --- a/Mage.Sets/src/mage/cards/s/ShamanEnKor.java +++ b/Mage.Sets/src/mage/cards/s/ShamanEnKor.java @@ -45,7 +45,7 @@ public final class ShamanEnKor extends CardImpl { this.toughness = new MageInt(2); // {0}: The next 1 damage that would be dealt to Shaman en-Kor this turn is dealt to target creature you control instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new RedirectDamageFromSourceToTargetEffect(Duration.EndOfTurn, 1, UsageType.ONE_USAGE_ABSOLUTE), new GenericManaCost(0)); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/Shapesharer.java b/Mage.Sets/src/mage/cards/s/Shapesharer.java index d34e99bdec8..73b8be52f34 100644 --- a/Mage.Sets/src/mage/cards/s/Shapesharer.java +++ b/Mage.Sets/src/mage/cards/s/Shapesharer.java @@ -38,7 +38,7 @@ public final class Shapesharer extends CardImpl { this.addAbility(new ChangelingAbility()); // {2}{U}: Target Shapeshifter becomes a copy of target creature until your next turn. - Ability copyAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability copyAbility = new SimpleActivatedAbility( new ShapesharerEffect(), new ManaCostsImpl<>("{2}{U}")); copyAbility.addTarget(new TargetPermanent(filterShapeshifter)); diff --git a/Mage.Sets/src/mage/cards/s/ShieldmageElder.java b/Mage.Sets/src/mage/cards/s/ShieldmageElder.java index d885fdc1c20..51f62e05332 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldmageElder.java +++ b/Mage.Sets/src/mage/cards/s/ShieldmageElder.java @@ -47,14 +47,14 @@ public final class ShieldmageElder extends CardImpl { this.toughness = new MageInt(3); // Tap two untapped Clerics you control: Prevent all damage target creature would deal this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new PreventDamageByTargetEffect(Duration.EndOfTurn, false).withTextOptions(false, true), new TapTargetCost(new TargetControlledPermanent(2, 2, filter1, false))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Tap two untapped Wizards you control: Prevent all damage target spell would deal this turn. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability2 = new SimpleActivatedAbility( new PreventDamageByTargetEffect(Duration.EndOfTurn, false).withTextOptions(false, true), new TapTargetCost(new TargetControlledPermanent(2, 2, filter2, false))); ability2.addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/cards/s/ShoreSnapper.java b/Mage.Sets/src/mage/cards/s/ShoreSnapper.java index c2d9e2c5a26..61244b0b401 100644 --- a/Mage.Sets/src/mage/cards/s/ShoreSnapper.java +++ b/Mage.Sets/src/mage/cards/s/ShoreSnapper.java @@ -27,7 +27,7 @@ public final class ShoreSnapper extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(new IslandwalkAbility(), Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); } diff --git a/Mage.Sets/src/mage/cards/s/ShrineOfLoyalLegions.java b/Mage.Sets/src/mage/cards/s/ShrineOfLoyalLegions.java index eec8735c7c7..89ef885b478 100644 --- a/Mage.Sets/src/mage/cards/s/ShrineOfLoyalLegions.java +++ b/Mage.Sets/src/mage/cards/s/ShrineOfLoyalLegions.java @@ -43,7 +43,7 @@ public final class ShrineOfLoyalLegions extends CardImpl { new SpellCastControllerTriggeredAbility(null, filter, false))); //{3}, {T}, Sacrifice Shrine of Loyal Legions: Create a 1/1 colorless Myr artifact creature token for each charge counter on Shrine of Loyal Legions. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new CreateTokenEffect(new PhyrexianMyrToken(), new CountersSourceCount(CounterType.CHARGE)), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/s/SilklashSpider.java b/Mage.Sets/src/mage/cards/s/SilklashSpider.java index 6e7e7698e3a..b660e93cc82 100644 --- a/Mage.Sets/src/mage/cards/s/SilklashSpider.java +++ b/Mage.Sets/src/mage/cards/s/SilklashSpider.java @@ -39,7 +39,7 @@ public final class SilklashSpider extends CardImpl { // Reach this.addAbility(ReachAbility.getInstance()); // {X}{G}{G}: Silklash Spider deals X damage to each creature with flying. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new DamageAllEffect(GetXValue.instance, filter), new ManaCostsImpl<>("{X}{G}{G}"))); } diff --git a/Mage.Sets/src/mage/cards/s/SkirkFireMarshal.java b/Mage.Sets/src/mage/cards/s/SkirkFireMarshal.java index ccaf09a9c6d..4103ec60f67 100644 --- a/Mage.Sets/src/mage/cards/s/SkirkFireMarshal.java +++ b/Mage.Sets/src/mage/cards/s/SkirkFireMarshal.java @@ -41,7 +41,7 @@ public final class SkirkFireMarshal extends CardImpl { this.addAbility(ProtectionAbility.from(ObjectColor.RED)); // Tap five untapped Goblins you control: Skirk Fire Marshal deals 10 damage to each creature and each player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new DamageEverythingEffect(10), new TapTargetCost(new TargetControlledPermanent(5,5, filter, true))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SkitteringHeartstopper.java b/Mage.Sets/src/mage/cards/s/SkitteringHeartstopper.java index e264580a126..6b566578642 100644 --- a/Mage.Sets/src/mage/cards/s/SkitteringHeartstopper.java +++ b/Mage.Sets/src/mage/cards/s/SkitteringHeartstopper.java @@ -29,7 +29,7 @@ public final class SkitteringHeartstopper extends CardImpl { this.toughness = new MageInt(2); // {B}: Skittering Heartstopper gains deathtouch until end of turn. (Any amount of damage it deals to a creature is enough to destroy it.) - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B))); } diff --git a/Mage.Sets/src/mage/cards/s/SloppityBilepiper.java b/Mage.Sets/src/mage/cards/s/SloppityBilepiper.java index 83879ecd45b..6feac1432d5 100644 --- a/Mage.Sets/src/mage/cards/s/SloppityBilepiper.java +++ b/Mage.Sets/src/mage/cards/s/SloppityBilepiper.java @@ -30,7 +30,7 @@ public final class SloppityBilepiper extends CardImpl { this.toughness = new MageInt(3); // Jolly Gutpipes -- {2}, {T}, Sacrifice a creature: The next creature spell you cast this turn has cascade. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new NextSpellCastHasAbilityEffect(new CascadeAbility(), StaticFilters.FILTER_CARD_CREATURE), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/s/SokenzanSpellblade.java b/Mage.Sets/src/mage/cards/s/SokenzanSpellblade.java index 9475e607521..768031cdac3 100644 --- a/Mage.Sets/src/mage/cards/s/SokenzanSpellblade.java +++ b/Mage.Sets/src/mage/cards/s/SokenzanSpellblade.java @@ -37,7 +37,7 @@ public final class SokenzanSpellblade extends CardImpl { // {1}{R}: Sokenzan Spellblade gets +X/+0 until end of turn, where X is the number of cards in your hand. Effect effect = new BoostSourceEffect(CardsInControllerHandCount.instance, StaticValue.get(0), Duration.EndOfTurn); effect.setText("{this} gets +X/+0 until end of turn, where X is the number of cards in your hand"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( effect, new ManaCostsImpl<>("{1}{R}") )); } diff --git a/Mage.Sets/src/mage/cards/s/SootstokeKindler.java b/Mage.Sets/src/mage/cards/s/SootstokeKindler.java index 04ffea435d4..c6cf8cf842a 100644 --- a/Mage.Sets/src/mage/cards/s/SootstokeKindler.java +++ b/Mage.Sets/src/mage/cards/s/SootstokeKindler.java @@ -43,7 +43,7 @@ public final class SootstokeKindler extends CardImpl { this.addAbility(HasteAbility.getInstance()); // {tap}: Target black or red creature gains haste until end of turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/s/SoramaroFirstToDream.java b/Mage.Sets/src/mage/cards/s/SoramaroFirstToDream.java index cba18faf8f8..97af2c85091 100644 --- a/Mage.Sets/src/mage/cards/s/SoramaroFirstToDream.java +++ b/Mage.Sets/src/mage/cards/s/SoramaroFirstToDream.java @@ -42,7 +42,7 @@ public final class SoramaroFirstToDream extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetBasePowerToughnessSourceEffect(xValue))); // {4}, Return a land you control to its owner's hand: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new DrawCardSourceControllerEffect(1), new GenericManaCost(4)); ability.addCost(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(new FilterControlledLandPermanent("a land")))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SoulSnare.java b/Mage.Sets/src/mage/cards/s/SoulSnare.java index 49543e304cf..caa87d4258c 100644 --- a/Mage.Sets/src/mage/cards/s/SoulSnare.java +++ b/Mage.Sets/src/mage/cards/s/SoulSnare.java @@ -25,7 +25,7 @@ public final class SoulSnare extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{W}"); // {W}, Sacrifice Soul Snare: Exile target creature that's attacking you or a planeswalker you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new ExileTargetEffect(), new ManaCostsImpl<>("{W}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(new FilterCreatureAttackingYou(true))); diff --git a/Mage.Sets/src/mage/cards/s/SpawnsireOfUlamog.java b/Mage.Sets/src/mage/cards/s/SpawnsireOfUlamog.java index 469f7a4b5fb..95fd505281f 100644 --- a/Mage.Sets/src/mage/cards/s/SpawnsireOfUlamog.java +++ b/Mage.Sets/src/mage/cards/s/SpawnsireOfUlamog.java @@ -44,7 +44,7 @@ public final class SpawnsireOfUlamog extends CardImpl { this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new EldraziSpawnToken(), 2).withTextOptions(true), new GenericManaCost(4))); // {20}: Cast any number of Eldrazi cards you own from outside the game without paying their mana costs. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new CastCardFromOutsideTheGameEffect(filter, ruleText), new GenericManaCost(20) ).addHint(OpenSideboardHint.instance)); } diff --git a/Mage.Sets/src/mage/cards/s/SpearbreakerBehemoth.java b/Mage.Sets/src/mage/cards/s/SpearbreakerBehemoth.java index 26c736d1d5a..6c1c66b5f8d 100644 --- a/Mage.Sets/src/mage/cards/s/SpearbreakerBehemoth.java +++ b/Mage.Sets/src/mage/cards/s/SpearbreakerBehemoth.java @@ -40,7 +40,7 @@ public final class SpearbreakerBehemoth extends CardImpl { // Spearbreaker Behemoth is indestructible. this.addAbility(IndestructibleAbility.getInstance()); // {1}: Target creature with power 5 or greater is indestructible this turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); ability.addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/s/Spincrusher.java b/Mage.Sets/src/mage/cards/s/Spincrusher.java index 83fb53d1d73..f93febd3cb1 100644 --- a/Mage.Sets/src/mage/cards/s/Spincrusher.java +++ b/Mage.Sets/src/mage/cards/s/Spincrusher.java @@ -31,7 +31,7 @@ public final class Spincrusher extends CardImpl { // Whenever Spincrusher blocks, put a +1/+1 counter on it. this.addAbility(new BlocksSourceTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false)); // Remove a +1/+1 counter from Spincrusher: Spincrusher can't be blocked this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new CantBeBlockedSourceEffect(Duration.EndOfTurn), new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1)))); } diff --git a/Mage.Sets/src/mage/cards/s/SpiritBonds.java b/Mage.Sets/src/mage/cards/s/SpiritBonds.java index c4ac9a3cb41..d421a43a230 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritBonds.java +++ b/Mage.Sets/src/mage/cards/s/SpiritBonds.java @@ -46,7 +46,7 @@ public final class SpiritBonds extends CardImpl { this.addAbility(new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new DoIfCostPaid(new CreateTokenEffect(new SpiritWhiteToken()), new ManaCostsImpl<>("{W}")), StaticFilters.FILTER_CREATURE_NON_TOKEN, false)); // {1}{W}, Sacrifice a Spirit: Target non-Spirit creature gains indestructible until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new SacrificeTargetCost(filterSpirit)); ability.addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/s/SpiritEnKor.java b/Mage.Sets/src/mage/cards/s/SpiritEnKor.java index ab525deabd9..b5930b49cd5 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritEnKor.java +++ b/Mage.Sets/src/mage/cards/s/SpiritEnKor.java @@ -34,7 +34,7 @@ public final class SpiritEnKor extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {0}: The next 1 damage that would be dealt to Spirit en-Kor this turn is dealt to target creature you control instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new RedirectDamageFromSourceToTargetEffect(Duration.EndOfTurn, 1, RedirectionEffect.UsageType.ONE_USAGE_ABSOLUTE), new GenericManaCost(0)); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SpontaneousArtist.java b/Mage.Sets/src/mage/cards/s/SpontaneousArtist.java index 7016b604825..38a95247b06 100644 --- a/Mage.Sets/src/mage/cards/s/SpontaneousArtist.java +++ b/Mage.Sets/src/mage/cards/s/SpontaneousArtist.java @@ -35,7 +35,7 @@ public final class SpontaneousArtist extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(1))); // Pay {E}: Target creature gains haste until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new PayEnergyCost(1)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/s/SporeFlower.java b/Mage.Sets/src/mage/cards/s/SporeFlower.java index 5c401d58bdb..1d17c97adc2 100644 --- a/Mage.Sets/src/mage/cards/s/SporeFlower.java +++ b/Mage.Sets/src/mage/cards/s/SporeFlower.java @@ -32,7 +32,7 @@ public final class SporeFlower extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()))); // Remove three spore counters from Spore Flower: Prevent all combat damage that would be dealt this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new PreventAllDamageByAllPermanentsEffect(Duration.EndOfTurn, true), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); } diff --git a/Mage.Sets/src/mage/cards/s/SteelshaperApprentice.java b/Mage.Sets/src/mage/cards/s/SteelshaperApprentice.java index 24508e26c39..f0435ff54ff 100644 --- a/Mage.Sets/src/mage/cards/s/SteelshaperApprentice.java +++ b/Mage.Sets/src/mage/cards/s/SteelshaperApprentice.java @@ -40,7 +40,7 @@ public final class SteelshaperApprentice extends CardImpl { this.toughness = new MageInt(3); // {W}, {tap}, Return Steelshaper Apprentice to its owner's hand: Search your library for an Equipment card, reveal that card, and put it into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInHandEffect(new TargetCardInLibrary(1, 1, filter), true, true), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/s/StoneGiant.java b/Mage.Sets/src/mage/cards/s/StoneGiant.java index 2862c8b5d52..5a781fa56be 100644 --- a/Mage.Sets/src/mage/cards/s/StoneGiant.java +++ b/Mage.Sets/src/mage/cards/s/StoneGiant.java @@ -33,7 +33,7 @@ public final class StoneGiant extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(4); // {tap}: Target creature you control with toughness less than Stone Giant's power gains flying until end of turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new StoneGiantTarget()); diff --git a/Mage.Sets/src/mage/cards/s/Sunforger.java b/Mage.Sets/src/mage/cards/s/Sunforger.java index 02d07480951..44d9e4d2c21 100644 --- a/Mage.Sets/src/mage/cards/s/Sunforger.java +++ b/Mage.Sets/src/mage/cards/s/Sunforger.java @@ -50,7 +50,7 @@ public final class Sunforger extends CardImpl { // {R}{W}, Unattach Sunforger: Search your library for a red or white // instant card with converted mana cost 4 or less and cast that card // without paying its mana cost. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SunforgerEffect(), new ManaCostsImpl<>("{R}{W}")); ability.addCost(new SunforgerUnattachCost(this.getName())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TerrainGenerator.java b/Mage.Sets/src/mage/cards/t/TerrainGenerator.java index ec84d323467..0db5925b71a 100644 --- a/Mage.Sets/src/mage/cards/t/TerrainGenerator.java +++ b/Mage.Sets/src/mage/cards/t/TerrainGenerator.java @@ -27,7 +27,7 @@ public final class TerrainGenerator extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {2}, {T}: You may put a basic land card from your hand onto the battlefield tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_BASIC_LAND_A, false, true), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TezzeretsSimulacrum.java b/Mage.Sets/src/mage/cards/t/TezzeretsSimulacrum.java index ec73595e863..717db0e52ff 100644 --- a/Mage.Sets/src/mage/cards/t/TezzeretsSimulacrum.java +++ b/Mage.Sets/src/mage/cards/t/TezzeretsSimulacrum.java @@ -39,7 +39,7 @@ public final class TezzeretsSimulacrum extends CardImpl { // {T}: Target opponent loses 1 life. If you control a Tezzeret planeswalker, that player loses 3 life instead. Condition condition = new PermanentsOnTheBattlefieldCondition(filter); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new ConditionalOneShotEffect(new LoseLifeTargetEffect(3), new LoseLifeTargetEffect(1), condition, "Target opponent loses 1 life. If you control a Tezzeret planeswalker, that player loses 3 life instead"), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/t/ThallidDevourer.java b/Mage.Sets/src/mage/cards/t/ThallidDevourer.java index 511c7281d1d..cde9f6a2d38 100644 --- a/Mage.Sets/src/mage/cards/t/ThallidDevourer.java +++ b/Mage.Sets/src/mage/cards/t/ThallidDevourer.java @@ -34,7 +34,7 @@ public final class ThallidDevourer extends CardImpl { // At the beginning of your upkeep, put a spore counter on Thallid Devourer. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()))); // Remove three spore counters from Thallid Devourer: Create a 1/1 green Saproling creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); // Sacrifice a Saproling: Thallid Devourer gets +1/+2 until end of turn. diff --git a/Mage.Sets/src/mage/cards/t/ThaumaticCompass.java b/Mage.Sets/src/mage/cards/t/ThaumaticCompass.java index e10d1583d1f..9775d9890cd 100644 --- a/Mage.Sets/src/mage/cards/t/ThaumaticCompass.java +++ b/Mage.Sets/src/mage/cards/t/ThaumaticCompass.java @@ -33,7 +33,7 @@ public final class ThaumaticCompass extends CardImpl { this.secondSideCardClazz = mage.cards.s.SpiresOfOrazca.class; // {3}, {T}: Search your library for a basic land card, reveal it, put it into your hand, then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/t/ThawingGlaciers.java b/Mage.Sets/src/mage/cards/t/ThawingGlaciers.java index a613283b562..82bd3518a0f 100644 --- a/Mage.Sets/src/mage/cards/t/ThawingGlaciers.java +++ b/Mage.Sets/src/mage/cards/t/ThawingGlaciers.java @@ -31,7 +31,7 @@ public final class ThawingGlaciers extends CardImpl { // Thawing Glaciers enters the battlefield tapped. this.addAbility(new EntersBattlefieldTappedAbility()); // {1}, {tap}: Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle your library. Return Thawing Glaciers to its owner's hand at the beginning of the next cleanup step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addEffect(new CreateDelayedTriggeredAbilityEffect(new AtTheBeginOfNextCleanupDelayedTriggeredAbility(new ReturnToHandSourceEffect(true)))); diff --git a/Mage.Sets/src/mage/cards/t/TheloniteDruid.java b/Mage.Sets/src/mage/cards/t/TheloniteDruid.java index 82c86fee5f1..b333a16cd27 100644 --- a/Mage.Sets/src/mage/cards/t/TheloniteDruid.java +++ b/Mage.Sets/src/mage/cards/t/TheloniteDruid.java @@ -42,7 +42,7 @@ public final class TheloniteDruid extends CardImpl { new CreatureToken(2, 3), "Forests", filter, Duration.EndOfTurn, false); effect.getDependencyTypes().add(DependencyType.BecomeForest); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( effect, new ManaCostsImpl<>("{1}{G}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/t/ThornThallid.java b/Mage.Sets/src/mage/cards/t/ThornThallid.java index 578b61c2c9a..f49426b3695 100644 --- a/Mage.Sets/src/mage/cards/t/ThornThallid.java +++ b/Mage.Sets/src/mage/cards/t/ThornThallid.java @@ -32,7 +32,7 @@ public final class ThornThallid extends CardImpl { // At the beginning of your upkeep, put a spore counter on Thorn Thallid. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()))); // Remove three spore counters from Thorn Thallid: Thorn Thallid deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new DamageTargetEffect(1, "it"), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3))); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/t/ThornscapeApprentice.java b/Mage.Sets/src/mage/cards/t/ThornscapeApprentice.java index 18768412e59..0d31d9181c7 100644 --- a/Mage.Sets/src/mage/cards/t/ThornscapeApprentice.java +++ b/Mage.Sets/src/mage/cards/t/ThornscapeApprentice.java @@ -31,7 +31,7 @@ public final class ThornscapeApprentice extends CardImpl { this.toughness = new MageInt(1); // {R}, {tap}: Target creature gains first strike until end of turn. - SimpleActivatedAbility ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability1 = new SimpleActivatedAbility( new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability1.addCost(new TapSourceCost()); @@ -39,7 +39,7 @@ public final class ThornscapeApprentice extends CardImpl { this.addAbility(ability1); // {W}, {tap}: Tap target creature. - SimpleActivatedAbility ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability2 = new SimpleActivatedAbility( new TapTargetEffect(), new ManaCostsImpl<>("{W}")); ability2.addCost(new TapSourceCost()); ability2.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/t/ThranTemporalGateway.java b/Mage.Sets/src/mage/cards/t/ThranTemporalGateway.java index c4972ede471..f91a7aa0107 100644 --- a/Mage.Sets/src/mage/cards/t/ThranTemporalGateway.java +++ b/Mage.Sets/src/mage/cards/t/ThranTemporalGateway.java @@ -32,7 +32,7 @@ public final class ThranTemporalGateway extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // {4}, {t}: You may put a historic permanent card from your hand onto the battlefield. (Artifacts, legendaries, and Sagas are historic.) - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new PutCardFromHandOntoBattlefieldEffect(filter) .setText("You may put a historic permanent card from your hand onto the battlefield. " + "(Artifacts, legendaries, and Sagas are historic.)"), diff --git a/Mage.Sets/src/mage/cards/t/TimmyPowerGamer.java b/Mage.Sets/src/mage/cards/t/TimmyPowerGamer.java index 152f0e6657d..81430c10809 100644 --- a/Mage.Sets/src/mage/cards/t/TimmyPowerGamer.java +++ b/Mage.Sets/src/mage/cards/t/TimmyPowerGamer.java @@ -33,7 +33,7 @@ public final class TimmyPowerGamer extends CardImpl { this.toughness = new MageInt(1); // {4}: You may put a creature card from your hand onto the battlefield. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_CREATURE_A), new ManaCostsImpl<>("{4}")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TriassicEgg.java b/Mage.Sets/src/mage/cards/t/TriassicEgg.java index cc46fecb016..fac59e4d996 100644 --- a/Mage.Sets/src/mage/cards/t/TriassicEgg.java +++ b/Mage.Sets/src/mage/cards/t/TriassicEgg.java @@ -32,7 +32,7 @@ public final class TriassicEgg extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {3}, {tap}: Put a hatchling counter on Triassic Egg. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new AddCountersSourceEffect(CounterType.HATCHLING.createInstance(), true), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/u/UlrichsKindred.java b/Mage.Sets/src/mage/cards/u/UlrichsKindred.java index 8c55c72914f..0f25d20d9e2 100644 --- a/Mage.Sets/src/mage/cards/u/UlrichsKindred.java +++ b/Mage.Sets/src/mage/cards/u/UlrichsKindred.java @@ -41,7 +41,7 @@ public final class UlrichsKindred extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // {3}{G}: Target attacking Wolf or Werewolf gains indestructible until end of turn. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{3}{G}")); ability.addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/u/UnyaroGriffin.java b/Mage.Sets/src/mage/cards/u/UnyaroGriffin.java index e7f3ec870a7..ae4eaac6458 100644 --- a/Mage.Sets/src/mage/cards/u/UnyaroGriffin.java +++ b/Mage.Sets/src/mage/cards/u/UnyaroGriffin.java @@ -44,7 +44,7 @@ public final class UnyaroGriffin extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Sacrifice Unyaro Griffin: Counter target red instant or sorcery spell. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new CounterTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetSpell(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VagrantPlowbeasts.java b/Mage.Sets/src/mage/cards/v/VagrantPlowbeasts.java index df1ba5d44c7..86f874ec94f 100644 --- a/Mage.Sets/src/mage/cards/v/VagrantPlowbeasts.java +++ b/Mage.Sets/src/mage/cards/v/VagrantPlowbeasts.java @@ -35,7 +35,7 @@ public final class VagrantPlowbeasts extends CardImpl { this.power = new MageInt(6); this.toughness = new MageInt(6); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new RegenerateTargetEffect(), new ManaCostsImpl<>("{1}")); ability.addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/v/VitasporeThallid.java b/Mage.Sets/src/mage/cards/v/VitasporeThallid.java index 268c6a30448..2dfe408302e 100644 --- a/Mage.Sets/src/mage/cards/v/VitasporeThallid.java +++ b/Mage.Sets/src/mage/cards/v/VitasporeThallid.java @@ -37,11 +37,11 @@ public final class VitasporeThallid extends CardImpl { // At the beginning of your upkeep, put a spore counter on Vitaspore Thallid. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()))); // Remove three spore counters from Vitaspore Thallid: Create a 1/1 green Saproling creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); // Sacrifice a Saproling: Target creature gains haste until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(filter)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/v/VoiceOfTheWoods.java b/Mage.Sets/src/mage/cards/v/VoiceOfTheWoods.java index 5eaab92ca64..2c8d42f6ea0 100644 --- a/Mage.Sets/src/mage/cards/v/VoiceOfTheWoods.java +++ b/Mage.Sets/src/mage/cards/v/VoiceOfTheWoods.java @@ -38,7 +38,7 @@ public final class VoiceOfTheWoods extends CardImpl { this.toughness = new MageInt(2); // Tap five untapped Elves you control: Create a 7/7 green Elemental creature token with trample. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new CreateTokenEffect(new VoiceOfTheWoodsElementalToken()), new TapTargetCost(new TargetControlledPermanent(5, 5, filter, false))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VoyagerStaff.java b/Mage.Sets/src/mage/cards/v/VoyagerStaff.java index 73425c0f89b..081c8f95a95 100644 --- a/Mage.Sets/src/mage/cards/v/VoyagerStaff.java +++ b/Mage.Sets/src/mage/cards/v/VoyagerStaff.java @@ -22,7 +22,7 @@ public final class VoyagerStaff extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // {2}, Sacrifice Voyager Staff: Exile target creature. Return the exiled card to the battlefield under its owner's control at the beginning of the next end step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new ExileReturnBattlefieldNextEndStepTargetEffect().returnExiledOnly(true), new GenericManaCost(2)); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/w/WallOfTanglecord.java b/Mage.Sets/src/mage/cards/w/WallOfTanglecord.java index a4deca6ed15..1d58210e7bd 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfTanglecord.java +++ b/Mage.Sets/src/mage/cards/w/WallOfTanglecord.java @@ -28,7 +28,7 @@ public final class WallOfTanglecord extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(6); this.addAbility(DefenderAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilitySourceEffect(ReachAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); } diff --git a/Mage.Sets/src/mage/cards/w/WandOfTheWorldsoul.java b/Mage.Sets/src/mage/cards/w/WandOfTheWorldsoul.java index eb547b5a742..a118c768791 100644 --- a/Mage.Sets/src/mage/cards/w/WandOfTheWorldsoul.java +++ b/Mage.Sets/src/mage/cards/w/WandOfTheWorldsoul.java @@ -28,7 +28,7 @@ public final class WandOfTheWorldsoul extends CardImpl { this.addAbility(new WhiteManaAbility()); // {T}: The next spell you cast this turn has convoke. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new NextSpellCastHasAbilityEffect(new ConvokeAbility()), new TapSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/w/WanderersTwig.java b/Mage.Sets/src/mage/cards/w/WanderersTwig.java index 05e9c096648..6647ad82c68 100644 --- a/Mage.Sets/src/mage/cards/w/WanderersTwig.java +++ b/Mage.Sets/src/mage/cards/w/WanderersTwig.java @@ -25,7 +25,7 @@ public final class WanderersTwig extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {1}, Sacrifice Wanderer's Twig: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), new GenericManaCost(1)); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/w/WanderingMage.java b/Mage.Sets/src/mage/cards/w/WanderingMage.java index 928412fc2d1..ff860723176 100644 --- a/Mage.Sets/src/mage/cards/w/WanderingMage.java +++ b/Mage.Sets/src/mage/cards/w/WanderingMage.java @@ -49,20 +49,20 @@ public final class WanderingMage extends CardImpl { this.toughness = new MageInt(3); // {W}, Pay 1 life: Prevent the next 2 damage that would be dealt to target creature this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new ManaCostsImpl<>("{W}")); ability.addCost(new PayLifeCost(1)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {U}: Prevent the next 1 damage that would be dealt to target Cleric or Wizard creature this turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + ability = new SimpleActivatedAbility( new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{U}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); // {B}, Put a -1/-1 counter on a creature you control: Prevent the next 2 damage that would be dealt to target player this turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + ability = new SimpleActivatedAbility( new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new ManaCostsImpl<>("{B}")); ability.addCost(new WanderingMageCost()); ability.addTarget(new TargetPlayerOrPlaneswalker()); diff --git a/Mage.Sets/src/mage/cards/w/WarpedLandscape.java b/Mage.Sets/src/mage/cards/w/WarpedLandscape.java index 9d3dbc7f19a..2ab2a21c69e 100644 --- a/Mage.Sets/src/mage/cards/w/WarpedLandscape.java +++ b/Mage.Sets/src/mage/cards/w/WarpedLandscape.java @@ -30,7 +30,7 @@ public final class WarpedLandscape extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {2}, {T}, Sacrifice Warped Landscape: Search your library for a basic land card and put it onto the battlefield tapped. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/w/WarriorEnKor.java b/Mage.Sets/src/mage/cards/w/WarriorEnKor.java index 36946cc7a29..0fbda191d69 100644 --- a/Mage.Sets/src/mage/cards/w/WarriorEnKor.java +++ b/Mage.Sets/src/mage/cards/w/WarriorEnKor.java @@ -31,7 +31,7 @@ public final class WarriorEnKor extends CardImpl { this.toughness = new MageInt(2); // {0}: The next 1 damage that would be dealt to Warrior en-Kor this turn is dealt to target creature you control instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new RedirectDamageFromSourceToTargetEffect(Duration.EndOfTurn, 1, RedirectionEffect.UsageType.ONE_USAGE_ABSOLUTE), new GenericManaCost(0)); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WayfarersBauble.java b/Mage.Sets/src/mage/cards/w/WayfarersBauble.java index 4cc05760573..5086773e02f 100644 --- a/Mage.Sets/src/mage/cards/w/WayfarersBauble.java +++ b/Mage.Sets/src/mage/cards/w/WayfarersBauble.java @@ -26,7 +26,7 @@ public final class WayfarersBauble extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {2}, {tap}, Sacrifice Wayfarer's Bauble: Search your library for a basic land card and put that card onto the battlefield tapped. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND),true, true), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/w/WeatherseedElf.java b/Mage.Sets/src/mage/cards/w/WeatherseedElf.java index 1c6631c4ece..98220327ad5 100644 --- a/Mage.Sets/src/mage/cards/w/WeatherseedElf.java +++ b/Mage.Sets/src/mage/cards/w/WeatherseedElf.java @@ -30,7 +30,7 @@ public final class WeatherseedElf extends CardImpl { this.toughness = new MageInt(1); // {tap}: Target creature gains forestwalk until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(new ForestwalkAbility(false), Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/w/WhipgrassEntangler.java b/Mage.Sets/src/mage/cards/w/WhipgrassEntangler.java index 817f6a72d39..7e4b66136cc 100644 --- a/Mage.Sets/src/mage/cards/w/WhipgrassEntangler.java +++ b/Mage.Sets/src/mage/cards/w/WhipgrassEntangler.java @@ -38,7 +38,7 @@ public final class WhipgrassEntangler extends CardImpl { // {1}{W}: Until end of turn, target creature gains "This creature can't attack or block unless its controller pays {1} for each Cleric on the battlefield." Ability gainedAbility = new LinkedEffectIdStaticAbility(new WhipgrassEntanglerCantAttackUnlessYouPayEffect()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(gainedAbility, Duration.EndOfTurn).setText("Until end of turn, target creature gains \"This creature can't attack or block unless its controller pays {1} for each Cleric on the battlefield.\""), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/w/WhiteManaBattery.java b/Mage.Sets/src/mage/cards/w/WhiteManaBattery.java index 74641cc3b6e..77874bea52e 100644 --- a/Mage.Sets/src/mage/cards/w/WhiteManaBattery.java +++ b/Mage.Sets/src/mage/cards/w/WhiteManaBattery.java @@ -28,7 +28,7 @@ public final class WhiteManaBattery extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {2}, {T}: Put a charge counter on White Mana Battery. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new AddCountersSourceEffect(CounterType.CHARGE.createInstance(1)), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WildFieldScarecrow.java b/Mage.Sets/src/mage/cards/w/WildFieldScarecrow.java index ee0741eb37a..5af9b329e08 100644 --- a/Mage.Sets/src/mage/cards/w/WildFieldScarecrow.java +++ b/Mage.Sets/src/mage/cards/w/WildFieldScarecrow.java @@ -33,7 +33,7 @@ public final class WildFieldScarecrow extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {2}, Sacrifice Wild-Field Scarecrow: Search your library for up to two basic land cards, reveal them, and put them into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 2, StaticFilters.FILTER_CARD_BASIC_LANDS), true), new GenericManaCost(2)); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/w/WillowPriestess.java b/Mage.Sets/src/mage/cards/w/WillowPriestess.java index 40e46cf8c53..6ac2a8f8c77 100644 --- a/Mage.Sets/src/mage/cards/w/WillowPriestess.java +++ b/Mage.Sets/src/mage/cards/w/WillowPriestess.java @@ -44,12 +44,12 @@ public final class WillowPriestess extends CardImpl { this.toughness = new MageInt(2); // {T}: You may put a Faerie permanent card from your hand onto the battlefield. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new PutCardFromHandOntoBattlefieldEffect(filter), new TapSourceCost())); // {2}{G}: Target green creature gains protection from black until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(ProtectionAbility.from(ObjectColor.BLACK), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}")); Target target = new TargetPermanent(greenCreature); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/w/WineOfBloodAndIron.java b/Mage.Sets/src/mage/cards/w/WineOfBloodAndIron.java index ee16bde85ce..5f27500387f 100644 --- a/Mage.Sets/src/mage/cards/w/WineOfBloodAndIron.java +++ b/Mage.Sets/src/mage/cards/w/WineOfBloodAndIron.java @@ -28,7 +28,7 @@ public final class WineOfBloodAndIron extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // {4}: Target creature gets +X/+0 until end of turn, where X is its power. Sacrifice Wine of Blood and Iron at the beginning of the next end step. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new BoostTargetEffect(TargetPermanentPowerCount.instance, StaticValue.get(0), Duration.EndOfTurn), new GenericManaCost(4)); Effect effect = new CreateDelayedTriggeredAbilityEffect( diff --git a/Mage.Sets/src/mage/cards/w/WormwoodDryad.java b/Mage.Sets/src/mage/cards/w/WormwoodDryad.java index 106dc523acd..eef4d248eb5 100644 --- a/Mage.Sets/src/mage/cards/w/WormwoodDryad.java +++ b/Mage.Sets/src/mage/cards/w/WormwoodDryad.java @@ -30,13 +30,13 @@ public final class WormwoodDryad extends CardImpl { this.toughness = new MageInt(1); // {G}: Wormwood Dryad gains forestwalk until end of turn and deals 1 damage to you. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilitySourceEffect(new ForestwalkAbility(false), Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addEffect(new DamageControllerEffect(1).setText("and deals 1 damage to you")); this.addAbility(ability); // {B}: Wormwood Dryad gains swampwalk until end of turn and deals 1 damage to you. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + ability = new SimpleActivatedAbility( new GainAbilitySourceEffect(new SwampwalkAbility(false), Duration.EndOfTurn), new ManaCostsImpl<>("{B}")); ability.addEffect(new DamageControllerEffect(1).setText("and deals 1 damage to you")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WormwoodTreefolk.java b/Mage.Sets/src/mage/cards/w/WormwoodTreefolk.java index 47855f98673..bfa72806aae 100644 --- a/Mage.Sets/src/mage/cards/w/WormwoodTreefolk.java +++ b/Mage.Sets/src/mage/cards/w/WormwoodTreefolk.java @@ -30,13 +30,13 @@ public final class WormwoodTreefolk extends CardImpl { this.toughness = new MageInt(4); // {G}{G}: Wormwood Treefolk gains forestwalk until end of turn and deals 2 damage to you. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilitySourceEffect(new ForestwalkAbility(false), Duration.EndOfTurn), new ManaCostsImpl<>("{G}{G}")); ability.addEffect(new DamageControllerEffect(2).setText("and deals 2 damage to you")); this.addAbility(ability); // {B}{B}: Wormwood Treefolk gains swampwalk until end of turn and deals 2 damage to you. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + ability = new SimpleActivatedAbility( new GainAbilitySourceEffect(new SwampwalkAbility(false), Duration.EndOfTurn), new ManaCostsImpl<>("{B}{B}")); ability.addEffect(new DamageControllerEffect(2).setText("and deals 2 damage to you")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/x/XathridGorgon.java b/Mage.Sets/src/mage/cards/x/XathridGorgon.java index 297ab23082f..e16f34b4702 100644 --- a/Mage.Sets/src/mage/cards/x/XathridGorgon.java +++ b/Mage.Sets/src/mage/cards/x/XathridGorgon.java @@ -42,7 +42,7 @@ public final class XathridGorgon extends CardImpl { this.addAbility(DeathtouchAbility.getInstance()); // {2}{B}, {tap}: Put a petrification counter on target creature. It gains defender and becomes a colorless artifact in addition to its other types. Its activated abilities can't be activated. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new AddCountersTargetEffect(CounterType.PETRIFICATION.createInstance()), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/y/YewSpirit.java b/Mage.Sets/src/mage/cards/y/YewSpirit.java index 31efe976e55..0694c1f44ce 100644 --- a/Mage.Sets/src/mage/cards/y/YewSpirit.java +++ b/Mage.Sets/src/mage/cards/y/YewSpirit.java @@ -29,7 +29,7 @@ public final class YewSpirit extends CardImpl { this.toughness = new MageInt(3); // {2}{G}{G}: Yew Spirit gets +X/+X until end of turn, where X is its power. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new BoostSourceEffect(SourcePermanentPowerValue.NOT_NEGATIVE, SourcePermanentPowerValue.NOT_NEGATIVE, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}{G}"))); } diff --git a/Mage.Sets/src/mage/cards/z/ZombieInfestation.java b/Mage.Sets/src/mage/cards/z/ZombieInfestation.java index c9a010ebbe1..e6547fe1120 100644 --- a/Mage.Sets/src/mage/cards/z/ZombieInfestation.java +++ b/Mage.Sets/src/mage/cards/z/ZombieInfestation.java @@ -24,7 +24,7 @@ public final class ZombieInfestation extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{B}"); // Discard two cards: Create a 2/2 black Zombie creature token. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + SimpleActivatedAbility ability = new SimpleActivatedAbility( new CreateTokenEffect(new ZombieToken()), new DiscardTargetCost(new TargetCardInHand(2, StaticFilters.FILTER_CARD_CARDS))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/z/ZombieTrailblazer.java b/Mage.Sets/src/mage/cards/z/ZombieTrailblazer.java index db99684fcc7..230e98824a3 100644 --- a/Mage.Sets/src/mage/cards/z/ZombieTrailblazer.java +++ b/Mage.Sets/src/mage/cards/z/ZombieTrailblazer.java @@ -42,13 +42,13 @@ public final class ZombieTrailblazer extends CardImpl { this.toughness = new MageInt(2); // Tap an untapped Zombie you control: Target land becomes a Swamp until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new BecomesBasicLandTargetEffect(Duration.EndOfTurn, SubType.SWAMP), new TapTargetCost(new TargetControlledPermanent(filter))); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); // Tap an untapped Zombie you control: Target creature gains swampwalk until end of turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(new SwampwalkAbility(false), Duration.EndOfTurn), new TapTargetCost(new TargetControlledPermanent(filter))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability);