diff --git a/Mage.Sets/src/mage/cards/u/UktabiKong.java b/Mage.Sets/src/mage/cards/u/UktabiKong.java index 5953090a89b..24ce068e3bd 100644 --- a/Mage.Sets/src/mage/cards/u/UktabiKong.java +++ b/Mage.Sets/src/mage/cards/u/UktabiKong.java @@ -46,7 +46,7 @@ public final class UktabiKong extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new DestroyAllEffect(new FilterArtifactPermanent("artifacts")), false)); // Tap two untapped Apes you control: Create a 1/1 green Ape creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new UktabiKongApeToken()), new TapTargetCost(new TargetControlledPermanent(2, 2, filter, true)))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new UktabiKongApeToken()), new TapTargetCost(new TargetControlledPermanent(2, 2, filter, true)))); } private UktabiKong(final UktabiKong card) { diff --git a/Mage.Sets/src/mage/cards/u/UktabiWildcats.java b/Mage.Sets/src/mage/cards/u/UktabiWildcats.java index 1cf617b9cfc..be3d55aca1c 100644 --- a/Mage.Sets/src/mage/cards/u/UktabiWildcats.java +++ b/Mage.Sets/src/mage/cards/u/UktabiWildcats.java @@ -44,7 +44,7 @@ public final class UktabiWildcats extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetBasePowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter)))); // {G}, Sacrifice a Forest: Regenerate Uktabi Wildcats. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}")); ability.addCost(new SacrificeTargetCost(sacrificeFilter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/u/UlashtTheHateSeed.java b/Mage.Sets/src/mage/cards/u/UlashtTheHateSeed.java index 0df33ecc65a..0bcdee5bc41 100644 --- a/Mage.Sets/src/mage/cards/u/UlashtTheHateSeed.java +++ b/Mage.Sets/src/mage/cards/u/UlashtTheHateSeed.java @@ -50,7 +50,7 @@ public final class UlashtTheHateSeed extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new UlashtTheHateSeedEffect(), "with a +1/+1 counter on it for each other red creature you control and a +1/+1 counter on it for each other green creature you control.")); // {1}, Remove a +1/+1 counter from Ulasht: Choose one - Ulasht deals 1 damage to target creature; - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new GenericManaCost(1)); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetCreaturePermanent()); // or create a 1/1 green Saproling creature token. diff --git a/Mage.Sets/src/mage/cards/u/UlvenwaldCaptive.java b/Mage.Sets/src/mage/cards/u/UlvenwaldCaptive.java index bdfc7f63b5a..f8207fb0d22 100644 --- a/Mage.Sets/src/mage/cards/u/UlvenwaldCaptive.java +++ b/Mage.Sets/src/mage/cards/u/UlvenwaldCaptive.java @@ -38,7 +38,7 @@ public final class UlvenwaldCaptive extends CardImpl { // {5}{G}{G}: Transform Ulvenwald Captive. this.addAbility(new TransformAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(), new ManaCostsImpl<>("{5}{G}{G}"))); + this.addAbility(new SimpleActivatedAbility(new TransformSourceEffect(), new ManaCostsImpl<>("{5}{G}{G}"))); } private UlvenwaldCaptive(final UlvenwaldCaptive card) { diff --git a/Mage.Sets/src/mage/cards/u/UnbenderTine.java b/Mage.Sets/src/mage/cards/u/UnbenderTine.java index 7cd0243d562..920af16f5cc 100644 --- a/Mage.Sets/src/mage/cards/u/UnbenderTine.java +++ b/Mage.Sets/src/mage/cards/u/UnbenderTine.java @@ -36,7 +36,7 @@ public final class UnbenderTine extends CardImpl { // {tap}: Untap another target permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UnbenderTineEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new UnbenderTineEffect(), new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/u/UnbridledGrowth.java b/Mage.Sets/src/mage/cards/u/UnbridledGrowth.java index aa8ef975688..2c4f9ee81fe 100644 --- a/Mage.Sets/src/mage/cards/u/UnbridledGrowth.java +++ b/Mage.Sets/src/mage/cards/u/UnbridledGrowth.java @@ -48,7 +48,7 @@ public final class UnbridledGrowth extends CardImpl { this.addAbility(new SimpleStaticAbility(effect)); // Sacrifice Unbridled Growth: Draw a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new SacrificeSourceCost())); } private UnbridledGrowth(final UnbridledGrowth card) { diff --git a/Mage.Sets/src/mage/cards/u/UndeadLeotau.java b/Mage.Sets/src/mage/cards/u/UndeadLeotau.java index d2f61b90267..da2715ad7b7 100644 --- a/Mage.Sets/src/mage/cards/u/UndeadLeotau.java +++ b/Mage.Sets/src/mage/cards/u/UndeadLeotau.java @@ -29,7 +29,7 @@ public final class UndeadLeotau extends CardImpl { this.toughness = new MageInt(4); // {R}: Undead Leotau gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(+1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(+1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); // Unearth {2}{B} this.addAbility(new UnearthAbility(new ManaCostsImpl<>("{2}{B}"))); diff --git a/Mage.Sets/src/mage/cards/u/UndeadSlayer.java b/Mage.Sets/src/mage/cards/u/UndeadSlayer.java index 6a52fca667b..ad16c9401f8 100644 --- a/Mage.Sets/src/mage/cards/u/UndeadSlayer.java +++ b/Mage.Sets/src/mage/cards/u/UndeadSlayer.java @@ -40,7 +40,7 @@ public final class UndeadSlayer extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/u/UndercityInformer.java b/Mage.Sets/src/mage/cards/u/UndercityInformer.java index 47019fd6c45..31d69b4d520 100644 --- a/Mage.Sets/src/mage/cards/u/UndercityInformer.java +++ b/Mage.Sets/src/mage/cards/u/UndercityInformer.java @@ -37,7 +37,7 @@ public final class UndercityInformer extends CardImpl { this.toughness = new MageInt(3); //{1}, Sacrifice a creature: Target player reveals the top card of their library until they reveal a land card, then puts those cards into their graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UndercityInformerEffect(), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new UndercityInformerEffect(), new ManaCostsImpl<>("{1}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/u/UndercityShade.java b/Mage.Sets/src/mage/cards/u/UndercityShade.java index abf664bd912..0975aaf6787 100644 --- a/Mage.Sets/src/mage/cards/u/UndercityShade.java +++ b/Mage.Sets/src/mage/cards/u/UndercityShade.java @@ -26,7 +26,7 @@ public final class UndercityShade extends CardImpl { this.addAbility(FearAbility.getInstance()); // {B}: Undercity Shade gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B))); } private UndercityShade(final UndercityShade card) { diff --git a/Mage.Sets/src/mage/cards/u/UndercityTroll.java b/Mage.Sets/src/mage/cards/u/UndercityTroll.java index 01c609b469f..e3f7bcf679e 100644 --- a/Mage.Sets/src/mage/cards/u/UndercityTroll.java +++ b/Mage.Sets/src/mage/cards/u/UndercityTroll.java @@ -28,7 +28,7 @@ public final class UndercityTroll extends CardImpl { // Renown 1 this.addAbility(new RenownAbility(1)); // {2}{G}: Regenerate Undercity Troll. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{G}"))); } private UndercityTroll(final UndercityTroll card) { diff --git a/Mage.Sets/src/mage/cards/u/UndergroundForum.java b/Mage.Sets/src/mage/cards/u/UndergroundForum.java index 5f820d48c51..2f17c439b18 100644 --- a/Mage.Sets/src/mage/cards/u/UndergroundForum.java +++ b/Mage.Sets/src/mage/cards/u/UndergroundForum.java @@ -42,7 +42,7 @@ public final class UndergroundForum extends CardImpl { this.addAbility(ability); // {2}, {T}: Put a bounty counter on target creature. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.BOUNTY.createInstance()), new GenericManaCost(2)); + Ability ability2 = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.BOUNTY.createInstance()), new GenericManaCost(2)); ability2.addCost(new TapSourceCost()); ability2.addTarget(new TargetCreaturePermanent()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/u/UnderworldCoinsmith.java b/Mage.Sets/src/mage/cards/u/UnderworldCoinsmith.java index 3b0a4a351a9..27efdcc1088 100644 --- a/Mage.Sets/src/mage/cards/u/UnderworldCoinsmith.java +++ b/Mage.Sets/src/mage/cards/u/UnderworldCoinsmith.java @@ -33,7 +33,7 @@ public final class UnderworldCoinsmith extends CardImpl { // Constellation - Whenever Underworld Coinsmith or an enchantment you control enters, you gain 1 life. this.addAbility(new ConstellationAbility(new GainLifeEffect(1))); // {W}{B}, Pay 1 life: Each opponent loses 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeOpponentsEffect(1), new ManaCostsImpl<>("{W}{B}")); + Ability ability = new SimpleActivatedAbility(new LoseLifeOpponentsEffect(1), new ManaCostsImpl<>("{W}{B}")); ability.addCost(new PayLifeCost(1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/u/UnderworldConnections.java b/Mage.Sets/src/mage/cards/u/UnderworldConnections.java index c1f4ae4434e..f20390629ef 100644 --- a/Mage.Sets/src/mage/cards/u/UnderworldConnections.java +++ b/Mage.Sets/src/mage/cards/u/UnderworldConnections.java @@ -44,7 +44,7 @@ public final class UnderworldConnections extends CardImpl { this.addAbility(ability); // Enchanted land has "{T}, Pay 1 life: Draw a card." - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost()); + Ability gainedAbility = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new TapSourceCost()); gainedAbility.addCost(new PayLifeCost(1)); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, rule))); } diff --git a/Mage.Sets/src/mage/cards/u/UnfulfilledDesires.java b/Mage.Sets/src/mage/cards/u/UnfulfilledDesires.java index 5634eb4d828..a5e317f5ce0 100644 --- a/Mage.Sets/src/mage/cards/u/UnfulfilledDesires.java +++ b/Mage.Sets/src/mage/cards/u/UnfulfilledDesires.java @@ -22,7 +22,7 @@ public final class UnfulfilledDesires extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{U}{B}"); // {1}, Pay 1 life: Draw a card, then discard a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{1}")); ability.addCost(new PayLifeCost(1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/u/UnholyGrotto.java b/Mage.Sets/src/mage/cards/u/UnholyGrotto.java index e009cfedf2a..c1d0b11eeca 100644 --- a/Mage.Sets/src/mage/cards/u/UnholyGrotto.java +++ b/Mage.Sets/src/mage/cards/u/UnholyGrotto.java @@ -34,7 +34,7 @@ public final class UnholyGrotto extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {B}, {tap}: Put target Zombie card from your graveyard on top of your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new PutOnLibraryTargetEffect(true), new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/u/UniversalSolvent.java b/Mage.Sets/src/mage/cards/u/UniversalSolvent.java index 9871e8a8d41..bdfd182116c 100644 --- a/Mage.Sets/src/mage/cards/u/UniversalSolvent.java +++ b/Mage.Sets/src/mage/cards/u/UniversalSolvent.java @@ -24,7 +24,7 @@ public final class UniversalSolvent extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // {7}, {T}, Sacrifice Universal Solvent: Destroy target permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new GenericManaCost(7)); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new GenericManaCost(7)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent()); diff --git a/Mage.Sets/src/mage/cards/u/UnlikelyAlliance.java b/Mage.Sets/src/mage/cards/u/UnlikelyAlliance.java index eccf5ab5258..6c0a2e03eb6 100644 --- a/Mage.Sets/src/mage/cards/u/UnlikelyAlliance.java +++ b/Mage.Sets/src/mage/cards/u/UnlikelyAlliance.java @@ -34,7 +34,7 @@ public final class UnlikelyAlliance extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); // {1}{W}: Target nonattacking, nonblocking creature gets +0/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(0, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(0, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/u/UnlivingPsychopath.java b/Mage.Sets/src/mage/cards/u/UnlivingPsychopath.java index f61653b5233..1e41474d493 100644 --- a/Mage.Sets/src/mage/cards/u/UnlivingPsychopath.java +++ b/Mage.Sets/src/mage/cards/u/UnlivingPsychopath.java @@ -44,7 +44,7 @@ public final class UnlivingPsychopath extends CardImpl { this.toughness = new MageInt(4); // {B}: Unliving Psychopath gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B))); // {B}, {tap}: Destroy target creature with power less than Unliving Psychopath's power. Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ColoredManaCost(ColoredManaSymbol.B)); diff --git a/Mage.Sets/src/mage/cards/u/UnnaturalSelection.java b/Mage.Sets/src/mage/cards/u/UnnaturalSelection.java index 3088d3dafb0..d71eba2536f 100644 --- a/Mage.Sets/src/mage/cards/u/UnnaturalSelection.java +++ b/Mage.Sets/src/mage/cards/u/UnnaturalSelection.java @@ -22,7 +22,7 @@ public final class UnnaturalSelection extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); // {1}: Choose a creature type other than Wall. Target creature becomes that type until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesChosenCreatureTypeTargetEffect(true), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new BecomesChosenCreatureTypeTargetEffect(true), new GenericManaCost(1)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/u/UnravelingMummy.java b/Mage.Sets/src/mage/cards/u/UnravelingMummy.java index 952c3bee90e..2badbfe8d63 100644 --- a/Mage.Sets/src/mage/cards/u/UnravelingMummy.java +++ b/Mage.Sets/src/mage/cards/u/UnravelingMummy.java @@ -43,14 +43,14 @@ public final class UnravelingMummy extends CardImpl { // {1}{W}: Target attacking Zombie gains lifelink until end of turn. Effect effect = new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn); effect.setText("Target attacking Zombie gains lifelink until end of turn."); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); // {1}{B}: Target attacking Zombie gains deathtouch until end of turn. effect = new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn); effect.setText("Target attacking Zombie gains deathtouch until end of turn. (Any amount of damage it deals to a creature is enough to destroy it.)"); - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{B}")); + ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}{B}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/u/UnrulySureshot.java b/Mage.Sets/src/mage/cards/u/UnrulySureshot.java index 0f00311750d..6facccb4e29 100644 --- a/Mage.Sets/src/mage/cards/u/UnrulySureshot.java +++ b/Mage.Sets/src/mage/cards/u/UnrulySureshot.java @@ -44,7 +44,7 @@ public final class UnrulySureshot extends CardImpl { this.addAbility(ability); // {3}{R}: Unruly Sureshot deals 2 damage to target creature with a bounty counter on it. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{3}{R}")); + ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{3}{R}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/u/UnseenWalker.java b/Mage.Sets/src/mage/cards/u/UnseenWalker.java index 4ccc2ad0e34..ca35473294f 100644 --- a/Mage.Sets/src/mage/cards/u/UnseenWalker.java +++ b/Mage.Sets/src/mage/cards/u/UnseenWalker.java @@ -33,7 +33,7 @@ public final class UnseenWalker extends CardImpl { this.addAbility(new ForestwalkAbility()); // {1}{G}{G}: 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<>("{1}{G}{G}")); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/u/UnspeakableSymbol.java b/Mage.Sets/src/mage/cards/u/UnspeakableSymbol.java index f175de4c3c4..6dadd095263 100644 --- a/Mage.Sets/src/mage/cards/u/UnspeakableSymbol.java +++ b/Mage.Sets/src/mage/cards/u/UnspeakableSymbol.java @@ -24,7 +24,7 @@ public final class UnspeakableSymbol extends CardImpl { // Pay 3 life: Put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new PayLifeCost(3)); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new PayLifeCost(3)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/u/UnstableFrontier.java b/Mage.Sets/src/mage/cards/u/UnstableFrontier.java index 2dd2a3222e0..5b8f73d4bd8 100644 --- a/Mage.Sets/src/mage/cards/u/UnstableFrontier.java +++ b/Mage.Sets/src/mage/cards/u/UnstableFrontier.java @@ -28,7 +28,7 @@ public final class UnstableFrontier extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {tap}: Target land you control becomes the basic land type of your choice until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesBasicLandTargetEffect(Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BecomesBasicLandTargetEffect(Duration.EndOfTurn), new TapSourceCost()); Target target = new TargetControlledPermanent(new FilterControlledLandPermanent()); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/u/UnstableObelisk.java b/Mage.Sets/src/mage/cards/u/UnstableObelisk.java index fd8a017713d..6fb4cfb29ad 100644 --- a/Mage.Sets/src/mage/cards/u/UnstableObelisk.java +++ b/Mage.Sets/src/mage/cards/u/UnstableObelisk.java @@ -28,7 +28,7 @@ public final class UnstableObelisk extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {7}, {tap}, Sacrifice Unstable Obelisk: Destroy target permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new GenericManaCost(7)); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new GenericManaCost(7)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent()); diff --git a/Mage.Sets/src/mage/cards/u/UnworthyDead.java b/Mage.Sets/src/mage/cards/u/UnworthyDead.java index 1227d9fd533..c0ee6eeb311 100644 --- a/Mage.Sets/src/mage/cards/u/UnworthyDead.java +++ b/Mage.Sets/src/mage/cards/u/UnworthyDead.java @@ -26,7 +26,7 @@ public final class UnworthyDead extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private UnworthyDead(final UnworthyDead card) { diff --git a/Mage.Sets/src/mage/cards/u/UnyaroBees.java b/Mage.Sets/src/mage/cards/u/UnyaroBees.java index 8c982c0510a..8c25bfb5aba 100644 --- a/Mage.Sets/src/mage/cards/u/UnyaroBees.java +++ b/Mage.Sets/src/mage/cards/u/UnyaroBees.java @@ -33,9 +33,9 @@ public final class UnyaroBees extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {G}: Unyaro Bees gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); // {3}{G}, Sacrifice Unyaro Bees: Unyaro Bees deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2, "it"), new ManaCostsImpl<>("{3}{G}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2, "it"), new ManaCostsImpl<>("{3}{G}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/u/UnyieldingKrumar.java b/Mage.Sets/src/mage/cards/u/UnyieldingKrumar.java index d77ad4bc2a0..fdbe4106bb7 100644 --- a/Mage.Sets/src/mage/cards/u/UnyieldingKrumar.java +++ b/Mage.Sets/src/mage/cards/u/UnyieldingKrumar.java @@ -29,7 +29,7 @@ public final class UnyieldingKrumar extends CardImpl { this.toughness = new MageInt(3); // {1}{W}: Unyielding Krumar gains first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/u/Urborg.java b/Mage.Sets/src/mage/cards/u/Urborg.java index 7459479f952..4a8f51ea799 100644 --- a/Mage.Sets/src/mage/cards/u/Urborg.java +++ b/Mage.Sets/src/mage/cards/u/Urborg.java @@ -37,7 +37,7 @@ public final class Urborg extends CardImpl { this.addAbility(new BlackManaAbility()); // {tap}: Target creature loses first strike or swampwalk until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UrborgEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new UrborgEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/u/UrborgPhantom.java b/Mage.Sets/src/mage/cards/u/UrborgPhantom.java index 2bde44a8923..931ec60689d 100644 --- a/Mage.Sets/src/mage/cards/u/UrborgPhantom.java +++ b/Mage.Sets/src/mage/cards/u/UrborgPhantom.java @@ -35,7 +35,7 @@ public final class UrborgPhantom extends CardImpl { // {U}: Prevent all combat damage that would be dealt to and dealt by Urborg Phantom this turn. Effect effect = new PreventCombatDamageToSourceEffect(Duration.EndOfTurn); effect.setText("Prevent all combat damage that would be dealt to"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{U}")); effect = new PreventCombatDamageBySourceEffect(Duration.EndOfTurn); effect.setText("and dealt by {this} this turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/u/UrborgSkeleton.java b/Mage.Sets/src/mage/cards/u/UrborgSkeleton.java index 26ee065b0a1..30db898d500 100644 --- a/Mage.Sets/src/mage/cards/u/UrborgSkeleton.java +++ b/Mage.Sets/src/mage/cards/u/UrborgSkeleton.java @@ -37,7 +37,7 @@ public final class UrborgSkeleton extends CardImpl { this.addAbility(new KickerAbility("{3}")); // {B}: Regenerate Urborg Skeleton. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); // If Urborg Skeleton was kicked, it enters with a +1/+1 counter on it. Ability ability = new EntersBattlefieldAbility( diff --git a/Mage.Sets/src/mage/cards/u/UrborgSyphonMage.java b/Mage.Sets/src/mage/cards/u/UrborgSyphonMage.java index 44b8ff38335..fa8f363633b 100644 --- a/Mage.Sets/src/mage/cards/u/UrborgSyphonMage.java +++ b/Mage.Sets/src/mage/cards/u/UrborgSyphonMage.java @@ -33,7 +33,7 @@ public final class UrborgSyphonMage extends CardImpl { this.toughness = new MageInt(2); // {2}{B}, {tap}, Discard a card: Each other player loses 2 life. You gain life equal to the life lost this way. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UrborgSyphonMageEffect(), new ManaCostsImpl<>("{2}{B}")); + Ability ability = new SimpleActivatedAbility(new UrborgSyphonMageEffect(), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/u/Ursapine.java b/Mage.Sets/src/mage/cards/u/Ursapine.java index 653c02ad202..9e5b1b5e935 100644 --- a/Mage.Sets/src/mage/cards/u/Ursapine.java +++ b/Mage.Sets/src/mage/cards/u/Ursapine.java @@ -26,7 +26,7 @@ public final class Ursapine extends CardImpl { this.toughness = new MageInt(3); // {G}: Target creature gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.G)); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.G)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/u/UrsineFylgja.java b/Mage.Sets/src/mage/cards/u/UrsineFylgja.java index 5af1256df3b..d7d8a169cef 100644 --- a/Mage.Sets/src/mage/cards/u/UrsineFylgja.java +++ b/Mage.Sets/src/mage/cards/u/UrsineFylgja.java @@ -36,10 +36,10 @@ public final class UrsineFylgja extends CardImpl { effect.setText("with four healing counters on it."); this.addAbility(new EntersBattlefieldAbility(effect)); // Remove a healing counter from Ursine Fylgja: Prevent the next 1 damage that would be dealt to Ursine Fylgja this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToSourceEffect(Duration.EndOfTurn, 1), + this.addAbility(new SimpleActivatedAbility(new PreventDamageToSourceEffect(Duration.EndOfTurn, 1), new RemoveCountersSourceCost(CounterType.HEALING.createInstance(1)))); // {2}{W}: Put a healing counter on Ursine Fylgja. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.HEALING.createInstance(1)), + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.HEALING.createInstance(1)), new ManaCostsImpl<>("{2}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/u/UrzasBauble.java b/Mage.Sets/src/mage/cards/u/UrzasBauble.java index e7d9f10a160..e4b8794c12b 100644 --- a/Mage.Sets/src/mage/cards/u/UrzasBauble.java +++ b/Mage.Sets/src/mage/cards/u/UrzasBauble.java @@ -32,7 +32,7 @@ public final class UrzasBauble extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{0}"); // {tap}, Sacrifice Urza's Bauble: Look at a card at random in target player's hand. You draw a card at the beginning of the next turn's upkeep. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LookAtRandomCardEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new LookAtRandomCardEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPlayer()); ability.addEffect(new CreateDelayedTriggeredAbilityEffect(new AtTheBeginOfNextUpkeepDelayedTriggeredAbility(new DrawCardSourceControllerEffect(1, true)), false)); diff --git a/Mage.Sets/src/mage/cards/u/UrzasBlueprints.java b/Mage.Sets/src/mage/cards/u/UrzasBlueprints.java index cdc125a5f33..91867955067 100644 --- a/Mage.Sets/src/mage/cards/u/UrzasBlueprints.java +++ b/Mage.Sets/src/mage/cards/u/UrzasBlueprints.java @@ -23,7 +23,7 @@ public final class UrzasBlueprints extends CardImpl { // Echo {6} this.addAbility(new EchoAbility("{6}")); // {tap}: Draw a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new TapSourceCost())); } private UrzasBlueprints(final UrzasBlueprints card) { diff --git a/Mage.Sets/src/mage/cards/u/UrzasEngine.java b/Mage.Sets/src/mage/cards/u/UrzasEngine.java index 20d4a6a7f39..96097948d54 100644 --- a/Mage.Sets/src/mage/cards/u/UrzasEngine.java +++ b/Mage.Sets/src/mage/cards/u/UrzasEngine.java @@ -37,10 +37,10 @@ public final class UrzasEngine extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // {3}: Urza's Engine gains banding until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(BandingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{3}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(BandingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{3}"))); // {3}: Attacking creatures banded with Urza's Engine gain trample until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UrzasEngineEffect(), new ManaCostsImpl<>("{3}"))); + this.addAbility(new SimpleActivatedAbility(new UrzasEngineEffect(), new ManaCostsImpl<>("{3}"))); } private UrzasEngine(final UrzasEngine card) { diff --git a/Mage.Sets/src/mage/cards/u/UrzasFactory.java b/Mage.Sets/src/mage/cards/u/UrzasFactory.java index a38b31e0061..370e2e86cb3 100644 --- a/Mage.Sets/src/mage/cards/u/UrzasFactory.java +++ b/Mage.Sets/src/mage/cards/u/UrzasFactory.java @@ -29,7 +29,7 @@ public final class UrzasFactory extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {7}, {T}: Create a 2/2 colorless Assembly-Worker artifact creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new AssemblyWorkerToken()), new GenericManaCost(7)); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new AssemblyWorkerToken()), new GenericManaCost(7)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/u/UrzasHotTub.java b/Mage.Sets/src/mage/cards/u/UrzasHotTub.java index ace688a9b7b..da5ec312e65 100644 --- a/Mage.Sets/src/mage/cards/u/UrzasHotTub.java +++ b/Mage.Sets/src/mage/cards/u/UrzasHotTub.java @@ -31,7 +31,7 @@ public class UrzasHotTub extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {2}, Discard a card: Search your library for a card that shares a complete word in its name with the discarded card, reveal it, put it into your hand, then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UrzasHotTubEffect(), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new UrzasHotTubEffect(), new ManaCostsImpl<>("{2}")); ability.addCost(new DiscardTargetCost(new TargetCardInHand())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/u/UrzasScienceFairProject.java b/Mage.Sets/src/mage/cards/u/UrzasScienceFairProject.java index 4330e4ae7d8..4dfa6e792d3 100644 --- a/Mage.Sets/src/mage/cards/u/UrzasScienceFairProject.java +++ b/Mage.Sets/src/mage/cards/u/UrzasScienceFairProject.java @@ -34,7 +34,7 @@ public final class UrzasScienceFairProject extends CardImpl { this.toughness = new MageInt(4); // {2}: Roll a six-sided die. Urza's Science Fair Project gets the indicated result. 1 - It gets -2/-2 until end of turn. 2 - Prevent all combat damage it would deal this turn. 3 - It gains vigilance until end of turn. 4 - It gains first strike until end of turn. 5 - It gains flying until end of turn. 6 - It gets +2/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UrzasScienceFairProjectEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new UrzasScienceFairProjectEffect(), new GenericManaCost(2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/u/UrzasTome.java b/Mage.Sets/src/mage/cards/u/UrzasTome.java index 2db1cb65d88..7d33e6178d9 100644 --- a/Mage.Sets/src/mage/cards/u/UrzasTome.java +++ b/Mage.Sets/src/mage/cards/u/UrzasTome.java @@ -29,7 +29,7 @@ public final class UrzasTome extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {3}, {T}: Draw a card. Then discard a card unless you exile a historic card from your graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UrzasTomeEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new UrzasTomeEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/u/UthdenTroll.java b/Mage.Sets/src/mage/cards/u/UthdenTroll.java index 06c7f36bae4..0569c89de0a 100644 --- a/Mage.Sets/src/mage/cards/u/UthdenTroll.java +++ b/Mage.Sets/src/mage/cards/u/UthdenTroll.java @@ -26,7 +26,7 @@ public final class UthdenTroll extends CardImpl { this.toughness = new MageInt(2); // {R}: Regenerate Uthden Troll. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{R}"))); } private UthdenTroll(final UthdenTroll card) { diff --git a/Mage.Sets/src/mage/cards/u/UtopiaMycon.java b/Mage.Sets/src/mage/cards/u/UtopiaMycon.java index 94ae2f47ae1..c35e332fa4e 100644 --- a/Mage.Sets/src/mage/cards/u/UtopiaMycon.java +++ b/Mage.Sets/src/mage/cards/u/UtopiaMycon.java @@ -38,7 +38,7 @@ public final class UtopiaMycon extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()))); // Remove three spore counters from Utopia Mycon: Create a 1/1 green Saproling creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); // Sacrifice a Saproling: Add one mana of any color. Ability ability = new AnyColorManaAbility(new SacrificeTargetCost(filter), diff --git a/Mage.Sets/src/mage/cards/u/UyoSilentProphet.java b/Mage.Sets/src/mage/cards/u/UyoSilentProphet.java index ef1a1739650..879f1c5bd15 100644 --- a/Mage.Sets/src/mage/cards/u/UyoSilentProphet.java +++ b/Mage.Sets/src/mage/cards/u/UyoSilentProphet.java @@ -38,7 +38,7 @@ public final class UyoSilentProphet extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {2}, Return two lands you control to their owner's hand: Copy target instant or sorcery spell. You may choose new targets for the copy. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CopyTargetStackObjectEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new CopyTargetStackObjectEffect(), new GenericManaCost(2)); ability.addCost(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(2, 2, new FilterControlledLandPermanent("lands"), false))); ability.addTarget(new TargetSpell(StaticFilters.FILTER_SPELL_INSTANT_OR_SORCERY)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VaevictisAsmadi.java b/Mage.Sets/src/mage/cards/v/VaevictisAsmadi.java index 7e6ffc4be74..fa257c2478b 100644 --- a/Mage.Sets/src/mage/cards/v/VaevictisAsmadi.java +++ b/Mage.Sets/src/mage/cards/v/VaevictisAsmadi.java @@ -32,11 +32,11 @@ public final class VaevictisAsmadi extends CardImpl { // At the beginning of your upkeep, sacrifice Vaevictis Asmadi unless you pay {B}{R}{G}. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{B}{R}{G}")))); // {B}: Vaevictis Asmadi gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); // {R}: Vaevictis Asmadi gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); // {G}: Vaevictis Asmadi gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); } private VaevictisAsmadi(final VaevictisAsmadi card) { diff --git a/Mage.Sets/src/mage/cards/v/ValakutInvoker.java b/Mage.Sets/src/mage/cards/v/ValakutInvoker.java index f2eaa238878..93c1e3844fb 100644 --- a/Mage.Sets/src/mage/cards/v/ValakutInvoker.java +++ b/Mage.Sets/src/mage/cards/v/ValakutInvoker.java @@ -28,7 +28,7 @@ public final class ValakutInvoker extends CardImpl { this.toughness = new MageInt(3); // {8}: Valakut Invoker deals 3 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new GenericManaCost(8)); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(3), new GenericManaCost(8)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/ValkiGodOfLies.java b/Mage.Sets/src/mage/cards/v/ValkiGodOfLies.java index 35ad5c79eed..421af9c0888 100644 --- a/Mage.Sets/src/mage/cards/v/ValkiGodOfLies.java +++ b/Mage.Sets/src/mage/cards/v/ValkiGodOfLies.java @@ -60,7 +60,7 @@ public final class ValkiGodOfLies extends ModalDoubleFacedCard { this.getLeftHalfCard().addAbility(new EntersBattlefieldTriggeredAbility(new ValkiGodOfLiesRevealExileEffect())); // X: Choose a creature card exiled with Valki with converted mana cost X. Valki becomes a copy of that card. - this.getLeftHalfCard().addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ValkiGodOfLiesCopyExiledEffect(), new ManaCostsImpl<>("{X}"))); + this.getLeftHalfCard().addAbility(new SimpleActivatedAbility(new ValkiGodOfLiesCopyExiledEffect(), new ManaCostsImpl<>("{X}"))); // 2. // Tibalt, Cosmic Impostor diff --git a/Mage.Sets/src/mage/cards/v/Valleymaker.java b/Mage.Sets/src/mage/cards/v/Valleymaker.java index e3a84c3fe5d..a10e061391d 100644 --- a/Mage.Sets/src/mage/cards/v/Valleymaker.java +++ b/Mage.Sets/src/mage/cards/v/Valleymaker.java @@ -42,7 +42,7 @@ public final class Valleymaker extends CardImpl { this.toughness = new MageInt(5); // {tap}, Sacrifice a Mountain: Valleymaker deals 3 damage to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(3), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VampireWarlord.java b/Mage.Sets/src/mage/cards/v/VampireWarlord.java index c31ef893e83..8980402b7e3 100644 --- a/Mage.Sets/src/mage/cards/v/VampireWarlord.java +++ b/Mage.Sets/src/mage/cards/v/VampireWarlord.java @@ -29,7 +29,7 @@ public final class VampireWarlord extends CardImpl { this.toughness = new MageInt(2); // Sacrifice another creature: Regenerate Vampire Warlord. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE))); } diff --git a/Mage.Sets/src/mage/cards/v/VampiricDragon.java b/Mage.Sets/src/mage/cards/v/VampiricDragon.java index da334507dcf..54d47551015 100644 --- a/Mage.Sets/src/mage/cards/v/VampiricDragon.java +++ b/Mage.Sets/src/mage/cards/v/VampiricDragon.java @@ -39,7 +39,7 @@ public final class VampiricDragon extends CardImpl { this.addAbility(new DealtDamageAndDiedTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false)); // {1}{R}: Vampiric Dragon deals 1 damage to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{1}{R}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VampiricRites.java b/Mage.Sets/src/mage/cards/v/VampiricRites.java index d169eb08e3b..009f77e0b1d 100644 --- a/Mage.Sets/src/mage/cards/v/VampiricRites.java +++ b/Mage.Sets/src/mage/cards/v/VampiricRites.java @@ -26,7 +26,7 @@ public final class VampiricRites extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{B}"); // {1}{B}, Sacrifice a creature: You gain 1 life and draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(1), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); Effect effect = new DrawCardSourceControllerEffect(1); effect.setText("and draw a card"); diff --git a/Mage.Sets/src/mage/cards/v/Vanishing.java b/Mage.Sets/src/mage/cards/v/Vanishing.java index eb6866c3d45..469f843275d 100644 --- a/Mage.Sets/src/mage/cards/v/Vanishing.java +++ b/Mage.Sets/src/mage/cards/v/Vanishing.java @@ -35,7 +35,7 @@ public final class Vanishing extends CardImpl { this.addAbility(ability); // {U}{U}: Enchanted creature phases out. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PhaseOutAttachedEffect(), new ManaCostsImpl<>("{U}{U}"))); + this.addAbility(new SimpleActivatedAbility(new PhaseOutAttachedEffect(), new ManaCostsImpl<>("{U}{U}"))); } private Vanishing(final Vanishing card) { diff --git a/Mage.Sets/src/mage/cards/v/VarchildsCrusader.java b/Mage.Sets/src/mage/cards/v/VarchildsCrusader.java index d1f95afc6a2..42aac7eb1bc 100644 --- a/Mage.Sets/src/mage/cards/v/VarchildsCrusader.java +++ b/Mage.Sets/src/mage/cards/v/VarchildsCrusader.java @@ -39,7 +39,7 @@ public final class VarchildsCrusader extends CardImpl { this.toughness = new MageInt(2); // {0}: Varchild's Crusader can't be blocked this turn except by Walls. Sacrifice Varchild's Crusader at the beginning of the next end step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedByCreaturesSourceEffect(filter, Duration.EndOfTurn), new GenericManaCost(0)); + Ability ability = new SimpleActivatedAbility(new CantBeBlockedByCreaturesSourceEffect(filter, Duration.EndOfTurn), new GenericManaCost(0)); ability.addEffect(new CreateDelayedTriggeredAbilityEffect(new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new SacrificeSourceEffect()))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VarolzTheScarStriped.java b/Mage.Sets/src/mage/cards/v/VarolzTheScarStriped.java index 3e69d2901b9..12b6746df0d 100644 --- a/Mage.Sets/src/mage/cards/v/VarolzTheScarStriped.java +++ b/Mage.Sets/src/mage/cards/v/VarolzTheScarStriped.java @@ -34,7 +34,7 @@ public final class VarolzTheScarStriped extends CardImpl { )); // Sacrifice another creature: Regenerate Varolz, the Scar-Striped. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE))); } diff --git a/Mage.Sets/src/mage/cards/v/VassalsDuty.java b/Mage.Sets/src/mage/cards/v/VassalsDuty.java index a29ee49f2da..f1844c0b0a5 100644 --- a/Mage.Sets/src/mage/cards/v/VassalsDuty.java +++ b/Mage.Sets/src/mage/cards/v/VassalsDuty.java @@ -34,7 +34,7 @@ public final class VassalsDuty extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); // {1}: The next 1 damage that would be dealt to target legendary creature you control this turn is dealt to you instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VassalsDutyPreventDamageTargetEffect(Duration.EndOfTurn, 1), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new VassalsDutyPreventDamageTargetEffect(Duration.EndOfTurn, 1), new GenericManaCost(1)); ability.addTarget(new TargetControlledCreaturePermanent(1, 1, filter, false)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VastwoodAnimist.java b/Mage.Sets/src/mage/cards/v/VastwoodAnimist.java index 2d22a1a8a19..a38f6bf045b 100644 --- a/Mage.Sets/src/mage/cards/v/VastwoodAnimist.java +++ b/Mage.Sets/src/mage/cards/v/VastwoodAnimist.java @@ -35,7 +35,7 @@ public final class VastwoodAnimist extends CardImpl { this.toughness = new MageInt(1); // {tap}: Target land you control becomes an X/X Elemental creature until end of turn, where X is the number of Allies you control. It's still a land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VastwoodAnimistEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new VastwoodAnimistEffect(), new TapSourceCost()); ability.addTarget(new TargetControlledPermanent(new FilterControlledLandPermanent())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VectisDominator.java b/Mage.Sets/src/mage/cards/v/VectisDominator.java index f4121d2c494..07642dfcd14 100644 --- a/Mage.Sets/src/mage/cards/v/VectisDominator.java +++ b/Mage.Sets/src/mage/cards/v/VectisDominator.java @@ -35,7 +35,7 @@ public final class VectisDominator extends CardImpl { this.toughness = new MageInt(2); // {T}: Tap target creature unless its controller pays 2 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VectisDominatorEffect(new PayLifeCost(2)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new VectisDominatorEffect(new PayLifeCost(2)), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VectisSilencers.java b/Mage.Sets/src/mage/cards/v/VectisSilencers.java index 9367db36753..2b840001a5f 100644 --- a/Mage.Sets/src/mage/cards/v/VectisSilencers.java +++ b/Mage.Sets/src/mage/cards/v/VectisSilencers.java @@ -28,7 +28,7 @@ public final class VectisSilencers extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}"))); } private VectisSilencers(final VectisSilencers card) { diff --git a/Mage.Sets/src/mage/cards/v/VectorAsp.java b/Mage.Sets/src/mage/cards/v/VectorAsp.java index 7c36da1b53f..595f365cd21 100644 --- a/Mage.Sets/src/mage/cards/v/VectorAsp.java +++ b/Mage.Sets/src/mage/cards/v/VectorAsp.java @@ -27,7 +27,7 @@ public final class VectorAsp extends CardImpl { this.subtype.add(SubType.SNAKE); this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(InfectAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(InfectAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); } private VectorAsp(final VectorAsp card) { diff --git a/Mage.Sets/src/mage/cards/v/VedalkenAnatomist.java b/Mage.Sets/src/mage/cards/v/VedalkenAnatomist.java index e216ee649e1..379c02b7475 100644 --- a/Mage.Sets/src/mage/cards/v/VedalkenAnatomist.java +++ b/Mage.Sets/src/mage/cards/v/VedalkenAnatomist.java @@ -32,7 +32,7 @@ public final class VedalkenAnatomist extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new ManaCostsImpl<>("{2}{U}")); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new ManaCostsImpl<>("{2}{U}")); ability.addEffect(new MayTapOrUntapTargetEffect().setText("You may tap or untap that creature")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/v/VedalkenEntrancer.java b/Mage.Sets/src/mage/cards/v/VedalkenEntrancer.java index 6291ad42e55..f1f5ff2f419 100644 --- a/Mage.Sets/src/mage/cards/v/VedalkenEntrancer.java +++ b/Mage.Sets/src/mage/cards/v/VedalkenEntrancer.java @@ -31,7 +31,7 @@ public final class VedalkenEntrancer extends CardImpl { this.toughness = new MageInt(4); // {U}, {tap}: Target player puts the top two cards of their library into their graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(2), new ColoredManaCost(ColoredManaSymbol.U)); + Ability ability = new SimpleActivatedAbility(new MillCardsTargetEffect(2), new ColoredManaCost(ColoredManaSymbol.U)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VedalkenMastermind.java b/Mage.Sets/src/mage/cards/v/VedalkenMastermind.java index 4bac37fe771..27a91847ae4 100644 --- a/Mage.Sets/src/mage/cards/v/VedalkenMastermind.java +++ b/Mage.Sets/src/mage/cards/v/VedalkenMastermind.java @@ -30,7 +30,7 @@ public final class VedalkenMastermind extends CardImpl { this.toughness = new MageInt(2); // {U}{Tap}: Return target permanent you control to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ColoredManaCost(ColoredManaSymbol.U)); + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new ColoredManaCost(ColoredManaSymbol.U)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VedalkenShackles.java b/Mage.Sets/src/mage/cards/v/VedalkenShackles.java index 8e895739159..7bf323c778e 100644 --- a/Mage.Sets/src/mage/cards/v/VedalkenShackles.java +++ b/Mage.Sets/src/mage/cards/v/VedalkenShackles.java @@ -46,7 +46,7 @@ public final class VedalkenShackles extends CardImpl { ConditionalContinuousEffect effect = new ConditionalContinuousEffect( new GainControlTargetEffect(Duration.Custom), SourceTappedCondition.TAPPED, "Gain control of target creature with power less than or equal to the number of Islands you control for as long as {this} remains tapped"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(effect, new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(controllableCreatures)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VeinDrinker.java b/Mage.Sets/src/mage/cards/v/VeinDrinker.java index 199c85b56fe..492664dfaa7 100644 --- a/Mage.Sets/src/mage/cards/v/VeinDrinker.java +++ b/Mage.Sets/src/mage/cards/v/VeinDrinker.java @@ -35,7 +35,7 @@ public final class VeinDrinker extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {R}, {tap}: Vein Drinker deals damage equal to its power to target creature. That creature deals damage equal to its power to Vein Drinker. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEachOtherEffect(), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new DamageEachOtherEffect(), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VeldraneOfSengir.java b/Mage.Sets/src/mage/cards/v/VeldraneOfSengir.java index 9b0ea188755..4c6ebd7d62d 100644 --- a/Mage.Sets/src/mage/cards/v/VeldraneOfSengir.java +++ b/Mage.Sets/src/mage/cards/v/VeldraneOfSengir.java @@ -32,7 +32,7 @@ public final class VeldraneOfSengir extends CardImpl { this.toughness = new MageInt(5); // {1}{B}{B}: Veldrane of Sengir gets -3/-0 and gains forestwalk until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-3, -0, Duration.EndOfTurn).setText("{this} gets -3/-0"), new ManaCostsImpl<>("{1}{B}{B}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(-3, -0, Duration.EndOfTurn).setText("{this} gets -3/-0"), new ManaCostsImpl<>("{1}{B}{B}")); ability.addEffect(new GainAbilitySourceEffect(new ForestwalkAbility(false), Duration.EndOfTurn).setText("and gains forestwalk until end of turn")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VengefulArchon.java b/Mage.Sets/src/mage/cards/v/VengefulArchon.java index 8a3e37a158f..9a63498ce56 100644 --- a/Mage.Sets/src/mage/cards/v/VengefulArchon.java +++ b/Mage.Sets/src/mage/cards/v/VengefulArchon.java @@ -37,7 +37,7 @@ public final class VengefulArchon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {X}: Prevent the next X damage that would be dealt to you this turn. If damage is prevented this way, Vengeful Archon deals that much damage to target player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VengefulArchonEffect(), new ManaCostsImpl<>("{X}")); + Ability ability = new SimpleActivatedAbility(new VengefulArchonEffect(), new ManaCostsImpl<>("{X}")); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VengefulFirebrand.java b/Mage.Sets/src/mage/cards/v/VengefulFirebrand.java index f74f2655681..9696356b15f 100644 --- a/Mage.Sets/src/mage/cards/v/VengefulFirebrand.java +++ b/Mage.Sets/src/mage/cards/v/VengefulFirebrand.java @@ -42,7 +42,7 @@ public final class VengefulFirebrand extends CardImpl { "{this} has haste as long as a Warrior card is in your graveyard"))); // {R}: Vengeful Firebrand gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private VengefulFirebrand(final VengefulFirebrand card) { diff --git a/Mage.Sets/src/mage/cards/v/VenomspoutBrackus.java b/Mage.Sets/src/mage/cards/v/VenomspoutBrackus.java index 4d9d81ba768..8c42d93e58b 100644 --- a/Mage.Sets/src/mage/cards/v/VenomspoutBrackus.java +++ b/Mage.Sets/src/mage/cards/v/VenomspoutBrackus.java @@ -40,7 +40,7 @@ public final class VenomspoutBrackus extends CardImpl { this.toughness = new MageInt(5); // {1}{G}, {tap}: Venomspout Brackus deals 5 damage to target attacking or blocking creature with flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(5), new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(5), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VentSentinel.java b/Mage.Sets/src/mage/cards/v/VentSentinel.java index e37f6240c6a..6abe43e57d8 100644 --- a/Mage.Sets/src/mage/cards/v/VentSentinel.java +++ b/Mage.Sets/src/mage/cards/v/VentSentinel.java @@ -38,7 +38,7 @@ public final class VentSentinel extends CardImpl { this.toughness = new MageInt(4); this.addAbility(DefenderAbility.getInstance()); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)), new ManaCostsImpl<>("{1}{R}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VerdantAutomaton.java b/Mage.Sets/src/mage/cards/v/VerdantAutomaton.java index 1e2fea4d353..65a4c0becb3 100644 --- a/Mage.Sets/src/mage/cards/v/VerdantAutomaton.java +++ b/Mage.Sets/src/mage/cards/v/VerdantAutomaton.java @@ -27,7 +27,7 @@ public final class VerdantAutomaton extends CardImpl { this.toughness = new MageInt(2); // {3}{G}: Put a +1/+1 counter on Verdant Automaton. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new ManaCostsImpl<>("{3}{G}"))); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new ManaCostsImpl<>("{3}{G}"))); } private VerdantAutomaton(final VerdantAutomaton card) { diff --git a/Mage.Sets/src/mage/cards/v/VerdantField.java b/Mage.Sets/src/mage/cards/v/VerdantField.java index 44c77f795c9..d047ff26882 100644 --- a/Mage.Sets/src/mage/cards/v/VerdantField.java +++ b/Mage.Sets/src/mage/cards/v/VerdantField.java @@ -36,7 +36,7 @@ public final class VerdantField extends CardImpl { this.addAbility(ability); // Enchanted land has "{T}: Target creature gets +1/+1 until end of turn." - Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new TapSourceCost()); + Ability gainAbility = new SimpleActivatedAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), new TapSourceCost()); gainAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{T}: Target creature gets +1/+1 until end of turn.\""))); diff --git a/Mage.Sets/src/mage/cards/v/VesselOfEphemera.java b/Mage.Sets/src/mage/cards/v/VesselOfEphemera.java index de4fa245f94..9ef89c69fbd 100644 --- a/Mage.Sets/src/mage/cards/v/VesselOfEphemera.java +++ b/Mage.Sets/src/mage/cards/v/VesselOfEphemera.java @@ -26,7 +26,7 @@ public final class VesselOfEphemera extends CardImpl { // {2}{W}, Sacrifice Vessel of Ephemera: Create two 1/1 white Spirit creature tokens with flying. Effect effect = new CreateTokenEffect(new SpiritWhiteToken(), 2); effect.setText("Create two 1/1 white Spirit creature tokens with flying"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}{W}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}{W}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VesselOfParamnesia.java b/Mage.Sets/src/mage/cards/v/VesselOfParamnesia.java index 805679d76e2..89d06a25260 100644 --- a/Mage.Sets/src/mage/cards/v/VesselOfParamnesia.java +++ b/Mage.Sets/src/mage/cards/v/VesselOfParamnesia.java @@ -24,7 +24,7 @@ public final class VesselOfParamnesia extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{U}"); // {U}, Sacrifice Vessel of Paramnesia: Target player puts the top three cards of their library into their graveyard. Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(3), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new MillCardsTargetEffect(3), new ManaCostsImpl<>("{U}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPlayer()); ability.addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/cards/v/VeteranCathar.java b/Mage.Sets/src/mage/cards/v/VeteranCathar.java index 41dc7c45071..916d21e0def 100644 --- a/Mage.Sets/src/mage/cards/v/VeteranCathar.java +++ b/Mage.Sets/src/mage/cards/v/VeteranCathar.java @@ -31,7 +31,7 @@ public final class VeteranCathar extends CardImpl { this.toughness = new MageInt(2); // {3}{W}: Target Human gains double strike until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{3}{W}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{3}{W}")); ability.addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent(SubType.HUMAN, "Human"))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VeteranWarleader.java b/Mage.Sets/src/mage/cards/v/VeteranWarleader.java index 6c9822e15b7..0a37c7a8ea8 100644 --- a/Mage.Sets/src/mage/cards/v/VeteranWarleader.java +++ b/Mage.Sets/src/mage/cards/v/VeteranWarleader.java @@ -50,7 +50,7 @@ public final class VeteranWarleader extends CardImpl { .addHint(CreaturesYouControlHint.instance)); // Tap another untapped Ally you control: Veteran Warleader gains your choice of first strike, vigilance, or trample until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainsChoiceOfAbilitiesEffect(GainsChoiceOfAbilitiesEffect.TargetType.Source, + this.addAbility(new SimpleActivatedAbility(new GainsChoiceOfAbilitiesEffect(GainsChoiceOfAbilitiesEffect.TargetType.Source, FirstStrikeAbility.getInstance(), VigilanceAbility.getInstance(), TrampleAbility.getInstance()), new TapTargetCost(new TargetControlledPermanent(1, 1, filter, true)))); } diff --git a/Mage.Sets/src/mage/cards/v/VexingArcanix.java b/Mage.Sets/src/mage/cards/v/VexingArcanix.java index a46f38e7a5a..b3461253f05 100644 --- a/Mage.Sets/src/mage/cards/v/VexingArcanix.java +++ b/Mage.Sets/src/mage/cards/v/VexingArcanix.java @@ -27,7 +27,7 @@ public final class VexingArcanix extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {3}, {tap}: Target player chooses a card name, then reveals the top card of their library. If that card has the chosen name, the player puts it into their hand. Otherwise, the player puts it into their graveyard and Vexing Arcanix deals 2 damage to them. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VexingArcanixEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new VexingArcanixEffect(), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VexingBauble.java b/Mage.Sets/src/mage/cards/v/VexingBauble.java index 2e9c6f80d76..276328d321d 100644 --- a/Mage.Sets/src/mage/cards/v/VexingBauble.java +++ b/Mage.Sets/src/mage/cards/v/VexingBauble.java @@ -29,7 +29,7 @@ public final class VexingBauble extends CardImpl { new CounterTargetEffect().setText("counter that spell"))); // {1}, {T}, Sacrifice Vexing Bauble: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); @@ -45,4 +45,4 @@ public final class VexingBauble extends CardImpl { public VexingBauble copy() { return new VexingBauble(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/v/VexingShusher.java b/Mage.Sets/src/mage/cards/v/VexingShusher.java index 65fedef1e63..0bd532b95cc 100644 --- a/Mage.Sets/src/mage/cards/v/VexingShusher.java +++ b/Mage.Sets/src/mage/cards/v/VexingShusher.java @@ -38,7 +38,7 @@ public final class VexingShusher extends CardImpl { // Vexing Shusher can't be countered. this.addAbility(new CantBeCounteredSourceAbility()); // {R/G}: Target spell can't be countered. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VexingShusherCantCounterTargetEffect(), new ManaCostsImpl<>("{R/G}")); + Ability ability = new SimpleActivatedAbility(new VexingShusherCantCounterTargetEffect(), new ManaCostsImpl<>("{R/G}")); ability.addTarget(new TargetSpell()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VhatiIlDal.java b/Mage.Sets/src/mage/cards/v/VhatiIlDal.java index 51cc335f1c6..ed099a6b7e2 100644 --- a/Mage.Sets/src/mage/cards/v/VhatiIlDal.java +++ b/Mage.Sets/src/mage/cards/v/VhatiIlDal.java @@ -33,7 +33,7 @@ public final class VhatiIlDal extends CardImpl { this.toughness = new MageInt(3); // {tap}: Until end of turn, target creature has base power 1 or base toughness 1. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VhatiIlDalEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new VhatiIlDalEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VialOfDragonfire.java b/Mage.Sets/src/mage/cards/v/VialOfDragonfire.java index cd85383222d..eee96c3e7ad 100644 --- a/Mage.Sets/src/mage/cards/v/VialOfDragonfire.java +++ b/Mage.Sets/src/mage/cards/v/VialOfDragonfire.java @@ -23,7 +23,7 @@ public final class VialOfDragonfire extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {2}, {T}, Sacrifice Vial of Dragonfire: Vial of Dragonfire deals 2 damage to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2, "it"), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2, "it"), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/v/VialOfPoison.java b/Mage.Sets/src/mage/cards/v/VialOfPoison.java index 3e83916c3f9..d78e728abef 100644 --- a/Mage.Sets/src/mage/cards/v/VialOfPoison.java +++ b/Mage.Sets/src/mage/cards/v/VialOfPoison.java @@ -25,7 +25,7 @@ public final class VialOfPoison extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {1}, Sacrifice Vial of Poison: Target creature gains deathtouch until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/ViashinoFangtail.java b/Mage.Sets/src/mage/cards/v/ViashinoFangtail.java index e5c6e351add..9b9536aabcf 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoFangtail.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoFangtail.java @@ -29,7 +29,7 @@ public final class ViashinoFangtail extends CardImpl { this.toughness = new MageInt(3); // {tap}: Viashino Fangtail deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/ViashinoGrappler.java b/Mage.Sets/src/mage/cards/v/ViashinoGrappler.java index 8f7c9de754e..d16f0e19642 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoGrappler.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoGrappler.java @@ -25,7 +25,7 @@ public final class ViashinoGrappler extends CardImpl { this.toughness = new MageInt(1); // {G}: Viashino Grappler gains trample until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.G))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.G))); } private ViashinoGrappler(final ViashinoGrappler card) { diff --git a/Mage.Sets/src/mage/cards/v/ViashinoHeretic.java b/Mage.Sets/src/mage/cards/v/ViashinoHeretic.java index 4939c9e8579..bc04c348b9d 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoHeretic.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoHeretic.java @@ -32,7 +32,7 @@ public final class ViashinoHeretic extends CardImpl { this.toughness = new MageInt(3); // {1}{R}, {tap}: Destroy target artifact. Viashino Heretic deals damage to that artifact's controller equal to the artifact's converted mana cost. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ViashinoHereticEffect(), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new ViashinoHereticEffect(), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); @@ -80,4 +80,4 @@ class ViashinoHereticEffect extends OneShotEffect { } return false; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/v/ViashinoSandswimmer.java b/Mage.Sets/src/mage/cards/v/ViashinoSandswimmer.java index 597b32077d3..9d3aab3f0b9 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoSandswimmer.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoSandswimmer.java @@ -32,7 +32,7 @@ public final class ViashinoSandswimmer extends CardImpl { this.toughness = new MageInt(2); // {R}: Flip a coin. If you win the flip, return Viashino Sandswimmer to its owner's hand. If you lose the flip, sacrifice Viashino Sandswimmer. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ViashinoSandswimmerEffect(), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new ViashinoSandswimmerEffect(), new ManaCostsImpl<>("{R}"))); } private ViashinoSandswimmer(final ViashinoSandswimmer card) { diff --git a/Mage.Sets/src/mage/cards/v/ViashinoSkeleton.java b/Mage.Sets/src/mage/cards/v/ViashinoSkeleton.java index 3afef135a36..e20a5599367 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoSkeleton.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoSkeleton.java @@ -29,7 +29,7 @@ public final class ViashinoSkeleton extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new DiscardTargetCost(new TargetCardInHand())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/ViashinoSlasher.java b/Mage.Sets/src/mage/cards/v/ViashinoSlasher.java index c5d5ae3f168..8eee2d285d1 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoSlasher.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoSlasher.java @@ -25,7 +25,7 @@ public final class ViashinoSlasher extends CardImpl { this.toughness = new MageInt(2); // {R}: Viashino Slasher gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); } private ViashinoSlasher(final ViashinoSlasher card) { diff --git a/Mage.Sets/src/mage/cards/v/ViashivanDragon.java b/Mage.Sets/src/mage/cards/v/ViashivanDragon.java index 944423b7d81..c4c0939d0f2 100644 --- a/Mage.Sets/src/mage/cards/v/ViashivanDragon.java +++ b/Mage.Sets/src/mage/cards/v/ViashivanDragon.java @@ -28,9 +28,9 @@ public final class ViashivanDragon extends CardImpl { addAbility(FlyingAbility.getInstance()); //{R}: Viashivan Dragon gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); //{G}: Viashivan Dragon gets +/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.G))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.G))); } diff --git a/Mage.Sets/src/mage/cards/v/VictualSliver.java b/Mage.Sets/src/mage/cards/v/VictualSliver.java index 6c8c7860a8d..b4bf00fa188 100644 --- a/Mage.Sets/src/mage/cards/v/VictualSliver.java +++ b/Mage.Sets/src/mage/cards/v/VictualSliver.java @@ -32,7 +32,7 @@ public final class VictualSliver extends CardImpl { this.toughness = new MageInt(2); // All Slivers have "{2}, Sacrifice this permanent: You gain 4 life." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(4), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(4), new SacrificeSourceCost()); ability.addCost(new GenericManaCost(2)); this.addAbility(new SimpleStaticAbility( diff --git a/Mage.Sets/src/mage/cards/v/VigeanGraftmage.java b/Mage.Sets/src/mage/cards/v/VigeanGraftmage.java index 12f21e894fc..eeb6f55a359 100644 --- a/Mage.Sets/src/mage/cards/v/VigeanGraftmage.java +++ b/Mage.Sets/src/mage/cards/v/VigeanGraftmage.java @@ -34,7 +34,7 @@ public final class VigeanGraftmage extends CardImpl { this.addAbility(new GraftAbility(this, 2)); // {1}{U}: Untap target creature with a +1/+1 counter on it. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new ManaCostsImpl<>("{1}{U}")); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_CREATURE_P1P1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VigilantDrake.java b/Mage.Sets/src/mage/cards/v/VigilantDrake.java index 6107371449b..9f3deb75697 100644 --- a/Mage.Sets/src/mage/cards/v/VigilantDrake.java +++ b/Mage.Sets/src/mage/cards/v/VigilantDrake.java @@ -30,7 +30,7 @@ public final class VigilantDrake extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {2}{U}: Untap Vigilant Drake. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl<>("{2}{U}"))); + this.addAbility(new SimpleActivatedAbility(new UntapSourceEffect(), new ManaCostsImpl<>("{2}{U}"))); } private VigilantDrake(final VigilantDrake card) { diff --git a/Mage.Sets/src/mage/cards/v/VigilantMartyr.java b/Mage.Sets/src/mage/cards/v/VigilantMartyr.java index 101c6409f82..5a7cd604f18 100644 --- a/Mage.Sets/src/mage/cards/v/VigilantMartyr.java +++ b/Mage.Sets/src/mage/cards/v/VigilantMartyr.java @@ -42,11 +42,11 @@ public final class VigilantMartyr extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Vigilant Martyr: Regenerate target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {W}{W}, {tap}, Sacrifice Vigilant Martyr: Counter target spell that targets an enchantment. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl<>("{W}{W}")); + ability = new SimpleActivatedAbility(new CounterTargetEffect(), new ManaCostsImpl<>("{W}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetSpell(filter)); diff --git a/Mage.Sets/src/mage/cards/v/VildinPackOutcast.java b/Mage.Sets/src/mage/cards/v/VildinPackOutcast.java index 8241e79e468..f01e7c00595 100644 --- a/Mage.Sets/src/mage/cards/v/VildinPackOutcast.java +++ b/Mage.Sets/src/mage/cards/v/VildinPackOutcast.java @@ -35,11 +35,11 @@ public final class VildinPackOutcast extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // {R}: Vildin-Pack Outcast gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); // {5}{R}{R}: Transform Vildin-Pack Outcast. this.addAbility(new TransformAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(), new ManaCostsImpl<>("{5}{R}{R}"))); + this.addAbility(new SimpleActivatedAbility(new TransformSourceEffect(), new ManaCostsImpl<>("{5}{R}{R}"))); } private VildinPackOutcast(final VildinPackOutcast card) { diff --git a/Mage.Sets/src/mage/cards/v/VileRequiem.java b/Mage.Sets/src/mage/cards/v/VileRequiem.java index bc7f150e15a..3a2115f93ed 100644 --- a/Mage.Sets/src/mage/cards/v/VileRequiem.java +++ b/Mage.Sets/src/mage/cards/v/VileRequiem.java @@ -46,7 +46,7 @@ public final class VileRequiem extends CardImpl { // {1}{B}, Sacrifice Vile Requiem: Destroy up to X target nonblack creatures, where X is the number of verse counters on Vile Requiem. They can't be regenerated. Effect effect = new DestroyTargetEffect(true); effect.setText("Destroy up to X target nonblack creatures, where X is the number of verse counters on {this}. They can't be regenerated"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}{B}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(0, 0, filter, false)); ability.setTargetAdjuster(new TargetsCountAdjuster(new CountersSourceCount(CounterType.VERSE))); diff --git a/Mage.Sets/src/mage/cards/v/VillageElder.java b/Mage.Sets/src/mage/cards/v/VillageElder.java index 89b347d5cb6..98fc14ecee3 100644 --- a/Mage.Sets/src/mage/cards/v/VillageElder.java +++ b/Mage.Sets/src/mage/cards/v/VillageElder.java @@ -37,7 +37,7 @@ public final class VillageElder extends CardImpl { this.toughness = new MageInt(1); // {G}, {tap}, Sacrifice a Forest: Regenerate target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/v/VintaraElephant.java b/Mage.Sets/src/mage/cards/v/VintaraElephant.java index 87f82f76f5c..65ba8a68c32 100644 --- a/Mage.Sets/src/mage/cards/v/VintaraElephant.java +++ b/Mage.Sets/src/mage/cards/v/VintaraElephant.java @@ -31,7 +31,7 @@ public final class VintaraElephant extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // {3}: Vintara Elephant loses trample until end of turn. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseAbilitySourceEffect( + SimpleActivatedAbility ability = new SimpleActivatedAbility(new LoseAbilitySourceEffect( TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{3}")); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); diff --git a/Mage.Sets/src/mage/cards/v/ViralDrake.java b/Mage.Sets/src/mage/cards/v/ViralDrake.java index 696e286e074..a9b11468ab0 100644 --- a/Mage.Sets/src/mage/cards/v/ViralDrake.java +++ b/Mage.Sets/src/mage/cards/v/ViralDrake.java @@ -34,7 +34,7 @@ public final class ViralDrake extends CardImpl { this.addAbility(InfectAbility.getInstance()); // {3}{U}: Proliferate. (You choose any number of permanents and/or players with counters on them, then give each another counter of a kind already there.) - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ProliferateEffect(), new ManaCostsImpl<>("{3}{U}"))); + this.addAbility(new SimpleActivatedAbility(new ProliferateEffect(), new ManaCostsImpl<>("{3}{U}"))); } private ViralDrake(final ViralDrake card) { diff --git a/Mage.Sets/src/mage/cards/v/ViridianLongbow.java b/Mage.Sets/src/mage/cards/v/ViridianLongbow.java index db89c47508d..49eb83b7995 100644 --- a/Mage.Sets/src/mage/cards/v/ViridianLongbow.java +++ b/Mage.Sets/src/mage/cards/v/ViridianLongbow.java @@ -32,7 +32,7 @@ public final class ViridianLongbow extends CardImpl { // Equipped creature has "{tap}: This creature deals 1 damage to any target." Effect effect = new DamageTargetEffect(1); effect.setText("This creature deals 1 damage to any target"); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + SimpleActivatedAbility ability = new SimpleActivatedAbility(effect, new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability, AttachmentType.EQUIPMENT))); diff --git a/Mage.Sets/src/mage/cards/v/ViridianScout.java b/Mage.Sets/src/mage/cards/v/ViridianScout.java index 325731ad5b3..e42e1048ae3 100644 --- a/Mage.Sets/src/mage/cards/v/ViridianScout.java +++ b/Mage.Sets/src/mage/cards/v/ViridianScout.java @@ -38,7 +38,7 @@ public final class ViridianScout extends CardImpl { this.toughness = new MageInt(2); // {2}{G}, Sacrifice Viridian Scout: Viridian Scout deals 2 damage to target creature with flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2, "it"), new ManaCostsImpl<>("{2}{G}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2, "it"), new ManaCostsImpl<>("{2}{G}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/ViridianZealot.java b/Mage.Sets/src/mage/cards/v/ViridianZealot.java index b4d3977ecd0..38b796fea2e 100644 --- a/Mage.Sets/src/mage/cards/v/ViridianZealot.java +++ b/Mage.Sets/src/mage/cards/v/ViridianZealot.java @@ -31,7 +31,7 @@ public final class ViridianZealot extends CardImpl { this.toughness = new MageInt(1); // {1}{G}, Sacrifice Viridian Zealot: Destroy target artifact or enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VisaraTheDreadful.java b/Mage.Sets/src/mage/cards/v/VisaraTheDreadful.java index d90eb1204c5..90ec156ed80 100644 --- a/Mage.Sets/src/mage/cards/v/VisaraTheDreadful.java +++ b/Mage.Sets/src/mage/cards/v/VisaraTheDreadful.java @@ -33,7 +33,7 @@ public final class VisaraTheDreadful extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {tap}: Destroy target creature. It can't be regenerated. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(true) , new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(true) , new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VisceraSeer.java b/Mage.Sets/src/mage/cards/v/VisceraSeer.java index 0bf7ac91c53..6dff1694206 100644 --- a/Mage.Sets/src/mage/cards/v/VisceraSeer.java +++ b/Mage.Sets/src/mage/cards/v/VisceraSeer.java @@ -28,7 +28,7 @@ public final class VisceraSeer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); // Sacrifice a creature: Scry 1. (To scry 1, look at the top card of your library, then you may put that card on the bottom of your library.) - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1), + this.addAbility(new SimpleActivatedAbility(new ScryEffect(1), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE))); } diff --git a/Mage.Sets/src/mage/cards/v/VisceridArmor.java b/Mage.Sets/src/mage/cards/v/VisceridArmor.java index 32529307ee0..2ec48680c55 100644 --- a/Mage.Sets/src/mage/cards/v/VisceridArmor.java +++ b/Mage.Sets/src/mage/cards/v/VisceridArmor.java @@ -39,7 +39,7 @@ public final class VisceridArmor extends CardImpl { // Enchanted creature gets +1/+1. this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); // {1}{U}: Return Viscerid Armor to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{1}{U}"))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{1}{U}"))); } private VisceridArmor(final VisceridArmor card) { diff --git a/Mage.Sets/src/mage/cards/v/VisceridDeepwalker.java b/Mage.Sets/src/mage/cards/v/VisceridDeepwalker.java index 08bff5187bf..7c4d990e5d1 100644 --- a/Mage.Sets/src/mage/cards/v/VisceridDeepwalker.java +++ b/Mage.Sets/src/mage/cards/v/VisceridDeepwalker.java @@ -28,7 +28,7 @@ public final class VisceridDeepwalker extends CardImpl { this.toughness = new MageInt(3); // {U}: Viscerid Deepwalker gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); // Suspend 4-{U} this.addAbility(new SuspendAbility(4, new ManaCostsImpl<>("{U}"), this)); } diff --git a/Mage.Sets/src/mage/cards/v/ViscidLemures.java b/Mage.Sets/src/mage/cards/v/ViscidLemures.java index 5ea3bbe7f0b..2a4c39045dc 100644 --- a/Mage.Sets/src/mage/cards/v/ViscidLemures.java +++ b/Mage.Sets/src/mage/cards/v/ViscidLemures.java @@ -32,7 +32,7 @@ public final class ViscidLemures extends CardImpl { // {0}: Viscid Lemures gets -1/-0 and gains swampwalk until end of turn. Effect effect = new BoostSourceEffect(-1, 0, Duration.EndOfTurn); effect.setText("{this} gets -1/-0"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new GenericManaCost(0)); + Ability ability = new SimpleActivatedAbility(effect, new GenericManaCost(0)); effect = new GainAbilitySourceEffect(new SwampwalkAbility(), Duration.EndOfTurn); effect.setText("and gains swampwalk until end of turn. (It can't be blocked as long as defending player controls a Swamp.)"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/v/VitalSplicer.java b/Mage.Sets/src/mage/cards/v/VitalSplicer.java index ceded433c51..4b180c3a4e1 100644 --- a/Mage.Sets/src/mage/cards/v/VitalSplicer.java +++ b/Mage.Sets/src/mage/cards/v/VitalSplicer.java @@ -45,7 +45,7 @@ public final class VitalSplicer extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new PhyrexianGolemToken()))); // {1}: Regenerate target Golem you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new ManaCostsImpl<>("{1}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VithianStinger.java b/Mage.Sets/src/mage/cards/v/VithianStinger.java index 6b78f91dc49..62b9675858d 100644 --- a/Mage.Sets/src/mage/cards/v/VithianStinger.java +++ b/Mage.Sets/src/mage/cards/v/VithianStinger.java @@ -31,7 +31,7 @@ public final class VithianStinger extends CardImpl { this.toughness = new MageInt(1); // {tap}: Vithian Stinger deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // Unearth {1}{R} diff --git a/Mage.Sets/src/mage/cards/v/VituGhaziGuildmage.java b/Mage.Sets/src/mage/cards/v/VituGhaziGuildmage.java index dfc3c446810..5102e03e8c7 100644 --- a/Mage.Sets/src/mage/cards/v/VituGhaziGuildmage.java +++ b/Mage.Sets/src/mage/cards/v/VituGhaziGuildmage.java @@ -30,10 +30,10 @@ public final class VituGhaziGuildmage extends CardImpl { this.toughness = new MageInt(2); // {4}{G}{W}: Create a 3/3 green Centaur creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new mage.game.permanent.token.CentaurToken()), new ManaCostsImpl<>("{4}{G}{W}"))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new mage.game.permanent.token.CentaurToken()), new ManaCostsImpl<>("{4}{G}{W}"))); // {2}{G}{W}: Populate. (Create a token that's a copy of a creature token you control.) - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PopulateEffect(), new ManaCostsImpl<>("{2}{G}{W}"))); + this.addAbility(new SimpleActivatedAbility(new PopulateEffect(), new ManaCostsImpl<>("{2}{G}{W}"))); } private VituGhaziGuildmage(final VituGhaziGuildmage card) { @@ -44,4 +44,4 @@ public final class VituGhaziGuildmage extends CardImpl { public VituGhaziGuildmage copy() { return new VituGhaziGuildmage(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/v/VituGhaziTheCityTree.java b/Mage.Sets/src/mage/cards/v/VituGhaziTheCityTree.java index 614cbc6f7e9..c2851b94819 100644 --- a/Mage.Sets/src/mage/cards/v/VituGhaziTheCityTree.java +++ b/Mage.Sets/src/mage/cards/v/VituGhaziTheCityTree.java @@ -26,7 +26,7 @@ public final class VituGhaziTheCityTree extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {2}{G}{W}, {tap}: Create a 1/1 green Saproling creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl<>("{2}{G}{W}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl<>("{2}{G}{W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VizierOfTumblingSands.java b/Mage.Sets/src/mage/cards/v/VizierOfTumblingSands.java index 4511f7ac7e2..b2c1c1cd4d1 100644 --- a/Mage.Sets/src/mage/cards/v/VizierOfTumblingSands.java +++ b/Mage.Sets/src/mage/cards/v/VizierOfTumblingSands.java @@ -43,7 +43,7 @@ public final class VizierOfTumblingSands extends CardImpl { // {T}: Untap another target permanent. Effect effect = new UntapTargetEffect(); effect.setText("Untap another target permanent"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VizkopaGuildmage.java b/Mage.Sets/src/mage/cards/v/VizkopaGuildmage.java index 37bf9378ce1..4d00e8b81d7 100644 --- a/Mage.Sets/src/mage/cards/v/VizkopaGuildmage.java +++ b/Mage.Sets/src/mage/cards/v/VizkopaGuildmage.java @@ -45,12 +45,12 @@ public final class VizkopaGuildmage extends CardImpl { this.toughness = new MageInt(2); // 1{W}{B}: Target creature gains lifelink until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}{B}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}{B}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // 1{W}{B}: Whenever you gain life this turn, each opponent loses that much life. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateDelayedTriggeredAbilityEffect(new VizkopaGuildmageDelayedTriggeredAbility()), new ManaCostsImpl<>("{1}{W}{B}"))); + this.addAbility(new SimpleActivatedAbility(new CreateDelayedTriggeredAbilityEffect(new VizkopaGuildmageDelayedTriggeredAbility()), new ManaCostsImpl<>("{1}{W}{B}"))); } diff --git a/Mage.Sets/src/mage/cards/v/VodalianIllusionist.java b/Mage.Sets/src/mage/cards/v/VodalianIllusionist.java index 016662c2e7e..f1236dbf9b8 100644 --- a/Mage.Sets/src/mage/cards/v/VodalianIllusionist.java +++ b/Mage.Sets/src/mage/cards/v/VodalianIllusionist.java @@ -29,7 +29,7 @@ public final class VodalianIllusionist extends CardImpl { this.toughness = new MageInt(2); // {U}{U}, {tap}: Target creature phases out. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PhaseOutTargetEffect(), new ManaCostsImpl<>("{U}{U}")); + Ability ability = new SimpleActivatedAbility(new PhaseOutTargetEffect(), new ManaCostsImpl<>("{U}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VodalianKnights.java b/Mage.Sets/src/mage/cards/v/VodalianKnights.java index 30d5f8b7f89..7d62a3ae2cc 100644 --- a/Mage.Sets/src/mage/cards/v/VodalianKnights.java +++ b/Mage.Sets/src/mage/cards/v/VodalianKnights.java @@ -42,7 +42,7 @@ public final class VodalianKnights extends CardImpl { new SacrificeSourceEffect())); // {U}: Vodalian Knights gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); } private VodalianKnights(final VodalianKnights card) { diff --git a/Mage.Sets/src/mage/cards/v/VodalianMage.java b/Mage.Sets/src/mage/cards/v/VodalianMage.java index 1dd0dc416de..e8fc77bb05b 100644 --- a/Mage.Sets/src/mage/cards/v/VodalianMage.java +++ b/Mage.Sets/src/mage/cards/v/VodalianMage.java @@ -29,7 +29,7 @@ public final class VodalianMage extends CardImpl { this.toughness = new MageInt(1); // {U}, {tap}: Counter target spell unless its controller pays {1}. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new ManaCostsImpl<>("{1}")), + Ability ability = new SimpleActivatedAbility(new CounterUnlessPaysEffect(new ManaCostsImpl<>("{1}")), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/cards/v/VodalianMystic.java b/Mage.Sets/src/mage/cards/v/VodalianMystic.java index 197b74accdc..957bdecd4b6 100644 --- a/Mage.Sets/src/mage/cards/v/VodalianMystic.java +++ b/Mage.Sets/src/mage/cards/v/VodalianMystic.java @@ -30,7 +30,7 @@ public final class VodalianMystic extends CardImpl { this.toughness = new MageInt(1); // {T}: Target instant or sorcery spell becomes the color of your choice. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorTargetEffect(Duration.WhileOnStack), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BecomesColorTargetEffect(Duration.WhileOnStack), new TapSourceCost()); ability.addTarget(new TargetSpell(StaticFilters.FILTER_SPELL_INSTANT_OR_SORCERY)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VodalianWarMachine.java b/Mage.Sets/src/mage/cards/v/VodalianWarMachine.java index 0e62215d50b..772bb5869c6 100644 --- a/Mage.Sets/src/mage/cards/v/VodalianWarMachine.java +++ b/Mage.Sets/src/mage/cards/v/VodalianWarMachine.java @@ -48,11 +48,11 @@ public final class VodalianWarMachine extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // Tap an untapped Merfolk you control: Vodalian War Machine can attack this turn as though it didn't have defender. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.EndOfTurn), new TapTargetCost(new TargetControlledPermanent(1, 1, filter, true))); + Ability ability = new SimpleActivatedAbility(new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.EndOfTurn), new TapTargetCost(new TargetControlledPermanent(1, 1, filter, true))); this.addAbility(ability); // Tap an untapped Merfolk you control: Vodalian War Machine gets +2/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 1, Duration.EndOfTurn), new TapTargetCost(new TargetControlledPermanent(1, 1, filter, true)))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, 1, Duration.EndOfTurn), new TapTargetCost(new TargetControlledPermanent(1, 1, filter, true)))); // When Vodalian War Machine dies, destroy all Merfolk tapped this turn to pay for its abilities. this.addAbility(new DiesSourceTriggeredAbility(new VodalianWarMachineEffect()), new VodalianWarMachineWatcher()); diff --git a/Mage.Sets/src/mage/cards/v/VoidAttendant.java b/Mage.Sets/src/mage/cards/v/VoidAttendant.java index 574c0c873be..f7da8ad7304 100644 --- a/Mage.Sets/src/mage/cards/v/VoidAttendant.java +++ b/Mage.Sets/src/mage/cards/v/VoidAttendant.java @@ -34,7 +34,7 @@ public final class VoidAttendant extends CardImpl { // {1}{G}, Put a card an opponent owns from exile into that player's graveyard: Create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}." Effect effect = new CreateTokenEffect(new EldraziScionToken()).withTextOptions(true); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}{G}")); ability.addCost(new ExileOpponentsCardFromExileToGraveyardCost(true)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VoidMaw.java b/Mage.Sets/src/mage/cards/v/VoidMaw.java index ef14d5065a5..4e35b1b689c 100644 --- a/Mage.Sets/src/mage/cards/v/VoidMaw.java +++ b/Mage.Sets/src/mage/cards/v/VoidMaw.java @@ -44,7 +44,7 @@ public final class VoidMaw extends CardImpl { this.addAbility(new SimpleStaticAbility(new VoidMawEffect())); // Put a card exiled with Void Maw into its owner's graveyard: Void Maw gets +2/+2 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new VoidMawCost())); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), new VoidMawCost())); } private VoidMaw(final VoidMaw card) { diff --git a/Mage.Sets/src/mage/cards/v/VoidStalker.java b/Mage.Sets/src/mage/cards/v/VoidStalker.java index 097af8d75f0..918ab93a5ba 100644 --- a/Mage.Sets/src/mage/cards/v/VoidStalker.java +++ b/Mage.Sets/src/mage/cards/v/VoidStalker.java @@ -34,7 +34,7 @@ public final class VoidStalker extends CardImpl { this.toughness = new MageInt(1); // {2}{U}, {tap}: Put Void Stalker and target creature on top of their owners' libraries, then those players shuffle their libraries. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VoidStalkerEffect(), new ManaCostsImpl<>("{2}{U}")); + Ability ability = new SimpleActivatedAbility(new VoidStalkerEffect(), new ManaCostsImpl<>("{2}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VoidmageProdigy.java b/Mage.Sets/src/mage/cards/v/VoidmageProdigy.java index 72fa850bba4..506b7f81aab 100644 --- a/Mage.Sets/src/mage/cards/v/VoidmageProdigy.java +++ b/Mage.Sets/src/mage/cards/v/VoidmageProdigy.java @@ -34,7 +34,7 @@ public final class VoidmageProdigy extends CardImpl { this.toughness = new MageInt(1); // {U}{U}, Sacrifice a Wizard: Counter target spell. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl<>("{U}{U}")); + Ability ability = new SimpleActivatedAbility(new CounterTargetEffect(), new ManaCostsImpl<>("{U}{U}")); ability.addCost(new SacrificeTargetCost(filter)); Target target = new TargetSpell(); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/v/VolcanicRambler.java b/Mage.Sets/src/mage/cards/v/VolcanicRambler.java index a74398b8ca7..8ebaa29d3bd 100644 --- a/Mage.Sets/src/mage/cards/v/VolcanicRambler.java +++ b/Mage.Sets/src/mage/cards/v/VolcanicRambler.java @@ -27,7 +27,7 @@ public final class VolcanicRambler extends CardImpl { this.toughness = new MageInt(4); // {2}{R}: Volcanic Rambler deals 1 damage to target player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{2}{R}")); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VolcanoImp.java b/Mage.Sets/src/mage/cards/v/VolcanoImp.java index 7e792b47d01..dff1e607da2 100644 --- a/Mage.Sets/src/mage/cards/v/VolcanoImp.java +++ b/Mage.Sets/src/mage/cards/v/VolcanoImp.java @@ -31,7 +31,7 @@ public final class VolcanoImp extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}{R}: Volcano Imp gains first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } diff --git a/Mage.Sets/src/mage/cards/v/VoldarenPariah.java b/Mage.Sets/src/mage/cards/v/VoldarenPariah.java index 120ab99bad4..a903a942286 100644 --- a/Mage.Sets/src/mage/cards/v/VoldarenPariah.java +++ b/Mage.Sets/src/mage/cards/v/VoldarenPariah.java @@ -45,7 +45,7 @@ public final class VoldarenPariah extends CardImpl { // Sacrifice three other creatures: Transform Voldaren Pariah. this.addAbility(new TransformAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(), + this.addAbility(new SimpleActivatedAbility(new TransformSourceEffect(), new SacrificeTargetCost(3, filter))); // Madness {B}{B}{B} diff --git a/Mage.Sets/src/mage/cards/v/VolrathsCurse.java b/Mage.Sets/src/mage/cards/v/VolrathsCurse.java index 0bbd5b15072..ad01f63f065 100644 --- a/Mage.Sets/src/mage/cards/v/VolrathsCurse.java +++ b/Mage.Sets/src/mage/cards/v/VolrathsCurse.java @@ -50,7 +50,7 @@ public final class VolrathsCurse extends CardImpl { this.addAbility(new VolrathsCurseSpecialAction()); // {1}{U}: Return Volrath's Curse to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{1}{U}"))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{1}{U}"))); } diff --git a/Mage.Sets/src/mage/cards/v/VolrathsLaboratory.java b/Mage.Sets/src/mage/cards/v/VolrathsLaboratory.java index 39cd0e33c26..6da21b39559 100644 --- a/Mage.Sets/src/mage/cards/v/VolrathsLaboratory.java +++ b/Mage.Sets/src/mage/cards/v/VolrathsLaboratory.java @@ -37,7 +37,7 @@ public final class VolrathsLaboratory extends CardImpl { this.addAbility(ability); // {5}, {T}: Create a 2/2 creature token of the chosen color and type. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VolrathsLaboratoryEffect(), new GenericManaCost(5)); + ability = new SimpleActivatedAbility(new VolrathsLaboratoryEffect(), new GenericManaCost(5)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VolrathsShapeshifter.java b/Mage.Sets/src/mage/cards/v/VolrathsShapeshifter.java index 3e901bc8f1e..8ff1e1ecbff 100644 --- a/Mage.Sets/src/mage/cards/v/VolrathsShapeshifter.java +++ b/Mage.Sets/src/mage/cards/v/VolrathsShapeshifter.java @@ -32,7 +32,7 @@ public final class VolrathsShapeshifter extends CardImpl { this.addAbility(new SimpleStaticAbility(new VolrathsShapeshifterEffect())); // {2}: Discard a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardControllerEffect(1), new ManaCostsImpl<>("{2}"))); + this.addAbility(new SimpleActivatedAbility(new DiscardControllerEffect(1), new ManaCostsImpl<>("{2}"))); } private VolrathsShapeshifter(final VolrathsShapeshifter card) { diff --git a/Mage.Sets/src/mage/cards/v/VolrathsStronghold.java b/Mage.Sets/src/mage/cards/v/VolrathsStronghold.java index e0463077dbf..4037e6e57d9 100644 --- a/Mage.Sets/src/mage/cards/v/VolrathsStronghold.java +++ b/Mage.Sets/src/mage/cards/v/VolrathsStronghold.java @@ -36,7 +36,7 @@ public final class VolrathsStronghold extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {1}{B}, {tap}: Put target creature card from your graveyard on top of your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new PutOnLibraryTargetEffect(true), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VoltaicConstruct.java b/Mage.Sets/src/mage/cards/v/VoltaicConstruct.java index acd27b67ed1..7d08ba87a9c 100644 --- a/Mage.Sets/src/mage/cards/v/VoltaicConstruct.java +++ b/Mage.Sets/src/mage/cards/v/VoltaicConstruct.java @@ -33,7 +33,7 @@ public final class VoltaicConstruct extends CardImpl { this.subtype.add(SubType.CONSTRUCT); this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new GenericManaCost(2)); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VoltaicKey.java b/Mage.Sets/src/mage/cards/v/VoltaicKey.java index 15a62c6cfe5..9ae488989d0 100644 --- a/Mage.Sets/src/mage/cards/v/VoltaicKey.java +++ b/Mage.Sets/src/mage/cards/v/VoltaicKey.java @@ -20,7 +20,7 @@ public final class VoltaicKey extends CardImpl { public VoltaicKey(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new TapSourceCost()); ability.addCost(new GenericManaCost(1)); ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VorelOfTheHullClade.java b/Mage.Sets/src/mage/cards/v/VorelOfTheHullClade.java index 80445a16f84..b5a77da6852 100644 --- a/Mage.Sets/src/mage/cards/v/VorelOfTheHullClade.java +++ b/Mage.Sets/src/mage/cards/v/VorelOfTheHullClade.java @@ -47,7 +47,7 @@ public final class VorelOfTheHullClade extends CardImpl { this.toughness = new MageInt(4); // {G}{U}, {tap}: For each counter on target artifact, creature, or land, put another of those counters on that permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VorelOfTheHullCladeEffect(), new ManaCostsImpl<>("{G}{U}")); + Ability ability = new SimpleActivatedAbility(new VorelOfTheHullCladeEffect(), new ManaCostsImpl<>("{G}{U}")); ability.addTarget(new TargetPermanent(filter)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VortexElemental.java b/Mage.Sets/src/mage/cards/v/VortexElemental.java index be994cc431f..c294d473455 100644 --- a/Mage.Sets/src/mage/cards/v/VortexElemental.java +++ b/Mage.Sets/src/mage/cards/v/VortexElemental.java @@ -38,10 +38,10 @@ public final class VortexElemental extends CardImpl { this.toughness = new MageInt(1); // {U}: Put Vortex Elemental and each creature blocking or blocked by it on top of their owners' libraries, then those players shuffle their libraries. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new VortexElementalEffect(), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new VortexElementalEffect(), new ManaCostsImpl<>("{U}"))); // {3}{U}{U}: Target creature blocks Vortex Elemental this turn if able. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MustBeBlockedByTargetSourceEffect(), new ManaCostsImpl<>("{3}{U}{U}")); + Ability ability = new SimpleActivatedAbility(new MustBeBlockedByTargetSourceEffect(), new ManaCostsImpl<>("{3}{U}{U}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VotaryOfTheConclave.java b/Mage.Sets/src/mage/cards/v/VotaryOfTheConclave.java index 0e12fdba678..17d44eac7a5 100644 --- a/Mage.Sets/src/mage/cards/v/VotaryOfTheConclave.java +++ b/Mage.Sets/src/mage/cards/v/VotaryOfTheConclave.java @@ -26,7 +26,7 @@ public final class VotaryOfTheConclave extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{G}"))); } private VotaryOfTheConclave(final VotaryOfTheConclave card) { diff --git a/Mage.Sets/src/mage/cards/v/VoyagingSatyr.java b/Mage.Sets/src/mage/cards/v/VoyagingSatyr.java index fc1591e665d..af52592dad4 100644 --- a/Mage.Sets/src/mage/cards/v/VoyagingSatyr.java +++ b/Mage.Sets/src/mage/cards/v/VoyagingSatyr.java @@ -29,7 +29,7 @@ public final class VoyagingSatyr extends CardImpl { this.toughness = new MageInt(2); // {T}: Untap target land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VulshokReplica.java b/Mage.Sets/src/mage/cards/v/VulshokReplica.java index 7247b9d8b0d..1a676a545f5 100644 --- a/Mage.Sets/src/mage/cards/v/VulshokReplica.java +++ b/Mage.Sets/src/mage/cards/v/VulshokReplica.java @@ -25,7 +25,7 @@ public final class VulshokReplica extends CardImpl { this.subtype.add(SubType.BERSERKER); this.power = new MageInt(3); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3, "it"), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(3, "it"), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VulshokSorcerer.java b/Mage.Sets/src/mage/cards/v/VulshokSorcerer.java index ea7bdff2de9..ca1905cd861 100644 --- a/Mage.Sets/src/mage/cards/v/VulshokSorcerer.java +++ b/Mage.Sets/src/mage/cards/v/VulshokSorcerer.java @@ -31,7 +31,7 @@ public final class VulshokSorcerer extends CardImpl { this.addAbility(HasteAbility.getInstance()); // {tap}: Vulshok Sorcerer deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); }