diff --git a/Mage.Sets/src/mage/cards/a/AdantoVanguard.java b/Mage.Sets/src/mage/cards/a/AdantoVanguard.java index 1019fccb186..82dd1288faa 100644 --- a/Mage.Sets/src/mage/cards/a/AdantoVanguard.java +++ b/Mage.Sets/src/mage/cards/a/AdantoVanguard.java @@ -41,7 +41,6 @@ public final class AdantoVanguard extends CardImpl { // Pay 4 life: Adanto Vanguard gains indestructible until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), new PayLifeCost(4) )); diff --git a/Mage.Sets/src/mage/cards/a/ArcaneEncyclopedia.java b/Mage.Sets/src/mage/cards/a/ArcaneEncyclopedia.java index f2820ce1c4d..8a0ebeb69a0 100644 --- a/Mage.Sets/src/mage/cards/a/ArcaneEncyclopedia.java +++ b/Mage.Sets/src/mage/cards/a/ArcaneEncyclopedia.java @@ -22,7 +22,6 @@ public final class ArcaneEncyclopedia extends CardImpl { // {3}, {T}: Draw a card. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(3) ); diff --git a/Mage.Sets/src/mage/cards/b/BloodBairn.java b/Mage.Sets/src/mage/cards/b/BloodBairn.java index 46d04541c03..aa49e36e65e 100644 --- a/Mage.Sets/src/mage/cards/b/BloodBairn.java +++ b/Mage.Sets/src/mage/cards/b/BloodBairn.java @@ -30,7 +30,6 @@ public final class BloodBairn extends CardImpl { // Sacrifice another creature: Blood Bairn gets +2/+2 until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE))); diff --git a/Mage.Sets/src/mage/cards/b/BloodflowConnoisseur.java b/Mage.Sets/src/mage/cards/b/BloodflowConnoisseur.java index 8ef9681a0d2..d1f9d0509a9 100644 --- a/Mage.Sets/src/mage/cards/b/BloodflowConnoisseur.java +++ b/Mage.Sets/src/mage/cards/b/BloodflowConnoisseur.java @@ -32,7 +32,6 @@ public final class BloodflowConnoisseur extends CardImpl { // Sacrifice a creature: Put a +1/+1 counter on Bloodflow Connoisseur. Cost abilityCost = new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE); Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), abilityCost ); diff --git a/Mage.Sets/src/mage/cards/b/BomatCourier.java b/Mage.Sets/src/mage/cards/b/BomatCourier.java index ccf0f49a78b..13e81d4262a 100644 --- a/Mage.Sets/src/mage/cards/b/BomatCourier.java +++ b/Mage.Sets/src/mage/cards/b/BomatCourier.java @@ -38,7 +38,6 @@ public final class BomatCourier extends CardImpl { // {R}, Discard your hand, Sacrifice Bomat Courier: Put all cards exiled with Bomat Courier into their owners' hands. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new ReturnFromExileForSourceEffect(Zone.HAND).withText(true, true, true), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new DiscardHandCost()); diff --git a/Mage.Sets/src/mage/cards/b/BorosChallenger.java b/Mage.Sets/src/mage/cards/b/BorosChallenger.java index c30a0e96fb0..99ada890ae7 100644 --- a/Mage.Sets/src/mage/cards/b/BorosChallenger.java +++ b/Mage.Sets/src/mage/cards/b/BorosChallenger.java @@ -32,7 +32,6 @@ public final class BorosChallenger extends CardImpl { // {2}{R}{W}: Boros Challenger gets +1/+1 until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}{W}") )); diff --git a/Mage.Sets/src/mage/cards/b/BountyAgent.java b/Mage.Sets/src/mage/cards/b/BountyAgent.java index cc8de24de83..6d719496e70 100644 --- a/Mage.Sets/src/mage/cards/b/BountyAgent.java +++ b/Mage.Sets/src/mage/cards/b/BountyAgent.java @@ -48,7 +48,6 @@ public final class BountyAgent extends CardImpl { // {T}, Sacrifice Bounty Agent: Destroy target legendary permanent that's an artifact, creature, or enchantment. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost() ); diff --git a/Mage.Sets/src/mage/cards/b/BreyaEtheriumShaper.java b/Mage.Sets/src/mage/cards/b/BreyaEtheriumShaper.java index 3bf6071a81f..d5c076f2c67 100644 --- a/Mage.Sets/src/mage/cards/b/BreyaEtheriumShaper.java +++ b/Mage.Sets/src/mage/cards/b/BreyaEtheriumShaper.java @@ -43,7 +43,6 @@ public final class BreyaEtheriumShaper extends CardImpl { // {2}, Sacrifice two artifacts: Choose one — Breya deals 3 damage to target player or planeswalker. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new DamageTargetEffect(3), new GenericManaCost(2)); ability.addCost(new SacrificeTargetCost(2, StaticFilters.FILTER_PERMANENT_ARTIFACTS)); diff --git a/Mage.Sets/src/mage/cards/b/Brightling.java b/Mage.Sets/src/mage/cards/b/Brightling.java index 19b4e096e90..c2242f0f008 100644 --- a/Mage.Sets/src/mage/cards/b/Brightling.java +++ b/Mage.Sets/src/mage/cards/b/Brightling.java @@ -39,7 +39,6 @@ public final class Brightling extends CardImpl { // {W}: Brightling gains vigilance until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new GainAbilitySourceEffect( VigilanceAbility.getInstance(), Duration.EndOfTurn @@ -49,7 +48,6 @@ public final class Brightling extends CardImpl { // {W}: Brightling gains lifelink until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new GainAbilitySourceEffect( LifelinkAbility.getInstance(), Duration.EndOfTurn @@ -59,14 +57,12 @@ public final class Brightling extends CardImpl { // {W}: Return Brightling to its owner's hand. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ColoredManaCost(ColoredManaSymbol.W) )); // {1}: Brightling gets +1/-1 or -1/+1 until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BrightlingEffect(), new GenericManaCost(1) )); diff --git a/Mage.Sets/src/mage/cards/b/BudokaPupil.java b/Mage.Sets/src/mage/cards/b/BudokaPupil.java index d328adc5698..672c00d9b22 100644 --- a/Mage.Sets/src/mage/cards/b/BudokaPupil.java +++ b/Mage.Sets/src/mage/cards/b/BudokaPupil.java @@ -75,7 +75,6 @@ class IchigaWhoTopplesOaks extends TokenImpl { // Remove a ki counter from Ichiga, Who Topples Oaks: Target creature gets +2/+2 until end of turn. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new RemoveCountersSourceCost(CounterType.KI.createInstance())); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/b/BurnishedHart.java b/Mage.Sets/src/mage/cards/b/BurnishedHart.java index 22a76349cc9..9aa7779fb68 100644 --- a/Mage.Sets/src/mage/cards/b/BurnishedHart.java +++ b/Mage.Sets/src/mage/cards/b/BurnishedHart.java @@ -32,7 +32,6 @@ public final class BurnishedHart extends CardImpl { // {3}, Sacrifice Burnished Hart: Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle your library. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0,2, StaticFilters.FILTER_CARD_BASIC_LANDS), true), new GenericManaCost(3)); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/c/CallowJushi.java b/Mage.Sets/src/mage/cards/c/CallowJushi.java index 169a46b9d80..87636c0c55e 100644 --- a/Mage.Sets/src/mage/cards/c/CallowJushi.java +++ b/Mage.Sets/src/mage/cards/c/CallowJushi.java @@ -75,7 +75,6 @@ class JarakuTheInterloper extends TokenImpl { // Remove a ki counter from Jaraku the Interloper: Counter target spell unless its controller pays {2}. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new GenericManaCost(2)), new RemoveCountersSourceCost(CounterType.KI.createInstance())); ability.addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/cards/c/CarnifexDemon.java b/Mage.Sets/src/mage/cards/c/CarnifexDemon.java index bfce9049e28..b7cac427ab9 100644 --- a/Mage.Sets/src/mage/cards/c/CarnifexDemon.java +++ b/Mage.Sets/src/mage/cards/c/CarnifexDemon.java @@ -47,7 +47,6 @@ public final class CarnifexDemon extends CardImpl { )); Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new AddCountersAllEffect( CounterType.M1M1.createInstance(), filter diff --git a/Mage.Sets/src/mage/cards/c/CharnelTroll.java b/Mage.Sets/src/mage/cards/c/CharnelTroll.java index a1bce8d3da5..670280bd1b7 100644 --- a/Mage.Sets/src/mage/cards/c/CharnelTroll.java +++ b/Mage.Sets/src/mage/cards/c/CharnelTroll.java @@ -53,7 +53,6 @@ public final class CharnelTroll extends CardImpl { // {B}{G}, Discard a creature card: Put a +1/+1 counter on Morgue Troll. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{B}{G}") ); diff --git a/Mage.Sets/src/mage/cards/c/CoilsOfTheMedusa.java b/Mage.Sets/src/mage/cards/c/CoilsOfTheMedusa.java index e5956feeb91..a90d849b83b 100644 --- a/Mage.Sets/src/mage/cards/c/CoilsOfTheMedusa.java +++ b/Mage.Sets/src/mage/cards/c/CoilsOfTheMedusa.java @@ -42,7 +42,6 @@ public final class CoilsOfTheMedusa extends CardImpl { // Sacrifice Coils of the Medusa: Destroy all non-Wall creatures blocking enchanted creature. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new CoilsOfTheMedusaDestroyEffect(), new SacrificeSourceCost()) ); diff --git a/Mage.Sets/src/mage/cards/c/CopperGnomes.java b/Mage.Sets/src/mage/cards/c/CopperGnomes.java index c4a5402858f..85f16153160 100644 --- a/Mage.Sets/src/mage/cards/c/CopperGnomes.java +++ b/Mage.Sets/src/mage/cards/c/CopperGnomes.java @@ -29,7 +29,6 @@ public final class CopperGnomes extends CardImpl { // {4}, Sacrifice Copper Gnomes: You may put an artifact card from your hand onto the battlefield. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_ARTIFACT_AN), new ManaCostsImpl<>("{4}") ); diff --git a/Mage.Sets/src/mage/cards/c/CorpseBlockade.java b/Mage.Sets/src/mage/cards/c/CorpseBlockade.java index 544005e85ee..4b92da281ee 100644 --- a/Mage.Sets/src/mage/cards/c/CorpseBlockade.java +++ b/Mage.Sets/src/mage/cards/c/CorpseBlockade.java @@ -35,7 +35,6 @@ public final class CorpseBlockade extends CardImpl { // Sacrifice another creature: Corpse Blockade gains deathtouch until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE))); } diff --git a/Mage.Sets/src/mage/cards/c/CunningBandit.java b/Mage.Sets/src/mage/cards/c/CunningBandit.java index 856f92c5581..8c9d58f9f4b 100644 --- a/Mage.Sets/src/mage/cards/c/CunningBandit.java +++ b/Mage.Sets/src/mage/cards/c/CunningBandit.java @@ -75,7 +75,6 @@ class AzamukiTreacheryIncarnate extends TokenImpl { // Remove a ki counter from Azamuki, Treachery Incarnate: Gain control of target creature until end of turn. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new GainControlTargetEffect(Duration.EndOfTurn), new RemoveCountersSourceCost(CounterType.KI.createInstance())); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/d/DailyRegimen.java b/Mage.Sets/src/mage/cards/d/DailyRegimen.java index 9287dcd1005..ae01cfd7f9d 100644 --- a/Mage.Sets/src/mage/cards/d/DailyRegimen.java +++ b/Mage.Sets/src/mage/cards/d/DailyRegimen.java @@ -37,7 +37,6 @@ public final class DailyRegimen extends CardImpl { this.addAbility(ability); // {1}{W}: Put a +1/+1 counter on enchanted creature. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new AddCountersAttachedEffect(CounterType.P1P1.createInstance(),"enchanted creature"), new ManaCostsImpl<>("{1}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/d/DawnOfHope.java b/Mage.Sets/src/mage/cards/d/DawnOfHope.java index 7f9bd2358ed..b8f338c1a96 100644 --- a/Mage.Sets/src/mage/cards/d/DawnOfHope.java +++ b/Mage.Sets/src/mage/cards/d/DawnOfHope.java @@ -32,7 +32,6 @@ public final class DawnOfHope extends CardImpl { // {3}{W}: Create a 1/1 white Soldier creature token with lifelink. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new CreateTokenEffect(new SoldierLifelinkToken()), new ManaCostsImpl<>("{3}{W}") )); diff --git a/Mage.Sets/src/mage/cards/d/DevkarinDissident.java b/Mage.Sets/src/mage/cards/d/DevkarinDissident.java index 36fc25a538f..520c7240d72 100644 --- a/Mage.Sets/src/mage/cards/d/DevkarinDissident.java +++ b/Mage.Sets/src/mage/cards/d/DevkarinDissident.java @@ -28,7 +28,6 @@ public final class DevkarinDissident extends CardImpl { // {4}{G}: Devkarin Dissident gets +2/+2 until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{4}{G}") )); diff --git a/Mage.Sets/src/mage/cards/d/DismissivePyromancer.java b/Mage.Sets/src/mage/cards/d/DismissivePyromancer.java index 5d3897d9385..164337dbebc 100644 --- a/Mage.Sets/src/mage/cards/d/DismissivePyromancer.java +++ b/Mage.Sets/src/mage/cards/d/DismissivePyromancer.java @@ -33,7 +33,6 @@ public final class DismissivePyromancer extends CardImpl { // {R}, {T}, Discard a card: Draw a card. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{R}") ); @@ -43,7 +42,6 @@ public final class DismissivePyromancer extends CardImpl { // {2}{R}, {T}, Sacrifice Dismissive Pyromancer: It deals 4 damage to target creature. ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new DamageTargetEffect(4, "it"), new ManaCostsImpl<>("{2}{R}") ); diff --git a/Mage.Sets/src/mage/cards/d/DraconicDisciple.java b/Mage.Sets/src/mage/cards/d/DraconicDisciple.java index 2d00dfa73f1..a420db24fc4 100644 --- a/Mage.Sets/src/mage/cards/d/DraconicDisciple.java +++ b/Mage.Sets/src/mage/cards/d/DraconicDisciple.java @@ -35,7 +35,6 @@ public final class DraconicDisciple extends CardImpl { // {7}, {T}, Sacrifice Draconic Disciple: Create a 5/5 red Dragon creature token with flying. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new CreateTokenEffect(new DragonToken2()), new GenericManaCost(7) ); diff --git a/Mage.Sets/src/mage/cards/d/DreamscapeArtist.java b/Mage.Sets/src/mage/cards/d/DreamscapeArtist.java index f427c8d1758..96d3c687e6b 100644 --- a/Mage.Sets/src/mage/cards/d/DreamscapeArtist.java +++ b/Mage.Sets/src/mage/cards/d/DreamscapeArtist.java @@ -37,7 +37,6 @@ public final class DreamscapeArtist extends CardImpl { // {2}{U}, {tap}, Discard a card, Sacrifice a land: Search your library for up to two basic land cards and put them onto the battlefield. Then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(0, 2, StaticFilters.FILTER_CARD_BASIC_LANDS); Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(target, false), new ManaCostsImpl<>("{2}{U}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/d/DropkickBomber.java b/Mage.Sets/src/mage/cards/d/DropkickBomber.java index c113bfa61f3..9d9a949ec8e 100644 --- a/Mage.Sets/src/mage/cards/d/DropkickBomber.java +++ b/Mage.Sets/src/mage/cards/d/DropkickBomber.java @@ -57,7 +57,6 @@ public final class DropkickBomber extends CardImpl { // {R}: Until end of turn, another target Goblin you control gains flying and "When this creature deals combat damage, sacrifice it." Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn) .setText("Until end of turn, another target Goblin you control gains flying"), new ManaCostsImpl<>("{R}") diff --git a/Mage.Sets/src/mage/cards/e/ElvishClancaller.java b/Mage.Sets/src/mage/cards/e/ElvishClancaller.java index ca682779119..01c4fb8e1a8 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishClancaller.java +++ b/Mage.Sets/src/mage/cards/e/ElvishClancaller.java @@ -52,7 +52,6 @@ public final class ElvishClancaller extends CardImpl { // {4}{G}{G}, {T}: Search your library for a card named Elvish Clancaller, put it onto the battlefield, then shuffle your library. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect( new TargetCardInLibrary(filter2), false diff --git a/Mage.Sets/src/mage/cards/e/EpitaphGolem.java b/Mage.Sets/src/mage/cards/e/EpitaphGolem.java index d6635144ef5..0404d8d4b1e 100644 --- a/Mage.Sets/src/mage/cards/e/EpitaphGolem.java +++ b/Mage.Sets/src/mage/cards/e/EpitaphGolem.java @@ -28,7 +28,6 @@ public final class EpitaphGolem extends CardImpl { // {2}: Put target card from your graveyard on the bottom of your library. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(false), new ManaCostsImpl<>("{2}")); ability.addTarget(new TargetCardInYourGraveyard()); diff --git a/Mage.Sets/src/mage/cards/e/EvolvingWilds.java b/Mage.Sets/src/mage/cards/e/EvolvingWilds.java index 3dcbc494ebc..e1ff00d2415 100644 --- a/Mage.Sets/src/mage/cards/e/EvolvingWilds.java +++ b/Mage.Sets/src/mage/cards/e/EvolvingWilds.java @@ -26,7 +26,6 @@ public final class EvolvingWilds extends CardImpl { // {T}, Sacrifice Evolving Wilds: Search your library for a basic land card and put it onto the battlefield tapped. Then shuffle your library. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/f/FaithfulSquire.java b/Mage.Sets/src/mage/cards/f/FaithfulSquire.java index 6c0cbeacbdf..4bdc2d2c819 100644 --- a/Mage.Sets/src/mage/cards/f/FaithfulSquire.java +++ b/Mage.Sets/src/mage/cards/f/FaithfulSquire.java @@ -78,7 +78,6 @@ class KaisoMemoryOfLoyaltyToken extends TokenImpl { // Remove a ki counter from Kaiso, Memory of Loyalty: Prevent all damage that would be dealt to target creature this turn. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, Integer.MAX_VALUE), new RemoveCountersSourceCost(CounterType.KI.createInstance())); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/f/FiresOfMountDoom.java b/Mage.Sets/src/mage/cards/f/FiresOfMountDoom.java index c2de242fe6b..ebb137ab672 100644 --- a/Mage.Sets/src/mage/cards/f/FiresOfMountDoom.java +++ b/Mage.Sets/src/mage/cards/f/FiresOfMountDoom.java @@ -49,7 +49,6 @@ public final class FiresOfMountDoom extends CardImpl { // {2}{R}: Exile the top card of your library. You may play that card this turn. // When you play a card this way, Fires of Mount Doom deals 2 damage to each player. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new FiresOfMountDoomEffect(), new ManaCostsImpl<>("{2}{R}") ).setIdentifier(MageIdentifier.FiresOfMountDoomAlternateCast)); diff --git a/Mage.Sets/src/mage/cards/f/FreneticEfreet.java b/Mage.Sets/src/mage/cards/f/FreneticEfreet.java index ffcc1914064..057c235c9ea 100644 --- a/Mage.Sets/src/mage/cards/f/FreneticEfreet.java +++ b/Mage.Sets/src/mage/cards/f/FreneticEfreet.java @@ -34,7 +34,6 @@ public final class FreneticEfreet extends CardImpl { // {0}: Flip a coin. If you win the flip, Frenetic Efreet phases out. If you lose the flip, sacrifice Frenetic Efreet. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new FreneticEfreetEffect(), new GenericManaCost(0) )); diff --git a/Mage.Sets/src/mage/cards/f/FrilledSeaSerpent.java b/Mage.Sets/src/mage/cards/f/FrilledSeaSerpent.java index 2af1687cca1..9b10529dfc4 100644 --- a/Mage.Sets/src/mage/cards/f/FrilledSeaSerpent.java +++ b/Mage.Sets/src/mage/cards/f/FrilledSeaSerpent.java @@ -28,7 +28,6 @@ public final class FrilledSeaSerpent extends CardImpl { // {5}{U}{U}: Frilled Sea Serpent can't be blocked this turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new CantBeBlockedSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{5}{U}{U}") )); diff --git a/Mage.Sets/src/mage/cards/f/FungalPlots.java b/Mage.Sets/src/mage/cards/f/FungalPlots.java index 0b0c463bba4..4f9dc2b38d2 100644 --- a/Mage.Sets/src/mage/cards/f/FungalPlots.java +++ b/Mage.Sets/src/mage/cards/f/FungalPlots.java @@ -45,7 +45,6 @@ public final class FungalPlots extends CardImpl { // Sacrifice two Saprolings: You gain 2 life and draw a card. SimpleActivatedAbility ability2 = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new GainLifeEffect(2), new SacrificeTargetCost(2, filter2) ); diff --git a/Mage.Sets/src/mage/cards/g/GargoyleCastle.java b/Mage.Sets/src/mage/cards/g/GargoyleCastle.java index a341b76355a..89383d17aae 100644 --- a/Mage.Sets/src/mage/cards/g/GargoyleCastle.java +++ b/Mage.Sets/src/mage/cards/g/GargoyleCastle.java @@ -28,7 +28,6 @@ public final class GargoyleCastle extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {T}, {5}, Sacrifice Gargoyle Castle: Put a 3/4 colorless Gargoyle artifact creature token with flying onto the battlefield. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new CreateTokenEffect(new GargoyleToken()), new ManaCostsImpl<>("{5}")); ability.addCost(new TapSourceCost()); @@ -45,4 +44,4 @@ public final class GargoyleCastle extends CardImpl { return new GargoyleCastle(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/g/GeneralTazri.java b/Mage.Sets/src/mage/cards/g/GeneralTazri.java index ac7b85daf2a..a9d0c7dc56f 100644 --- a/Mage.Sets/src/mage/cards/g/GeneralTazri.java +++ b/Mage.Sets/src/mage/cards/g/GeneralTazri.java @@ -48,7 +48,6 @@ public final class GeneralTazri extends CardImpl { DynamicValue xValue = new GeneralTazriColorCount(); BoostControlledEffect effect = new BoostControlledEffect(xValue, xValue, Duration.EndOfTurn, new FilterCreaturePermanent(SubType.ALLY, "Ally creatures"), false); this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{W}{U}{B}{R}{G}"))); diff --git a/Mage.Sets/src/mage/cards/g/GhostCouncilOfOrzhova.java b/Mage.Sets/src/mage/cards/g/GhostCouncilOfOrzhova.java index 8bbd535e6d0..97e0418db72 100644 --- a/Mage.Sets/src/mage/cards/g/GhostCouncilOfOrzhova.java +++ b/Mage.Sets/src/mage/cards/g/GhostCouncilOfOrzhova.java @@ -42,7 +42,6 @@ public final class GhostCouncilOfOrzhova extends CardImpl { // {1}, Sacrifice a creature: Exile Ghost Council of Orzhova. Return it to the battlefield under its owner's control at the beginning of the next end step. ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new ExileReturnBattlefieldOwnerNextEndStepSourceEffect(), new GenericManaCost(1)); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); diff --git a/Mage.Sets/src/mage/cards/g/Gnathosaur.java b/Mage.Sets/src/mage/cards/g/Gnathosaur.java index fb1d6bcc547..459911cd0de 100644 --- a/Mage.Sets/src/mage/cards/g/Gnathosaur.java +++ b/Mage.Sets/src/mage/cards/g/Gnathosaur.java @@ -36,7 +36,6 @@ public final class Gnathosaur extends CardImpl { this.toughness = new MageInt(4); this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(filter))); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinBanneret.java b/Mage.Sets/src/mage/cards/g/GoblinBanneret.java index 191cf3e78ae..4afea5a74c0 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBanneret.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBanneret.java @@ -32,7 +32,6 @@ public final class GoblinBanneret extends CardImpl { // {1}{R}: Goblin Banneret gets +2/+0 until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}") )); diff --git a/Mage.Sets/src/mage/cards/g/GoblinBomb.java b/Mage.Sets/src/mage/cards/g/GoblinBomb.java index cafd73e6f95..e233c042350 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBomb.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBomb.java @@ -36,7 +36,6 @@ public final class GoblinBomb extends CardImpl { // Remove five fuse counters from Goblin Bomb, Sacrifice Goblin Bomb: Goblin Bomb deals 20 damage to target player. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new DamageTargetEffect(20), new RemoveCountersSourceCost(CounterType.FUSE.createInstance(5)) ); diff --git a/Mage.Sets/src/mage/cards/g/GoblinMotivator.java b/Mage.Sets/src/mage/cards/g/GoblinMotivator.java index e73bff26003..fb164866b29 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinMotivator.java +++ b/Mage.Sets/src/mage/cards/g/GoblinMotivator.java @@ -32,7 +32,6 @@ public final class GoblinMotivator extends CardImpl { // {T}: Target creature gains haste until end of turn. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new GainAbilityTargetEffect( HasteAbility.getInstance(), Duration.EndOfTurn diff --git a/Mage.Sets/src/mage/cards/g/GontisMachinations.java b/Mage.Sets/src/mage/cards/g/GontisMachinations.java index c561745b9e1..58ea48c619f 100644 --- a/Mage.Sets/src/mage/cards/g/GontisMachinations.java +++ b/Mage.Sets/src/mage/cards/g/GontisMachinations.java @@ -34,7 +34,6 @@ public final class GontisMachinations extends CardImpl { // Pay {E}{E}, Sacrifice Gonti's Machinations: Each opponent loses 3 life. You gain life equal to the life lost this way. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new LoseLifeOpponentsYouGainLifeLostEffect(3), new PayEnergyCost(2)); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/g/GrapplingSundew.java b/Mage.Sets/src/mage/cards/g/GrapplingSundew.java index cb6a1d4d332..2c910068fe5 100644 --- a/Mage.Sets/src/mage/cards/g/GrapplingSundew.java +++ b/Mage.Sets/src/mage/cards/g/GrapplingSundew.java @@ -36,7 +36,6 @@ public final class GrapplingSundew extends CardImpl { // {4}{G}: Grappling Sundew gains indestructible until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new GainAbilitySourceEffect( IndestructibleAbility.getInstance(), Duration.EndOfTurn diff --git a/Mage.Sets/src/mage/cards/g/Gravewaker.java b/Mage.Sets/src/mage/cards/g/Gravewaker.java index 2cfc417f813..ced50135b91 100644 --- a/Mage.Sets/src/mage/cards/g/Gravewaker.java +++ b/Mage.Sets/src/mage/cards/g/Gravewaker.java @@ -34,7 +34,6 @@ public final class Gravewaker extends CardImpl { // {5}{B}{B}: Return target creature card from your graveyard to the battlefield tapped. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(true) .setText("return target creature card from your graveyard to the battlefield tapped"), new ManaCostsImpl<>("{5}{B}{B}") diff --git a/Mage.Sets/src/mage/cards/g/GraveyardMarshal.java b/Mage.Sets/src/mage/cards/g/GraveyardMarshal.java index a21a1c0ab39..87a522f4989 100644 --- a/Mage.Sets/src/mage/cards/g/GraveyardMarshal.java +++ b/Mage.Sets/src/mage/cards/g/GraveyardMarshal.java @@ -35,7 +35,6 @@ public final class GraveyardMarshal extends CardImpl { // {2}{B}, Exile a creature card from your graveyard: Create a tapped 2/2 black Zombie creature token. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new CreateTokenEffect( new ZombieToken(), 1, true, false diff --git a/Mage.Sets/src/mage/cards/h/Hackrobat.java b/Mage.Sets/src/mage/cards/h/Hackrobat.java index 71c40c5d97d..e8d46a25d10 100644 --- a/Mage.Sets/src/mage/cards/h/Hackrobat.java +++ b/Mage.Sets/src/mage/cards/h/Hackrobat.java @@ -32,7 +32,6 @@ public final class Hackrobat extends CardImpl { // {B}: Hackrobat gains deathtouch until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new GainAbilitySourceEffect( DeathtouchAbility.getInstance(), Duration.EndOfTurn @@ -41,7 +40,6 @@ public final class Hackrobat extends CardImpl { // {R}: Hackrobat gets +2/-2 until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BoostSourceEffect(2, -2, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R) )); diff --git a/Mage.Sets/src/mage/cards/h/Helldozer.java b/Mage.Sets/src/mage/cards/h/Helldozer.java index c8eac1ee0ca..df448a2acd9 100644 --- a/Mage.Sets/src/mage/cards/h/Helldozer.java +++ b/Mage.Sets/src/mage/cards/h/Helldozer.java @@ -33,7 +33,6 @@ public final class Helldozer extends CardImpl { // {B}{B}{B}, {tap}: Destroy target land. If that land was nonbasic, untap Helldozer. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new HelldozerEffect(), new ManaCostsImpl<>("{B}{B}{B}")); ability.addTarget(new TargetLandPermanent()); diff --git a/Mage.Sets/src/mage/cards/h/HiredMuscle.java b/Mage.Sets/src/mage/cards/h/HiredMuscle.java index 1d431dc9a48..d3cfa699ad1 100644 --- a/Mage.Sets/src/mage/cards/h/HiredMuscle.java +++ b/Mage.Sets/src/mage/cards/h/HiredMuscle.java @@ -76,7 +76,6 @@ class Scarmaker extends TokenImpl { // Remove a ki counter from Scarmaker: Target creature gains fear until end of turn. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new GainAbilityTargetEffect(FearAbility.getInstance(), Duration.EndOfTurn), new RemoveCountersSourceCost(CounterType.KI.createInstance())); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/h/HonorWornShaku.java b/Mage.Sets/src/mage/cards/h/HonorWornShaku.java index a21c84042a8..58a4fe4a58a 100644 --- a/Mage.Sets/src/mage/cards/h/HonorWornShaku.java +++ b/Mage.Sets/src/mage/cards/h/HonorWornShaku.java @@ -33,7 +33,6 @@ public final class HonorWornShaku extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); this.addAbility(new ColorlessManaAbility()); Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new UntapSourceEffect(), new TapTargetCost(new TargetControlledPermanent(filter))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HorrorOfTheDim.java b/Mage.Sets/src/mage/cards/h/HorrorOfTheDim.java index 2aa5f87c402..fd3cb5662b0 100644 --- a/Mage.Sets/src/mage/cards/h/HorrorOfTheDim.java +++ b/Mage.Sets/src/mage/cards/h/HorrorOfTheDim.java @@ -31,7 +31,6 @@ public final class HorrorOfTheDim extends CardImpl { // {U}: Horror of the Dim gains hexproof until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new GainAbilitySourceEffect(HexproofAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U))); } diff --git a/Mage.Sets/src/mage/cards/i/IbHalfheartGoblinTactician.java b/Mage.Sets/src/mage/cards/i/IbHalfheartGoblinTactician.java index 26288f518b8..160366f0e80 100644 --- a/Mage.Sets/src/mage/cards/i/IbHalfheartGoblinTactician.java +++ b/Mage.Sets/src/mage/cards/i/IbHalfheartGoblinTactician.java @@ -53,7 +53,6 @@ public final class IbHalfheartGoblinTactician extends CardImpl { // Sacrifice two Mountains: Create two 1/1 red Goblin creature tokens. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new CreateTokenEffect(new GoblinToken(), 2), new SacrificeTargetCost(2, filter))); diff --git a/Mage.Sets/src/mage/cards/i/ImmolationShaman.java b/Mage.Sets/src/mage/cards/i/ImmolationShaman.java index 930e425a1ed..79fad9b9bdf 100644 --- a/Mage.Sets/src/mage/cards/i/ImmolationShaman.java +++ b/Mage.Sets/src/mage/cards/i/ImmolationShaman.java @@ -43,7 +43,6 @@ public final class ImmolationShaman extends CardImpl { // {3}{R}{R}: Immolation Shaman gets +3/+3 and gains menace until end of turn. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BoostSourceEffect( 3, 3, Duration.EndOfTurn ).setText("{this} gets +3/+3"), diff --git a/Mage.Sets/src/mage/cards/i/IzoniThousandEyed.java b/Mage.Sets/src/mage/cards/i/IzoniThousandEyed.java index 4ef237baf3c..4dc666d39cf 100644 --- a/Mage.Sets/src/mage/cards/i/IzoniThousandEyed.java +++ b/Mage.Sets/src/mage/cards/i/IzoniThousandEyed.java @@ -48,7 +48,6 @@ public final class IzoniThousandEyed extends CardImpl { // {B}{G}, Sacrifice another creature: You gain 1 life and draw a card. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new GainLifeEffect(1), new ManaCostsImpl<>("{B}{G}") ); diff --git a/Mage.Sets/src/mage/cards/k/KagemaroFirstToSuffer.java b/Mage.Sets/src/mage/cards/k/KagemaroFirstToSuffer.java index aac957001d7..15349f4586f 100644 --- a/Mage.Sets/src/mage/cards/k/KagemaroFirstToSuffer.java +++ b/Mage.Sets/src/mage/cards/k/KagemaroFirstToSuffer.java @@ -44,7 +44,6 @@ public final class KagemaroFirstToSuffer extends CardImpl { DynamicValue xMinusValue = new SignInversionDynamicValue(xValue); Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BoostAllEffect(xMinusValue, xMinusValue, Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURE, false, "All creatures get -X/-X until end of turn, where X is the number of cards in your hand"), new ManaCostsImpl<>("{B}") diff --git a/Mage.Sets/src/mage/cards/k/KelsinkoRanger.java b/Mage.Sets/src/mage/cards/k/KelsinkoRanger.java index 9f4732b36e9..618b18f0e61 100644 --- a/Mage.Sets/src/mage/cards/k/KelsinkoRanger.java +++ b/Mage.Sets/src/mage/cards/k/KelsinkoRanger.java @@ -41,7 +41,6 @@ public final class KelsinkoRanger extends CardImpl { // {1}{W}: Target green creature gains first strike until end of turn. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}") ); diff --git a/Mage.Sets/src/mage/cards/k/KikuNightsFlower.java b/Mage.Sets/src/mage/cards/k/KikuNightsFlower.java index 22d3e422582..541a73d79c2 100644 --- a/Mage.Sets/src/mage/cards/k/KikuNightsFlower.java +++ b/Mage.Sets/src/mage/cards/k/KikuNightsFlower.java @@ -38,7 +38,6 @@ public final class KikuNightsFlower extends CardImpl { // {2}{B}{B}, {T}: Target creature deals damage to itself equal to its power. Ability ability; ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new KikuNightsFlowerEffect(), new ManaCostsImpl<>("{2}{B}{B}") ); @@ -83,4 +82,3 @@ class KikuNightsFlowerEffect extends OneShotEffect { return false; } } - diff --git a/Mage.Sets/src/mage/cards/k/KithkinArmor.java b/Mage.Sets/src/mage/cards/k/KithkinArmor.java index b451c0d1d85..0db15948f2e 100644 --- a/Mage.Sets/src/mage/cards/k/KithkinArmor.java +++ b/Mage.Sets/src/mage/cards/k/KithkinArmor.java @@ -48,7 +48,6 @@ public final class KithkinArmor extends CardImpl { // Sacrifice Kithkin Armor: The next time a source of your choice would deal damage to enchanted creature this turn, prevent that damage. Ability protectionAbility = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new KithkinArmorPreventionEffect(), new KithkinArmorCost()); protectionAbility.addTarget(new TargetSource()); diff --git a/Mage.Sets/src/mage/cards/k/KnowledgeVault.java b/Mage.Sets/src/mage/cards/k/KnowledgeVault.java index b16572c7f98..6adec35a16c 100644 --- a/Mage.Sets/src/mage/cards/k/KnowledgeVault.java +++ b/Mage.Sets/src/mage/cards/k/KnowledgeVault.java @@ -30,7 +30,6 @@ public final class KnowledgeVault extends CardImpl { // {2}, {T}: Exile the top card of your library face down. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new ExileCardsFromTopOfLibraryControllerEffect(1, true, true), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/k/KyrenArchive.java b/Mage.Sets/src/mage/cards/k/KyrenArchive.java index e5406d9aa11..602cf13599e 100644 --- a/Mage.Sets/src/mage/cards/k/KyrenArchive.java +++ b/Mage.Sets/src/mage/cards/k/KyrenArchive.java @@ -32,7 +32,6 @@ public final class KyrenArchive extends CardImpl { // {5}, Discard your hand, Sacrifice Kyren Archive: Put all cards exiled with Kyren Archive into their owner's hand. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new ReturnFromExileForSourceEffect(Zone.HAND).withText(true, false, true), new GenericManaCost(5) ); diff --git a/Mage.Sets/src/mage/cards/k/KyrenNegotiations.java b/Mage.Sets/src/mage/cards/k/KyrenNegotiations.java index 75555b8d98b..70b3f95e24e 100644 --- a/Mage.Sets/src/mage/cards/k/KyrenNegotiations.java +++ b/Mage.Sets/src/mage/cards/k/KyrenNegotiations.java @@ -31,7 +31,6 @@ public final class KyrenNegotiations extends CardImpl { // Tap an untapped creature you control: Kyren Negotiations deals 1 damage to target player. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false)) ); diff --git a/Mage.Sets/src/mage/cards/l/LathlissDragonQueen.java b/Mage.Sets/src/mage/cards/l/LathlissDragonQueen.java index b649ae6da3f..06c0d2a7e24 100644 --- a/Mage.Sets/src/mage/cards/l/LathlissDragonQueen.java +++ b/Mage.Sets/src/mage/cards/l/LathlissDragonQueen.java @@ -54,7 +54,6 @@ public final class LathlissDragonQueen extends CardImpl { )); // {1}{R}: Dragons you control get +1/+0 until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BoostControlledEffect( 1, 0, Duration.EndOfTurn, filter2, false diff --git a/Mage.Sets/src/mage/cards/l/LedevChampion.java b/Mage.Sets/src/mage/cards/l/LedevChampion.java index 1ef8e622891..eef9be75efe 100644 --- a/Mage.Sets/src/mage/cards/l/LedevChampion.java +++ b/Mage.Sets/src/mage/cards/l/LedevChampion.java @@ -40,7 +40,6 @@ public final class LedevChampion extends CardImpl { // {3}{G}{W}: Create a 1/1 white soldier creature token with lifelink. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new CreateTokenEffect(new SoldierLifelinkToken()), new ManaCostsImpl<>("{3}{G}{W}") )); diff --git a/Mage.Sets/src/mage/cards/l/LightningMare.java b/Mage.Sets/src/mage/cards/l/LightningMare.java index 4e10b68c637..b9afa4a9d37 100644 --- a/Mage.Sets/src/mage/cards/l/LightningMare.java +++ b/Mage.Sets/src/mage/cards/l/LightningMare.java @@ -50,7 +50,6 @@ public final class LightningMare extends CardImpl { // {1}{R}: Lightning Mare gets +1/+0 until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}") )); diff --git a/Mage.Sets/src/mage/cards/l/Lithatog.java b/Mage.Sets/src/mage/cards/l/Lithatog.java index 8c1350000cd..638fafdd8c9 100644 --- a/Mage.Sets/src/mage/cards/l/Lithatog.java +++ b/Mage.Sets/src/mage/cards/l/Lithatog.java @@ -32,12 +32,10 @@ public final class Lithatog extends CardImpl { // Sacrifice an artifact: Lithatog gets +1/+1 until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BoostSourceEffect(1,1, Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_ARTIFACT))); // Sacrifice a land: Lithatog gets +1/+1 until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BoostSourceEffect(1,1, Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_LAND))); } diff --git a/Mage.Sets/src/mage/cards/m/MidnightSnack.java b/Mage.Sets/src/mage/cards/m/MidnightSnack.java index a2604a375f1..092e6d0a7d6 100644 --- a/Mage.Sets/src/mage/cards/m/MidnightSnack.java +++ b/Mage.Sets/src/mage/cards/m/MidnightSnack.java @@ -40,7 +40,6 @@ public final class MidnightSnack extends CardImpl { // {2}{B}, Sacrifice this enchantment: Target opponent loses X life, where X is the amount of life you gained this turn. Ability sacrificeAbility = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new LoseLifeTargetEffect(ControllerGainedLifeCount.instance), new ManaCostsImpl<>("{2}{B}") ); diff --git a/Mage.Sets/src/mage/cards/m/MoggAssassin.java b/Mage.Sets/src/mage/cards/m/MoggAssassin.java index d8f88a7044a..8b8f5defd24 100644 --- a/Mage.Sets/src/mage/cards/m/MoggAssassin.java +++ b/Mage.Sets/src/mage/cards/m/MoggAssassin.java @@ -37,7 +37,6 @@ public final class MoggAssassin extends CardImpl { // {T}: You choose target creature an opponent controls, and that opponent chooses target creature. Flip a coin. If you win the flip, destroy the creature you chose. If you lose the flip, destroy the creature your opponent chose. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new MoggAssassinEffect(), new TapSourceCost() ); diff --git a/Mage.Sets/src/mage/cards/m/Musician.java b/Mage.Sets/src/mage/cards/m/Musician.java index f6fba20efed..cb787cd2102 100644 --- a/Mage.Sets/src/mage/cards/m/Musician.java +++ b/Mage.Sets/src/mage/cards/m/Musician.java @@ -42,7 +42,6 @@ public final class Musician extends CardImpl { // : Put a music counter on target creature. If it doesn’t have "At the beginning of your upkeep, destroy this creature unless you pay {1} for each music counter on it," it gains that ability. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.MUSIC.createInstance()), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/m/MysticArchaeologist.java b/Mage.Sets/src/mage/cards/m/MysticArchaeologist.java index b55c7a00869..9e16375d90e 100644 --- a/Mage.Sets/src/mage/cards/m/MysticArchaeologist.java +++ b/Mage.Sets/src/mage/cards/m/MysticArchaeologist.java @@ -27,7 +27,6 @@ public final class MysticArchaeologist extends CardImpl { // {3}{U}{U}: Draw two cards. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{3}{U}{U}") )); diff --git a/Mage.Sets/src/mage/cards/n/NobleSteeds.java b/Mage.Sets/src/mage/cards/n/NobleSteeds.java index a44fb58ca1b..1feea4899e9 100644 --- a/Mage.Sets/src/mage/cards/n/NobleSteeds.java +++ b/Mage.Sets/src/mage/cards/n/NobleSteeds.java @@ -25,7 +25,6 @@ public final class NobleSteeds extends CardImpl { // {1}{W}: Target creature gains first strike until end of turn. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}") ); diff --git a/Mage.Sets/src/mage/cards/o/OrochiEggwatcher.java b/Mage.Sets/src/mage/cards/o/OrochiEggwatcher.java index 138a47deb8d..444589ceb56 100644 --- a/Mage.Sets/src/mage/cards/o/OrochiEggwatcher.java +++ b/Mage.Sets/src/mage/cards/o/OrochiEggwatcher.java @@ -76,7 +76,6 @@ class ShidakoBroodmistress extends TokenImpl { // {G}, Sacrifice a creature: Target creature gets +3/+3 until end of turn. Ability ability; ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BoostTargetEffect(3, 3, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); diff --git a/Mage.Sets/src/mage/cards/p/PasswallAdept.java b/Mage.Sets/src/mage/cards/p/PasswallAdept.java index 75d14654001..fad7cfead88 100644 --- a/Mage.Sets/src/mage/cards/p/PasswallAdept.java +++ b/Mage.Sets/src/mage/cards/p/PasswallAdept.java @@ -29,7 +29,6 @@ public final class PasswallAdept extends CardImpl { // {2}{U}: Target creature can't be blocked this turn. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(), new ManaCostsImpl<>("{2}{U}") ); diff --git a/Mage.Sets/src/mage/cards/p/PerilousVault.java b/Mage.Sets/src/mage/cards/p/PerilousVault.java index 561cff6996d..c1e77fe84d1 100644 --- a/Mage.Sets/src/mage/cards/p/PerilousVault.java +++ b/Mage.Sets/src/mage/cards/p/PerilousVault.java @@ -25,7 +25,6 @@ public final class PerilousVault extends CardImpl { // {5}, {T}, Exile Perilous Vault: Exile all nonland permanents. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new ExileAllEffect(StaticFilters.FILTER_PERMANENTS_NON_LAND), new GenericManaCost(5) ); diff --git a/Mage.Sets/src/mage/cards/p/Phantatog.java b/Mage.Sets/src/mage/cards/p/Phantatog.java index 70402a43e75..06627219915 100644 --- a/Mage.Sets/src/mage/cards/p/Phantatog.java +++ b/Mage.Sets/src/mage/cards/p/Phantatog.java @@ -32,12 +32,10 @@ public final class Phantatog extends CardImpl { // Sacrifice an enchantment: Phantatog gets +1/+1 until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BoostSourceEffect(1,1, Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_ENCHANTMENT))); // Discard a card: Phantatog gets +1/+1 until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BoostSourceEffect(1,1, Duration.EndOfTurn), new DiscardCardCost())); } diff --git a/Mage.Sets/src/mage/cards/p/PlanarBridge.java b/Mage.Sets/src/mage/cards/p/PlanarBridge.java index 1420a49bf60..21045bc86f4 100644 --- a/Mage.Sets/src/mage/cards/p/PlanarBridge.java +++ b/Mage.Sets/src/mage/cards/p/PlanarBridge.java @@ -28,7 +28,6 @@ public final class PlanarBridge extends CardImpl { // {8}, {T}: Search your library for a permanent card, put it onto the battlefield, then shuffle your library. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterPermanentCard())), new GenericManaCost(8) ); diff --git a/Mage.Sets/src/mage/cards/p/PsionicSliver.java b/Mage.Sets/src/mage/cards/p/PsionicSliver.java index 24fffdccfd3..beb44bdeed6 100644 --- a/Mage.Sets/src/mage/cards/p/PsionicSliver.java +++ b/Mage.Sets/src/mage/cards/p/PsionicSliver.java @@ -36,7 +36,6 @@ public final class PsionicSliver extends CardImpl { // All Sliver creatures have "{T}: This creature deals 2 damage to any target and 3 damage to itself." Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new DamageTargetEffect(2).setText("This creature deals 2 damage to any target"), new TapSourceCost() ); diff --git a/Mage.Sets/src/mage/cards/p/PyxisOfPandemonium.java b/Mage.Sets/src/mage/cards/p/PyxisOfPandemonium.java index 7e679583828..f6f86abbf49 100644 --- a/Mage.Sets/src/mage/cards/p/PyxisOfPandemonium.java +++ b/Mage.Sets/src/mage/cards/p/PyxisOfPandemonium.java @@ -30,13 +30,11 @@ public final class PyxisOfPandemonium extends CardImpl { // {T}: Each player exiles the top card of their library face down. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new PyxisOfPandemoniumExileEffect(), new TapSourceCost())); // {7}, {T}, Sacrifice Pyxis of Pandemonium: Each player turns face up all cards they own exiled with Pyxis of Pandemonium, then puts all permanent cards among them onto the battlefield. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new PyxisOfPandemoniumPutOntoBattlefieldEffect(), new GenericManaCost(7)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/r/RavenousHarpy.java b/Mage.Sets/src/mage/cards/r/RavenousHarpy.java index b124670fc3b..2912a9ac461 100644 --- a/Mage.Sets/src/mage/cards/r/RavenousHarpy.java +++ b/Mage.Sets/src/mage/cards/r/RavenousHarpy.java @@ -35,7 +35,6 @@ public final class RavenousHarpy extends CardImpl { // {1}, Sacrifice another creature: Put a +1/+1 counter on Ravenous Harpy. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new GenericManaCost(1) ); diff --git a/Mage.Sets/src/mage/cards/r/RenegadeMap.java b/Mage.Sets/src/mage/cards/r/RenegadeMap.java index 0f7ff6e68ea..58e5d7c763e 100644 --- a/Mage.Sets/src/mage/cards/r/RenegadeMap.java +++ b/Mage.Sets/src/mage/cards/r/RenegadeMap.java @@ -30,7 +30,6 @@ public final class RenegadeMap extends CardImpl { // {T}, Sacrifice Renegade Map: Search your library for a basic land card, reveal it, put it into your hand, then shuffle your library. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), new TapSourceCost() ); diff --git a/Mage.Sets/src/mage/cards/r/RetrofitterFoundry.java b/Mage.Sets/src/mage/cards/r/RetrofitterFoundry.java index e2a8ce11169..6eabf4c2c6f 100644 --- a/Mage.Sets/src/mage/cards/r/RetrofitterFoundry.java +++ b/Mage.Sets/src/mage/cards/r/RetrofitterFoundry.java @@ -38,7 +38,6 @@ public final class RetrofitterFoundry extends CardImpl { // {3}: Untap Retrofitter Foundry. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new UntapSourceEffect(), new GenericManaCost(3)) ); diff --git a/Mage.Sets/src/mage/cards/r/RimefeatherOwl.java b/Mage.Sets/src/mage/cards/r/RimefeatherOwl.java index 666326b0793..6640c279a9e 100644 --- a/Mage.Sets/src/mage/cards/r/RimefeatherOwl.java +++ b/Mage.Sets/src/mage/cards/r/RimefeatherOwl.java @@ -58,7 +58,6 @@ public final class RimefeatherOwl extends CardImpl { // {1}{snow}: Put an ice counter on target permanent. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.ICE.createInstance()) .setText("Put an ice counter on target permanent."), new ManaCostsImpl<>("{1}{S}") diff --git a/Mage.Sets/src/mage/cards/r/RonaDiscipleOfGix.java b/Mage.Sets/src/mage/cards/r/RonaDiscipleOfGix.java index 50592e2b7c4..e3b85be0f7a 100644 --- a/Mage.Sets/src/mage/cards/r/RonaDiscipleOfGix.java +++ b/Mage.Sets/src/mage/cards/r/RonaDiscipleOfGix.java @@ -53,7 +53,6 @@ public final class RonaDiscipleOfGix extends CardImpl { // {4}, {T}: Exile the top card of your library. ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new ExileCardsFromTopOfLibraryControllerEffect(1, true), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/r/RukarumelBiologist.java b/Mage.Sets/src/mage/cards/r/RukarumelBiologist.java index cfc4cb971b2..4037d46d7bf 100644 --- a/Mage.Sets/src/mage/cards/r/RukarumelBiologist.java +++ b/Mage.Sets/src/mage/cards/r/RukarumelBiologist.java @@ -58,7 +58,6 @@ public final class RukarumelBiologist extends CardImpl { // {3}, {T}: Create a 1/1 colorless Sliver creature token. ActivatedAbility activated = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new CreateTokenEffect(new SliverToken()), new ManaCostsImpl<>("{3}") ); diff --git a/Mage.Sets/src/mage/cards/r/RuthlessKnave.java b/Mage.Sets/src/mage/cards/r/RuthlessKnave.java index 67dafce5755..00f9e1ba733 100644 --- a/Mage.Sets/src/mage/cards/r/RuthlessKnave.java +++ b/Mage.Sets/src/mage/cards/r/RuthlessKnave.java @@ -47,7 +47,6 @@ public final class RuthlessKnave extends CardImpl { // Sacrifice three Treasures: Draw a card. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new SacrificeTargetCost(3, filter) )); diff --git a/Mage.Sets/src/mage/cards/s/SaiMasterThopterist.java b/Mage.Sets/src/mage/cards/s/SaiMasterThopterist.java index dd846ac7485..d56f5b3b5e7 100644 --- a/Mage.Sets/src/mage/cards/s/SaiMasterThopterist.java +++ b/Mage.Sets/src/mage/cards/s/SaiMasterThopterist.java @@ -42,7 +42,6 @@ public final class SaiMasterThopterist extends CardImpl { // {1}{U}, Sacrifice two artifacts: Draw a card. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{1}{U}") ); diff --git a/Mage.Sets/src/mage/cards/s/SakuraTribeScout.java b/Mage.Sets/src/mage/cards/s/SakuraTribeScout.java index 312dccc9303..0a618574e2f 100644 --- a/Mage.Sets/src/mage/cards/s/SakuraTribeScout.java +++ b/Mage.Sets/src/mage/cards/s/SakuraTribeScout.java @@ -30,7 +30,6 @@ public final class SakuraTribeScout extends CardImpl { // {tap}: You may put a land card from your hand onto the battlefield. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_LAND_A), new TapSourceCost() )); diff --git a/Mage.Sets/src/mage/cards/s/Sarcatog.java b/Mage.Sets/src/mage/cards/s/Sarcatog.java index 70775c6422a..304cdcd4c9c 100644 --- a/Mage.Sets/src/mage/cards/s/Sarcatog.java +++ b/Mage.Sets/src/mage/cards/s/Sarcatog.java @@ -34,13 +34,11 @@ public final class Sarcatog extends CardImpl { // Exile two cards from your graveyard: Sarcatog gets +1/+1 until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BoostSourceEffect(1,1, Duration.EndOfTurn), new ExileFromGraveCost(new TargetCardInYourGraveyard(2,new FilterCard("cards"))))); // Sacrifice an artifact: Sarcatog gets +1/+1 until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BoostSourceEffect(1,1, Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_ARTIFACT))); } diff --git a/Mage.Sets/src/mage/cards/s/ScarlandThrinax.java b/Mage.Sets/src/mage/cards/s/ScarlandThrinax.java index dee2bb7ef71..09319088c04 100644 --- a/Mage.Sets/src/mage/cards/s/ScarlandThrinax.java +++ b/Mage.Sets/src/mage/cards/s/ScarlandThrinax.java @@ -32,7 +32,6 @@ public final class ScarlandThrinax extends CardImpl { // Sacrifice a creature: Put a +1/+1 counter on Scarland Thrinax. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ScavengerGrounds.java b/Mage.Sets/src/mage/cards/s/ScavengerGrounds.java index 4489de94ec6..4336103e648 100644 --- a/Mage.Sets/src/mage/cards/s/ScavengerGrounds.java +++ b/Mage.Sets/src/mage/cards/s/ScavengerGrounds.java @@ -39,7 +39,6 @@ public final class ScavengerGrounds extends CardImpl { // {2}, {T}, Sacrifice a Desert: Exile all cards from all graveyards. Ability ability2 = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new ExileGraveyardAllPlayersEffect(), new ManaCostsImpl<>("{2}")); ability2.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/s/ScrabblingClaws.java b/Mage.Sets/src/mage/cards/s/ScrabblingClaws.java index 97cc5f9fc11..24de2c998d6 100644 --- a/Mage.Sets/src/mage/cards/s/ScrabblingClaws.java +++ b/Mage.Sets/src/mage/cards/s/ScrabblingClaws.java @@ -34,7 +34,6 @@ public final class ScrabblingClaws extends CardImpl { // {tap}: Target player exiles a card from their graveyard. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new ScrabblingClawsEffect(), new TapSourceCost() ); @@ -43,7 +42,6 @@ public final class ScrabblingClaws extends CardImpl { // {1}, Sacrifice Scrabbling Claws: Exile target card from a graveyard. Draw a card. ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new ExileTargetEffect(), new GenericManaCost(1) ); diff --git a/Mage.Sets/src/mage/cards/s/ScreechingPhoenix.java b/Mage.Sets/src/mage/cards/s/ScreechingPhoenix.java index 498c20ff3f7..81a0e8989ed 100644 --- a/Mage.Sets/src/mage/cards/s/ScreechingPhoenix.java +++ b/Mage.Sets/src/mage/cards/s/ScreechingPhoenix.java @@ -31,7 +31,6 @@ public final class ScreechingPhoenix extends CardImpl { // {2}{R}: Creatures you control get +1/+0 until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}") )); diff --git a/Mage.Sets/src/mage/cards/s/SeraphOfTheScales.java b/Mage.Sets/src/mage/cards/s/SeraphOfTheScales.java index 7119d3de1ea..92e3717aeb4 100644 --- a/Mage.Sets/src/mage/cards/s/SeraphOfTheScales.java +++ b/Mage.Sets/src/mage/cards/s/SeraphOfTheScales.java @@ -34,7 +34,6 @@ public final class SeraphOfTheScales extends CardImpl { // {W}: Seraph of the Scales gains vigilance until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new GainAbilitySourceEffect( VigilanceAbility.getInstance(), Duration.EndOfTurn @@ -43,7 +42,6 @@ public final class SeraphOfTheScales extends CardImpl { // {B}: Seraph of the Scales gains deathtouch until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new GainAbilitySourceEffect( DeathtouchAbility.getInstance(), Duration.EndOfTurn diff --git a/Mage.Sets/src/mage/cards/s/SiegebreakerGiant.java b/Mage.Sets/src/mage/cards/s/SiegebreakerGiant.java index d6b25870f29..a27fa41c6ef 100644 --- a/Mage.Sets/src/mage/cards/s/SiegebreakerGiant.java +++ b/Mage.Sets/src/mage/cards/s/SiegebreakerGiant.java @@ -34,7 +34,6 @@ public final class SiegebreakerGiant extends CardImpl { // {3}{R}: Target creature can't block this turn. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new CantBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{3}{R}") ); diff --git a/Mage.Sets/src/mage/cards/s/SilentDart.java b/Mage.Sets/src/mage/cards/s/SilentDart.java index 3209ad116dc..43c6a41c938 100644 --- a/Mage.Sets/src/mage/cards/s/SilentDart.java +++ b/Mage.Sets/src/mage/cards/s/SilentDart.java @@ -24,7 +24,6 @@ public final class SilentDart extends CardImpl { // {4}, {T}, Sacrifice Silent Dart: It deals 3 damage to target creature. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new DamageTargetEffect(3, "it"), new GenericManaCost(4) ); diff --git a/Mage.Sets/src/mage/cards/s/SkyshroudVampire.java b/Mage.Sets/src/mage/cards/s/SkyshroudVampire.java index 813adaa471f..592c391898f 100644 --- a/Mage.Sets/src/mage/cards/s/SkyshroudVampire.java +++ b/Mage.Sets/src/mage/cards/s/SkyshroudVampire.java @@ -32,7 +32,6 @@ public final class SkyshroudVampire extends CardImpl { // Discard a creature card: Skyshroud Vampire gets +2/+2 until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new DiscardTargetCost(new TargetCardInHand(StaticFilters.FILTER_CARD_CREATURE)))); } diff --git a/Mage.Sets/src/mage/cards/s/SoulRansom.java b/Mage.Sets/src/mage/cards/s/SoulRansom.java index 42fe8a1bbca..92e6d602025 100644 --- a/Mage.Sets/src/mage/cards/s/SoulRansom.java +++ b/Mage.Sets/src/mage/cards/s/SoulRansom.java @@ -42,7 +42,6 @@ public final class SoulRansom extends CardImpl { // Discard two cards: Soul Ransom's controller sacrifices it, then draws two cards. Only any opponent may activate this ability. SimpleActivatedAbility ability2 = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new SoulRansomEffect(), new DiscardTargetCost( new TargetCardInHand(2, StaticFilters.FILTER_CARD_CARDS) diff --git a/Mage.Sets/src/mage/cards/s/SoulstoneSanctuary.java b/Mage.Sets/src/mage/cards/s/SoulstoneSanctuary.java index 5be414b13ec..3dd2fc68c01 100644 --- a/Mage.Sets/src/mage/cards/s/SoulstoneSanctuary.java +++ b/Mage.Sets/src/mage/cards/s/SoulstoneSanctuary.java @@ -30,7 +30,6 @@ public final class SoulstoneSanctuary extends CardImpl { // {4}: This land becomes a 3/3 creature with vigilance and all creature types. It's still a land. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new SoulStoneSanctuaryToken(), CardType.LAND, Duration.WhileOnBattlefield) .setText("this land becomes a 3/3 creature with vigilance and all creature types. It's still a land"), new GenericManaCost(4) diff --git a/Mage.Sets/src/mage/cards/s/SteelHellkite.java b/Mage.Sets/src/mage/cards/s/SteelHellkite.java index c4f7dc42cc0..00f2f8bf851 100644 --- a/Mage.Sets/src/mage/cards/s/SteelHellkite.java +++ b/Mage.Sets/src/mage/cards/s/SteelHellkite.java @@ -44,7 +44,6 @@ public final class SteelHellkite extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {2}: Steel Hellkite gets +1/+0 until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(2) )); diff --git a/Mage.Sets/src/mage/cards/s/StonehewerGiant.java b/Mage.Sets/src/mage/cards/s/StonehewerGiant.java index 9ca752ce6d9..b68c1b31b85 100644 --- a/Mage.Sets/src/mage/cards/s/StonehewerGiant.java +++ b/Mage.Sets/src/mage/cards/s/StonehewerGiant.java @@ -42,7 +42,6 @@ public final class StonehewerGiant extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // {1}{W}, {tap}: Search your library for an Equipment card and put it onto the battlefield. Attach it to a creature you control. Then shuffle your library. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new StonehewerGiantEffect(), new ManaCostsImpl<>("{1}{W}") ); diff --git a/Mage.Sets/src/mage/cards/s/SunCollaredRaptor.java b/Mage.Sets/src/mage/cards/s/SunCollaredRaptor.java index 7ad67d508b8..159a2ee4869 100644 --- a/Mage.Sets/src/mage/cards/s/SunCollaredRaptor.java +++ b/Mage.Sets/src/mage/cards/s/SunCollaredRaptor.java @@ -32,7 +32,6 @@ public final class SunCollaredRaptor extends CardImpl { // {2}{R}: Sun-Collared Raptor gets +3/+0 until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BoostSourceEffect(3, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}")) ); @@ -46,4 +45,4 @@ public final class SunCollaredRaptor extends CardImpl { public SunCollaredRaptor copy() { return new SunCollaredRaptor(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/SurgeMare.java b/Mage.Sets/src/mage/cards/s/SurgeMare.java index 3350d109e47..85a9456882c 100644 --- a/Mage.Sets/src/mage/cards/s/SurgeMare.java +++ b/Mage.Sets/src/mage/cards/s/SurgeMare.java @@ -55,7 +55,6 @@ public final class SurgeMare extends CardImpl { // {1}{U}: Surge Mare gets +2/-2 until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BoostSourceEffect(2, -2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}") )); diff --git a/Mage.Sets/src/mage/cards/t/TajicLegionsEdge.java b/Mage.Sets/src/mage/cards/t/TajicLegionsEdge.java index eea26e59139..d4b93ba593d 100644 --- a/Mage.Sets/src/mage/cards/t/TajicLegionsEdge.java +++ b/Mage.Sets/src/mage/cards/t/TajicLegionsEdge.java @@ -57,7 +57,6 @@ public final class TajicLegionsEdge extends CardImpl { // {R}{W}: Tajic, Legion's Edge gains first strike until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new GainAbilitySourceEffect( FirstStrikeAbility.getInstance(), Duration.EndOfTurn diff --git a/Mage.Sets/src/mage/cards/t/TerramorphicExpanse.java b/Mage.Sets/src/mage/cards/t/TerramorphicExpanse.java index dd726a099d3..69c889cbaad 100644 --- a/Mage.Sets/src/mage/cards/t/TerramorphicExpanse.java +++ b/Mage.Sets/src/mage/cards/t/TerramorphicExpanse.java @@ -25,7 +25,6 @@ public final class TerramorphicExpanse extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.LAND}, null); Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/t/Thaumatog.java b/Mage.Sets/src/mage/cards/t/Thaumatog.java index f86ae95db5a..f6f7fb35bdc 100644 --- a/Mage.Sets/src/mage/cards/t/Thaumatog.java +++ b/Mage.Sets/src/mage/cards/t/Thaumatog.java @@ -32,12 +32,10 @@ public final class Thaumatog extends CardImpl { // Sacrifice a land: Thaumatog gets +1/+1 until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BoostSourceEffect(1,1, Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_LAND))); // Sacrifice an enchantment: Thaumatog gets +1/+1 until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BoostSourceEffect(1,1, Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_ENCHANTMENT))); } diff --git a/Mage.Sets/src/mage/cards/t/ThranForge.java b/Mage.Sets/src/mage/cards/t/ThranForge.java index 5092a3741d8..feba8e782a1 100644 --- a/Mage.Sets/src/mage/cards/t/ThranForge.java +++ b/Mage.Sets/src/mage/cards/t/ThranForge.java @@ -33,7 +33,6 @@ public final class ThranForge extends CardImpl { // {2}: Until end of turn, target nonartifact creature gets +1/+0 and becomes an artifact in addition to its other types. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Duration.EndOfTurn) .setText("Until end of turn, target nonartifact creature gets +1/+0"), new GenericManaCost(2)); diff --git a/Mage.Sets/src/mage/cards/t/TideforceElemental.java b/Mage.Sets/src/mage/cards/t/TideforceElemental.java index 8bbefd6e872..f1028901dfd 100644 --- a/Mage.Sets/src/mage/cards/t/TideforceElemental.java +++ b/Mage.Sets/src/mage/cards/t/TideforceElemental.java @@ -34,7 +34,6 @@ public final class TideforceElemental extends CardImpl { // {U}, {tap}: You may tap or untap another target creature. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.U)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/t/TorchSong.java b/Mage.Sets/src/mage/cards/t/TorchSong.java index d85b6f9c8f7..bef64104c98 100644 --- a/Mage.Sets/src/mage/cards/t/TorchSong.java +++ b/Mage.Sets/src/mage/cards/t/TorchSong.java @@ -32,7 +32,6 @@ public final class TorchSong extends CardImpl { // {2}{R}, Sacrifice Torch Song: Torch Song deals X damage to any target, where X is the number of verse counters on Torch Song. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new DamageTargetEffect(new CountersSourceCount(CounterType.VERSE)), new ManaCostsImpl<>("{2}{R}") ); diff --git a/Mage.Sets/src/mage/cards/t/Torture.java b/Mage.Sets/src/mage/cards/t/Torture.java index 097bac595c6..21b64dd103a 100644 --- a/Mage.Sets/src/mage/cards/t/Torture.java +++ b/Mage.Sets/src/mage/cards/t/Torture.java @@ -38,7 +38,6 @@ public final class Torture extends CardImpl { // {1}{B}: Put a -1/-1 counter on enchanted creature. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new AddCountersAttachedEffect(CounterType.M1M1.createInstance(),"enchanted creature"), new ManaCostsImpl<>("{1}{B}"))); } diff --git a/Mage.Sets/src/mage/cards/t/TreefolkHealer.java b/Mage.Sets/src/mage/cards/t/TreefolkHealer.java index 688569fae3a..c2dd18111ff 100644 --- a/Mage.Sets/src/mage/cards/t/TreefolkHealer.java +++ b/Mage.Sets/src/mage/cards/t/TreefolkHealer.java @@ -31,7 +31,6 @@ public final class TreefolkHealer extends CardImpl { // {2}{W}, {tap}: Prevent the next 2 damage that would be dealt to any target this turn. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new ManaCostsImpl<>("{2}{W}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/u/UmezawasJitte.java b/Mage.Sets/src/mage/cards/u/UmezawasJitte.java index 5d6a498343d..d57fe0eefbf 100644 --- a/Mage.Sets/src/mage/cards/u/UmezawasJitte.java +++ b/Mage.Sets/src/mage/cards/u/UmezawasJitte.java @@ -37,7 +37,6 @@ public final class UmezawasJitte extends CardImpl { // Remove a charge counter from Umezawa's Jitte: Choose one — Equipped creature gets +2/+2 until end of turn. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2, Duration.EndOfTurn), new RemoveCountersSourceCost(CounterType.CHARGE.createInstance())); diff --git a/Mage.Sets/src/mage/cards/v/VampireAristocrat.java b/Mage.Sets/src/mage/cards/v/VampireAristocrat.java index 55c14feb5f1..2b4d8453ed2 100644 --- a/Mage.Sets/src/mage/cards/v/VampireAristocrat.java +++ b/Mage.Sets/src/mage/cards/v/VampireAristocrat.java @@ -28,7 +28,6 @@ public final class VampireAristocrat extends CardImpl { // Sacrifice a creature: Vampire Aristocrat gets +2/+2 until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE))); } diff --git a/Mage.Sets/src/mage/cards/v/VampireHounds.java b/Mage.Sets/src/mage/cards/v/VampireHounds.java index ea3b6dee886..91f6c2d0801 100644 --- a/Mage.Sets/src/mage/cards/v/VampireHounds.java +++ b/Mage.Sets/src/mage/cards/v/VampireHounds.java @@ -29,7 +29,6 @@ public final class VampireHounds extends CardImpl { // Discard a creature card: Vampire Hounds gets +2/+2 until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new DiscardTargetCost(new TargetCardInHand(StaticFilters.FILTER_CARD_CREATURE)))); } diff --git a/Mage.Sets/src/mage/cards/v/VarinaLichQueen.java b/Mage.Sets/src/mage/cards/v/VarinaLichQueen.java index 3b953b4dea9..a297fec5b95 100644 --- a/Mage.Sets/src/mage/cards/v/VarinaLichQueen.java +++ b/Mage.Sets/src/mage/cards/v/VarinaLichQueen.java @@ -44,7 +44,6 @@ public final class VarinaLichQueen extends CardImpl { // {2}, Exile two cards from your graveyard: Create a tapped 2/2 black Zombie creature token. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new CreateTokenEffect( new ZombieToken(), 1, true, false diff --git a/Mage.Sets/src/mage/cards/v/VeiledShade.java b/Mage.Sets/src/mage/cards/v/VeiledShade.java index 13d3e83de9d..33a53d882fa 100644 --- a/Mage.Sets/src/mage/cards/v/VeiledShade.java +++ b/Mage.Sets/src/mage/cards/v/VeiledShade.java @@ -27,7 +27,6 @@ public final class VeiledShade extends CardImpl { // {1}{B}: Veiled Shade gets +1/+1 until end of turn. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}") )); diff --git a/Mage.Sets/src/mage/cards/v/VolrathTheFallen.java b/Mage.Sets/src/mage/cards/v/VolrathTheFallen.java index 140b4f26492..c53845d7756 100644 --- a/Mage.Sets/src/mage/cards/v/VolrathTheFallen.java +++ b/Mage.Sets/src/mage/cards/v/VolrathTheFallen.java @@ -38,7 +38,6 @@ public final class VolrathTheFallen extends CardImpl { effect.setText("{this} gets +X/+X until end of turn, where X is the discarded card's mana value"); Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{B}")); ability.addCost(new DiscardCardCost(StaticFilters.FILTER_CARD_CREATURE)); diff --git a/Mage.Sets/src/mage/cards/w/WakerOfTheWilds.java b/Mage.Sets/src/mage/cards/w/WakerOfTheWilds.java index 93688b916f5..8f43f9f1eb5 100644 --- a/Mage.Sets/src/mage/cards/w/WakerOfTheWilds.java +++ b/Mage.Sets/src/mage/cards/w/WakerOfTheWilds.java @@ -37,7 +37,6 @@ public final class WakerOfTheWilds extends CardImpl { // {X}{G}{G}: Put X +1/+1 counters on target land you control. That land becomes a 0/0 Elemental creature with haste that's still a land. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new AddCountersTargetEffect( CounterType.P1P1.createInstance(0), GetXValue.instance diff --git a/Mage.Sets/src/mage/cards/w/WalkingAtlas.java b/Mage.Sets/src/mage/cards/w/WalkingAtlas.java index 97af20dad0a..534940094ba 100644 --- a/Mage.Sets/src/mage/cards/w/WalkingAtlas.java +++ b/Mage.Sets/src/mage/cards/w/WalkingAtlas.java @@ -27,7 +27,6 @@ public final class WalkingAtlas extends CardImpl { // {tap}: You may put a land card from your hand onto the battlefield. this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_LAND_A), new TapSourceCost() )); diff --git a/Mage.Sets/src/mage/cards/w/WanderingTreefolk.java b/Mage.Sets/src/mage/cards/w/WanderingTreefolk.java index 223bf9312db..0dc68f5da25 100644 --- a/Mage.Sets/src/mage/cards/w/WanderingTreefolk.java +++ b/Mage.Sets/src/mage/cards/w/WanderingTreefolk.java @@ -33,7 +33,6 @@ public final class WanderingTreefolk extends CardImpl { // Domain -- {7}{G}: Seek a creature card. This ability costs {1} less to activate for each basic land type among lands you control. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new SeekCardEffect(StaticFilters.FILTER_CARD_CREATURE), new ManaCostsImpl<>("{7}{G}") ); @@ -55,4 +54,4 @@ public final class WanderingTreefolk extends CardImpl { public WanderingTreefolk copy() { return new WanderingTreefolk(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/w/WarDance.java b/Mage.Sets/src/mage/cards/w/WarDance.java index 481351ffcb0..a7adea45b77 100644 --- a/Mage.Sets/src/mage/cards/w/WarDance.java +++ b/Mage.Sets/src/mage/cards/w/WarDance.java @@ -32,7 +32,6 @@ public final class WarDance extends CardImpl { // Sacrifice War Dance: Target creature gets +X/+X until end of turn, where X is the number of verse counters on War Dance. Ability ability = new SimpleActivatedAbility( - Zone.BATTLEFIELD, new BoostTargetEffect( new CountersSourceCount(CounterType.VERSE), new CountersSourceCount(CounterType.VERSE), diff --git a/Mage.Sets/src/mage/cards/w/WeldfastMonitor.java b/Mage.Sets/src/mage/cards/w/WeldfastMonitor.java index 4776a5919de..500b62a28fe 100644 --- a/Mage.Sets/src/mage/cards/w/WeldfastMonitor.java +++ b/Mage.Sets/src/mage/cards/w/WeldfastMonitor.java @@ -29,7 +29,6 @@ public final class WeldfastMonitor extends CardImpl { // {R}: Weldfast Monitor gains menace until end of turn this.addAbility(new SimpleActivatedAbility( - Zone.BATTLEFIELD, new GainAbilitySourceEffect(new MenaceAbility(false), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)));